From 95e5edc194f1621e4646444187abae9f1ab3105c Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 7 Nov 2012 17:54:29 +0400 Subject: [PATCH 0001/1557] JPS plugin stub Original commit: f7a6c6f6fda56699e59848a71c28798a26e1a18f --- jps/jps-plugin/jps-plugin.iml | 13 ++++ ...g.jetbrains.jps.incremental.BuilderService | 1 + .../jet/jps/build/KotlinBuilder.java | 65 +++++++++++++++++++ .../jet/jps/build/KotlinBuilderService.java | 32 +++++++++ 4 files changed, 111 insertions(+) create mode 100644 jps/jps-plugin/jps-plugin.iml create mode 100644 jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml new file mode 100644 index 00000000000..8aa91671dfd --- /dev/null +++ b/jps/jps-plugin/jps-plugin.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService new file mode 100644 index 00000000000..dbf52b9ce3b --- /dev/null +++ b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService @@ -0,0 +1 @@ +org.jetbrains.jet.jps.build.KotlinBuilderService \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java new file mode 100644 index 00000000000..86113e5e85f --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -0,0 +1,65 @@ +/* + * 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.jps.build; + +import org.jetbrains.jps.ModuleChunk; +import org.jetbrains.jps.builders.DirtyFilesHolder; +import org.jetbrains.jps.builders.FileProcessor; +import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; +import org.jetbrains.jps.incremental.*; + +import java.io.File; +import java.io.IOException; + +public class KotlinBuilder extends ModuleLevelBuilder { + protected KotlinBuilder() { + super(BuilderCategory.SOURCE_PROCESSOR); + } + + @Override + public ExitCode build( + CompileContext context, ModuleChunk chunk, DirtyFilesHolder dirtyFilesHolder + ) throws ProjectBuildException { + try { + dirtyFilesHolder.processDirtyFiles(new FileProcessor() { + @Override + public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { + if (file.getName().endsWith(".kt") || file.getName().endsWith(".java")) { + + } + return true; + } + }); + } + catch (IOException e) { + throw new ProjectBuildException(e); + } + //context.processMessage(new CompilerMessage()); + //JpsJavaExtensionService.dependencies().recursively().productionOnly().classes().getRoots() + return ExitCode.OK; + } + + @Override + public String getName() { + return "KotlinBuilder"; + } + + @Override + public String getDescription() { + return "KotlinBuilder"; + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java new file mode 100644 index 00000000000..df253742ecf --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.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.jps.build; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jps.incremental.BuilderService; +import org.jetbrains.jps.incremental.ModuleLevelBuilder; + +import java.util.Collections; +import java.util.List; + +public class KotlinBuilderService extends BuilderService { + @NotNull + @Override + public List createModuleLevelBuilders() { + return Collections.singletonList(new KotlinBuilder()); + } +} From 8db5f6741cc2e0da6f911152288df697c0e827e3 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 9 Nov 2012 16:00:22 +0400 Subject: [PATCH 0002/1557] Initial implementation for external build #KT-2751 Fixed #KT-3017 Fixed #KT-3021 Fixed Original commit: 9592bfd62fa6e346c965ebc4a923d8c934de9bd2 --- jps/jps-plugin/jps-plugin.iml | 2 + .../jet/jps/build/KotlinBuilder.java | 143 +++++++++++++++--- .../KotlinBuilderModuleScriptGenerator.java | 133 ++++++++++++++++ .../jps/build/KotlinSourceFileCollector.java | 82 ++++++++++ 4 files changed, 338 insertions(+), 22 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 8aa91671dfd..e58e9906a3c 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -8,6 +8,8 @@ + + diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 86113e5e85f..fde3fcdbcdc 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,50 +16,149 @@ package org.jetbrains.jet.jps.build; +import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.jet.cli.common.messages.MessageCollector; +import org.jetbrains.jet.compiler.runner.*; import org.jetbrains.jps.ModuleChunk; +import org.jetbrains.jps.builders.ChunkBuildOutputConsumer; import org.jetbrains.jps.builders.DirtyFilesHolder; -import org.jetbrains.jps.builders.FileProcessor; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; +import org.jetbrains.jps.incremental.messages.BuildMessage; +import org.jetbrains.jps.incremental.messages.CompilerMessage; import java.io.File; import java.io.IOException; +import java.util.Collection; +import java.util.List; + +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; public class KotlinBuilder extends ModuleLevelBuilder { + + private static final String KOTLIN_COMPILER_NAME = "Kotlin"; + private static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; + protected KotlinBuilder() { super(BuilderCategory.SOURCE_PROCESSOR); } + @NotNull + @Override + public String getPresentableName() { + return KOTLIN_BUILDER_NAME; + } + @Override public ExitCode build( - CompileContext context, ModuleChunk chunk, DirtyFilesHolder dirtyFilesHolder - ) throws ProjectBuildException { - try { - dirtyFilesHolder.processDirtyFiles(new FileProcessor() { - @Override - public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { - if (file.getName().endsWith(".kt") || file.getName().endsWith(".java")) { + CompileContext context, + ModuleChunk chunk, + DirtyFilesHolder dirtyFilesHolder, + ChunkBuildOutputConsumer outputConsumer + ) throws ProjectBuildException, IOException { - } - return true; - } - }); + MessageCollector messageCollector = new MessageCollectorAdapter(context); + + if (chunk.getModules().size() > 1) { + messageCollector.report( + ERROR, "Circular dependencies are not supported: " + chunk.getModules(), + CompilerMessageLocation.NO_LOCATION); + return ExitCode.ABORT; } - catch (IOException e) { - throw new ProjectBuildException(e); + + ModuleBuildTarget representativeTarget = chunk.representativeTarget(); + + // For non-incremental build: take all sources + List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); + //List sourceFiles = getDirtySourceFiles(dirtyFilesHolder); + + if (sourceFiles.isEmpty()) { + return ExitCode.NOTHING_DONE; } - //context.processMessage(new CompilerMessage()); - //JpsJavaExtensionService.dependencies().recursively().productionOnly().classes().getRoots() + + File scriptFile = KotlinBuilderModuleScriptGenerator.generateModuleScript(context, representativeTarget, sourceFiles); + + File outputDir = representativeTarget.getOutputDir(); + + CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(outputDir); + if (!environment.success()) { + environment.reportErrorsTo(messageCollector); + return ExitCode.ABORT; + } + + assert outputDir != null : "CompilerEnvironment must have checked for outputDir to be not null, but it didn't"; + + OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl(outputDir); + + KotlinCompilerRunner.runCompiler( + messageCollector, + environment, + scriptFile, + outputItemCollector, + /*runOutOfProcess = */false); + + for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { + outputConsumer.registerOutputFile( + representativeTarget, + outputItem.getOutputFile().getPath(), + paths(outputItem.getSourceFiles())); + } + return ExitCode.OK; } - @Override - public String getName() { - return "KotlinBuilder"; + private static Collection paths(Collection files) { + Collection result = ContainerUtil.newArrayList(); + for (File file : files) { + result.add(file.getPath()); + } + return result; } - @Override - public String getDescription() { - return "KotlinBuilder"; + public static class MessageCollectorAdapter implements MessageCollector { + + private final CompileContext context; + + public MessageCollectorAdapter(@NotNull CompileContext context) { + this.context = context; + } + + @Override + public void report( + @NotNull CompilerMessageSeverity severity, + @NotNull String message, + @NotNull CompilerMessageLocation location + ) { + context.processMessage(new CompilerMessage( + KOTLIN_COMPILER_NAME, + kind(severity), + message, + location.getPath(), + -1, -1, -1, + location.getLine(), + location.getColumn() + )); + } + + @NotNull + private static BuildMessage.Kind kind(@NotNull CompilerMessageSeverity severity) { + switch (severity) { + case INFO: + return BuildMessage.Kind.INFO; + case ERROR: + case EXCEPTION: + return BuildMessage.Kind.ERROR; + case WARNING: + return BuildMessage.Kind.WARNING; + case LOGGING: + return BuildMessage.Kind.PROGRESS; + default: + throw new IllegalArgumentException("Unsupported severity: " + severity); + } + } + } } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java new file mode 100644 index 00000000000..860ea5ddf8a --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -0,0 +1,133 @@ +/* + * 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.jps.build; + +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.compiler.runner.KotlinModuleScriptGenerator; +import org.jetbrains.jps.incremental.CompileContext; +import org.jetbrains.jps.incremental.ModuleBuildTarget; +import org.jetbrains.jps.incremental.messages.BuildMessage; +import org.jetbrains.jps.incremental.messages.CompilerMessage; +import org.jetbrains.jps.model.java.JpsAnnotationRootType; +import org.jetbrains.jps.model.java.JpsJavaClasspathKind; +import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; +import org.jetbrains.jps.model.java.JpsJavaExtensionService; +import org.jetbrains.jps.model.library.JpsLibrary; +import org.jetbrains.jps.model.library.JpsLibraryRoot; +import org.jetbrains.jps.model.module.JpsDependencyElement; +import org.jetbrains.jps.model.module.JpsLibraryDependency; +import org.jetbrains.jps.model.module.JpsModule; +import org.jetbrains.jps.model.module.JpsSdkDependency; +import org.jetbrains.jps.util.JpsPathUtil; + +import java.io.File; +import java.io.IOException; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import static org.jetbrains.jet.compiler.runner.KotlinModuleScriptGenerator.DependencyProvider; + +public class KotlinBuilderModuleScriptGenerator { + public static File generateModuleScript(CompileContext context, ModuleBuildTarget target, List sourceFiles) + throws IOException + { + CharSequence moduleScriptText = KotlinModuleScriptGenerator.generateModuleScript( + target.getModuleName(), + getKotlinModuleDependencies(target), + sourceFiles, + target.isTests(), + // this excludes the output directory from the class path, to be removed for true incremental compilation + Collections.singleton(target.getOutputDir()) + ); + + File scriptFile = new File(target.getOutputDir(), "script.kts"); + + writeScriptToFile(context, moduleScriptText, scriptFile); + + return scriptFile; + } + + private static DependencyProvider getKotlinModuleDependencies(final ModuleBuildTarget target) { + return new DependencyProvider() { + @Override + public void processClassPath(@NotNull KotlinModuleScriptGenerator.DependencyProcessor processor) { + processor.processClassPathSection("All", findClassPathRoots(target)); + processor.processAnnotationRoots(findAnnotationRoots(target)); + } + }; + } + + private static void writeScriptToFile(CompileContext context, CharSequence moduleScriptText, File scriptFile) throws IOException { + FileUtil.writeToFile(scriptFile, moduleScriptText.toString()); + context.processMessage(new CompilerMessage( + "Kotlin", + BuildMessage.Kind.INFO, + "Created script file: " + scriptFile + )); + } + + @NotNull + private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { + JpsModule module = target.getModule(); + JpsJavaDependenciesEnumerator dependencies = JpsJavaExtensionService.dependencies(module) + .includedIn(JpsJavaClasspathKind.compile(target.isTests())); + + return dependencies.classes().getRoots(); + } + + @NotNull + private static List findAnnotationRoots(@NotNull ModuleBuildTarget target) { + JpsModule module = target.getModule(); + List dependencies = module.getDependenciesList().getDependencies(); + + List annotationRootFiles = ContainerUtil.newArrayList(); + for (JpsDependencyElement dependencyElement : dependencies) { + JpsLibrary library = getLibrary(dependencyElement); + if (library == null) continue; + + List annotationRoots = library.getRoots(JpsAnnotationRootType.INSTANCE); + for (JpsLibraryRoot root : annotationRoots) { + File file = new File(JpsPathUtil.urlToPath(root.getUrl())); + + annotationRootFiles.add(file); + } + } + + return annotationRootFiles; + } + + @Nullable + private static JpsLibrary getLibrary(@NotNull JpsDependencyElement dependencyElement) { + if (dependencyElement instanceof JpsSdkDependency) { + JpsSdkDependency sdkDependency = (JpsSdkDependency) dependencyElement; + return sdkDependency.resolveSdk(); + } + + if (dependencyElement instanceof JpsLibraryDependency) { + JpsLibraryDependency libraryDependency = (JpsLibraryDependency) dependencyElement; + return libraryDependency.getLibrary(); + } + + return null; + } + + private KotlinBuilderModuleScriptGenerator() {} +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java new file mode 100644 index 00000000000..d92306714e1 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -0,0 +1,82 @@ +/* + * 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.jps.build; + +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.Processor; +import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jps.builders.DirtyFilesHolder; +import org.jetbrains.jps.builders.FileProcessor; +import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; +import org.jetbrains.jps.incremental.ModuleBuildTarget; +import org.jetbrains.jps.model.java.JavaSourceRootType; +import org.jetbrains.jps.model.module.JpsModuleSourceRoot; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +public class KotlinSourceFileCollector { + // For incremental compilation + public static List getDirtySourceFiles(DirtyFilesHolder dirtyFilesHolder) + throws IOException + { + final List sourceFiles = ContainerUtil.newArrayList(); + + dirtyFilesHolder.processDirtyFiles(new FileProcessor() { + @Override + public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { + if (isKotlinSourceFile(file)) { + sourceFiles.add(file); + } + return true; + } + }); + return sourceFiles; + } + + @NotNull + public static List getAllKotlinSourceFiles(@NotNull ModuleBuildTarget target) { + final List result = ContainerUtil.newArrayList(); + for (JpsModuleSourceRoot sourceRoot : getRelevantSourceRoots(target)) { + FileUtil.processFilesRecursively(sourceRoot.getFile(), new Processor() { + @Override + public boolean process(File file) { + if (file.isFile() && isKotlinSourceFile(file)) { + result.add(file); + } + return true; + } + }); + } + return result; + } + + private static Iterable getRelevantSourceRoots(ModuleBuildTarget target) { + JavaSourceRootType sourceRootType = target.isTests() ? JavaSourceRootType.TEST_SOURCE : JavaSourceRootType.SOURCE; + + //noinspection unchecked + return (Iterable) target.getModule().getSourceRoots(sourceRootType); + } + + private static boolean isKotlinSourceFile(File file) { + return file.getPath().endsWith(".kt"); + } + + private KotlinSourceFileCollector() {} +} From 49afb0948f25790a7fcf066926ee484bf4429b28 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 19 Nov 2012 17:04:18 +0400 Subject: [PATCH 0003/1557] Migrate to IDEA 122.813 Original commit: 47e057d529efd975a40b7b11430774c20ae76158 --- .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 860ea5ddf8a..119a622bb06 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -50,7 +50,7 @@ public class KotlinBuilderModuleScriptGenerator { throws IOException { CharSequence moduleScriptText = KotlinModuleScriptGenerator.generateModuleScript( - target.getModuleName(), + target.getId(), getKotlinModuleDependencies(target), sourceFiles, target.isTests(), From cd020e3cfc8d7940915f4362acdd93c5a45eea2c Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 21 Nov 2012 14:09:39 +0400 Subject: [PATCH 0004/1557] KT-3056 Kotlin: Cannot find kotlinc home. Make sure plugin is properly installed #KT-3056 Fixed Original commit: 4ee76a664955654ef6e5cb8699f0ea1118f752ba --- jps/jps-plugin/jps-plugin.iml | 1 + .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index e58e9906a3c..21f152906eb 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -10,6 +10,7 @@ + diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index fde3fcdbcdc..9573d07f877 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -22,6 +22,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.compiler.runner.*; +import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.ChunkBuildOutputConsumer; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -83,7 +84,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputDir = representativeTarget.getOutputDir(); - CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(outputDir); + CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(PathUtil.getCompilerPathForJpsPlugin(), outputDir); if (!environment.success()) { environment.reportErrorsTo(messageCollector); return ExitCode.ABORT; From 3a0b4505ef5b52c3d380ff729e23e7eb06cfffd0 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 21 Nov 2012 18:16:09 +0400 Subject: [PATCH 0005/1557] Introducing KotlinPaths to impose some discipline on compiler/library location Original commit: 4ed07cd9aed03dfbe3941861f0153f9c916acb7f --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 9573d07f877..7bff4b9b7d0 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -84,7 +84,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputDir = representativeTarget.getOutputDir(); - CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(PathUtil.getCompilerPathForJpsPlugin(), outputDir); + CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(PathUtil.getKotlinPathsForJpsPlugin(), outputDir); if (!environment.success()) { environment.reportErrorsTo(messageCollector); return ExitCode.ABORT; From ae57dfe9a871b9266b13c7421cd912abce86ff5c Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 21 Nov 2012 19:31:07 +0400 Subject: [PATCH 0006/1557] Report exceptions from both makes to Exception Analyzer Original commit: 3e1a5a7be1b2edc17f5914eb13c46ebda644717c --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 7bff4b9b7d0..97ab73404b0 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -37,10 +37,10 @@ import java.util.Collection; import java.util.List; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; public class KotlinBuilder extends ModuleLevelBuilder { - private static final String KOTLIN_COMPILER_NAME = "Kotlin"; private static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; protected KotlinBuilder() { @@ -133,10 +133,14 @@ public class KotlinBuilder extends ModuleLevelBuilder { @NotNull String message, @NotNull CompilerMessageLocation location ) { + String prefix = ""; + if (severity == EXCEPTION) { + prefix = CompilerRunnerConstants.INTERNAL_ERROR_PREFIX; + } context.processMessage(new CompilerMessage( - KOTLIN_COMPILER_NAME, + CompilerRunnerConstants.KOTLIN_COMPILER_NAME, kind(severity), - message, + prefix + message, location.getPath(), -1, -1, -1, location.getLine(), From 765147b876d539b2923d9d200a523e303cb35e95 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Wed, 21 Nov 2012 19:29:49 +0400 Subject: [PATCH 0007/1557] Add Java Source Roots to classpath #KT-3062 Fixed Original commit: ff45322d1ae872a10d20e9c6b3178537547d7052 --- .../KotlinBuilderModuleScriptGenerator.java | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 119a622bb06..c43e99653ed 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -21,6 +21,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.compiler.runner.KotlinModuleScriptGenerator; +import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.messages.BuildMessage; @@ -31,10 +32,7 @@ import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; import org.jetbrains.jps.model.java.JpsJavaExtensionService; import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.JpsLibraryRoot; -import org.jetbrains.jps.model.module.JpsDependencyElement; -import org.jetbrains.jps.model.module.JpsLibraryDependency; -import org.jetbrains.jps.model.module.JpsModule; -import org.jetbrains.jps.model.module.JpsSdkDependency; +import org.jetbrains.jps.model.module.*; import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; @@ -51,7 +49,7 @@ public class KotlinBuilderModuleScriptGenerator { { CharSequence moduleScriptText = KotlinModuleScriptGenerator.generateModuleScript( target.getId(), - getKotlinModuleDependencies(target), + getKotlinModuleDependencies(context, target), sourceFiles, target.isTests(), // this excludes the output directory from the class path, to be removed for true incremental compilation @@ -65,11 +63,12 @@ public class KotlinBuilderModuleScriptGenerator { return scriptFile; } - private static DependencyProvider getKotlinModuleDependencies(final ModuleBuildTarget target) { + private static DependencyProvider getKotlinModuleDependencies(final CompileContext context, final ModuleBuildTarget target) { return new DependencyProvider() { @Override public void processClassPath(@NotNull KotlinModuleScriptGenerator.DependencyProcessor processor) { - processor.processClassPathSection("All", findClassPathRoots(target)); + processor.processClassPathSection("Classpath", findClassPathRoots(target)); + processor.processClassPathSection("Java Source Roots", findSourceRoots(context, target)); processor.processAnnotationRoots(findAnnotationRoots(target)); } }; @@ -93,6 +92,19 @@ public class KotlinBuilderModuleScriptGenerator { return dependencies.classes().getRoots(); } + @NotNull + private static Collection findSourceRoots(@NotNull CompileContext context, @NotNull ModuleBuildTarget target) { + List roots = context.getProjectDescriptor().getBuildRootIndex().getTargetRoots(target, context); + Collection result = ContainerUtil.newArrayList(); + for (JavaSourceRootDescriptor root : roots) { + File file = root.getRootFile(); + if (file.exists()) { + result.add(file); + } + } + return result; + } + @NotNull private static List findAnnotationRoots(@NotNull ModuleBuildTarget target) { JpsModule module = target.getModule(); From 1f1b323ec1ff5cf07d45542d4659029548762351 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 21 Nov 2012 20:46:58 +0400 Subject: [PATCH 0008/1557] Proper dependencies for the JPS plugin Original commit: 10cedf8576ab69b3b3584e34b53f425846fd35f1 --- jps/jps-plugin/jps-plugin.iml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 21f152906eb..1e732f59e2f 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -7,10 +7,11 @@ - + + From f0c15286c1d11c61dd58f5043e8b7cce00b1e025 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 23 Nov 2012 12:17:54 +0400 Subject: [PATCH 0009/1557] Migrating to IDEA 123.4 Original commit: 3b11d5787c3a33d85104bb81780efcbb4ba857b0 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 97ab73404b0..7ddf44dedc9 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -24,7 +24,6 @@ import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.compiler.runner.*; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; -import org.jetbrains.jps.builders.ChunkBuildOutputConsumer; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; @@ -58,7 +57,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { CompileContext context, ModuleChunk chunk, DirtyFilesHolder dirtyFilesHolder, - ChunkBuildOutputConsumer outputConsumer + OutputConsumer outputConsumer ) throws ProjectBuildException, IOException { MessageCollector messageCollector = new MessageCollectorAdapter(context); @@ -104,7 +103,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { outputConsumer.registerOutputFile( representativeTarget, - outputItem.getOutputFile().getPath(), + outputItem.getOutputFile(), paths(outputItem.getSourceFiles())); } From eef49ca923c3028e74380c3d823f18d744548777 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 27 Nov 2012 11:41:18 +0400 Subject: [PATCH 0010/1557] Add tests for jps plugin Original commit: 74ca3575026b4855bfa49bc088863197336f975c --- jps/jps-plugin/jps-plugin.iml | 2 + .../kannotator-jps-plugin-test.iml | 16 +++ .../KAnnotatorJpsBuildTestCase.java | 109 ++++++++++++++++++ .../jet/jps/build/KotlinBuilder.java | 2 +- .../build/AbstractKotlinJpsBuildTestCase.java | 90 +++++++++++++++ .../jet/jps/build/KotlinJpsBuildTestCase.java | 84 ++++++++++++++ .../testData/JKJProject/kotlinProject.iml | 13 +++ .../testData/JKJProject/kotlinProject.ipr | 14 +++ .../testData/JKJProject/src/java/JFirst.java | 7 ++ .../testData/JKJProject/src/java/JSecond.java | 7 ++ .../testData/JKJProject/src/kotlin/KFirst.kt | 7 ++ .../KJCircularProject/kotlinProject.iml | 12 ++ .../KJCircularProject/kotlinProject.ipr | 14 +++ .../KJCircularProject/src/java/JFirst.java | 11 ++ .../KJCircularProject/src/kotlin/KFirst.kt | 9 ++ .../testData/KJKProject/kotlinProject.iml | 13 +++ .../testData/KJKProject/kotlinProject.ipr | 14 +++ .../testData/KJKProject/src/java/JFirst.java | 7 ++ .../testData/KJKProject/src/kotlin/KFirst.kt | 7 ++ .../testData/KJKProject/src/kotlin/KSecond.kt | 7 ++ .../simpleKotlinJavaProject/kotlinProject.iml | 12 ++ .../simpleKotlinJavaProject/kotlinProject.ipr | 14 +++ .../simpleKotlinJavaProject/src/Test.java | 6 + .../simpleKotlinJavaProject/src/kotlinFile.kt | 7 ++ .../simpleKotlinProject/kotlinProject.iml | 12 ++ .../simpleKotlinProject/kotlinProject.ipr | 14 +++ .../testData/simpleKotlinProject/src/test1.kt | 3 + .../testOnlyDependency/kotlinProject.iml | 13 +++ .../testOnlyDependency/kotlinProject.ipr | 14 +++ .../testData/testOnlyDependency/src/src.kt | 1 + .../testData/testOnlyDependency/test/test.kt | 3 + 31 files changed, 543 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml create mode 100644 jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java create mode 100644 jps/jps-plugin/testData/JKJProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/JKJProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/JKJProject/src/java/JFirst.java create mode 100644 jps/jps-plugin/testData/JKJProject/src/java/JSecond.java create mode 100644 jps/jps-plugin/testData/JKJProject/src/kotlin/KFirst.kt create mode 100644 jps/jps-plugin/testData/KJCircularProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/KJCircularProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/KJCircularProject/src/java/JFirst.java create mode 100644 jps/jps-plugin/testData/KJCircularProject/src/kotlin/KFirst.kt create mode 100644 jps/jps-plugin/testData/KJKProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/KJKProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/KJKProject/src/java/JFirst.java create mode 100644 jps/jps-plugin/testData/KJKProject/src/kotlin/KFirst.kt create mode 100644 jps/jps-plugin/testData/KJKProject/src/kotlin/KSecond.kt create mode 100644 jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/simpleKotlinJavaProject/src/Test.java create mode 100644 jps/jps-plugin/testData/simpleKotlinJavaProject/src/kotlinFile.kt create mode 100644 jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/simpleKotlinProject/src/test1.kt create mode 100644 jps/jps-plugin/testData/testOnlyDependency/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/testOnlyDependency/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/testOnlyDependency/src/src.kt create mode 100644 jps/jps-plugin/testData/testOnlyDependency/test/test.kt diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 1e732f59e2f..83efc10247f 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -4,6 +4,7 @@ + @@ -12,6 +13,7 @@ + diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml new file mode 100644 index 00000000000..59b1954066a --- /dev/null +++ b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java new file mode 100644 index 00000000000..3950077dc4c --- /dev/null +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java @@ -0,0 +1,109 @@ +/* + * 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.jps.build.kannotator; + +import com.intellij.openapi.util.io.FileUtil; +import org.jetbrains.jet.jps.build.AbstractKotlinJpsBuildTestCase; +import org.jetbrains.jps.builders.BuildResult; +import org.jetbrains.jps.model.module.JpsModule; +import org.jetbrains.jps.model.module.JpsModuleSourceRoot; + +import java.io.File; +import java.io.IOException; + +public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { + private static final String JDK_NAME = "1.6"; + + @Override + public void setUp() throws Exception { + super.setUp(); + File sourceFilesRoot = new File(TEST_DATA_PATH + File.separator + "kannotator"); + workDir = copyTestDataToTmpDir(sourceFilesRoot); + } + + public void testMakeKannotator() { + doTest(false); + } + + public void testRebuildKannotator() { + doTest(true); + } + + private void doTest(boolean rebuildBeforeMake) { + initProject(); + rebuildAll(); + for (JpsModule module : myProject.getModules()) { + for (JpsModuleSourceRoot sourceRoot : module.getSourceRoots()) { + processFile(sourceRoot.getFile(), rebuildBeforeMake); + } + } + } + + private void processFile(File root, boolean rebuildBeforeMake) { + if (root.isDirectory()) { + File[] files = root.listFiles(); + if (files == null) return; + for (File file : files) { + processFile(file, rebuildBeforeMake); + } + } + else if (root.getName().endsWith(".kt")) { + System.out.println("Test started. File: " + root.getName()); + String path = root.getAbsolutePath(); + if (rebuildBeforeMake) { + rebuildAll(); + } + System.out.println("Change file: " + path); + change(path); + makeAll().assertSuccessful(); + System.out.println("Test successfully finished. File: " + root.getName()); + System.out.println("-----"); + } + } + + @Override + protected void rebuildAll() { + System.out.println("'Rebuild all' started"); + super.rebuildAll(); + System.out.println("'Rebuild all' finished"); + } + + @Override + protected BuildResult makeAll() { + System.out.println("'Make all' started"); + BuildResult result = super.makeAll(); + System.out.println("'Make all' finished"); + return result; + } + + @Override + protected File doGetProjectDir() throws IOException { + return workDir; + } + + private void initProject() { + addJdk(JDK_NAME); + loadProject(workDir.getAbsolutePath()); + addKotlinRuntimeDependency(); + } + + @Override + public void tearDown() throws Exception { + FileUtil.delete(workDir); + super.tearDown(); + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 7ddf44dedc9..c7471dcbca7 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -83,7 +83,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputDir = representativeTarget.getOutputDir(); - CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(PathUtil.getKotlinPathsForJpsPlugin(), outputDir); + CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir); if (!environment.success()) { environment.reportErrorsTo(messageCollector); return ExitCode.ABORT; diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java new file mode 100644 index 00000000000..21ba13e51a1 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -0,0 +1,90 @@ +/* + * 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.jps.build; + +import com.intellij.openapi.util.io.FileUtil; +import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.jps.builders.JpsBuildTestCase; +import org.jetbrains.jps.model.JpsDummyElement; +import org.jetbrains.jps.model.JpsModuleRootModificationUtil; +import org.jetbrains.jps.model.java.JpsAnnotationRootType; +import org.jetbrains.jps.model.java.JpsJavaDependencyScope; +import org.jetbrains.jps.model.java.JpsJavaLibraryType; +import org.jetbrains.jps.model.java.JpsJavaSdkType; +import org.jetbrains.jps.model.library.JpsLibrary; +import org.jetbrains.jps.model.library.JpsOrderRootType; +import org.jetbrains.jps.model.library.JpsTypedLibrary; +import org.jetbrains.jps.model.library.sdk.JpsSdk; +import org.jetbrains.jps.model.module.JpsModule; +import org.jetbrains.jps.util.JpsPathUtil; + +import java.io.File; +import java.io.IOException; + +public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { + protected static final String TEST_DATA_PATH = "jps-plugin/testData/"; + + protected File workDir; + + @Override + public void setUp() throws Exception { + super.setUp(); + System.setProperty("kotlin.jps.tests", "true"); + } + + @Override + public void tearDown() throws Exception { + System.clearProperty("kotlin.jps.tests"); + super.tearDown(); + } + + protected static File copyTestDataToTmpDir(File testDataDir) throws IOException { + assert testDataDir.exists() : "Cannot find source folder"; + File tmpDir = FileUtil.createTempDirectory("jps-build", null); + FileUtil.copyDir(testDataDir, tmpDir); + return tmpDir; + } + + @Override + protected File doGetProjectDir() throws IOException { + return workDir; + } + + @Override + protected JpsSdk addJdk(final String name, final String path) { + String homePath = System.getProperty("java.home"); + String versionString = System.getProperty("java.version"); + JpsTypedLibrary> jdk = myModel.getGlobal().addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE); + jdk.addRoot(JpsPathUtil.pathToUrl(path), JpsOrderRootType.COMPILED); + jdk.addRoot(JpsPathUtil.pathToUrl(PathUtil.getKotlinPathsForDistDirectory().getJdkAnnotationsPath().getAbsolutePath()), JpsAnnotationRootType.INSTANCE); + return jdk.getProperties(); + } + + protected JpsLibrary addKotlinRuntimeDependency() { + return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE); + } + + protected JpsLibrary addKotlinRuntimeDependency(JpsJavaDependencyScope type) { + JpsLibrary library = myProject.addLibrary("kotlin-runtime", JpsJavaLibraryType.INSTANCE); + File runtime = PathUtil.getKotlinPathsForDistDirectory().getRuntimePath(); + library.addRoot(runtime, JpsOrderRootType.COMPILED); + for (JpsModule module : myProject.getModules()) { + JpsModuleRootModificationUtil.addDependency(module, library, type, false); + } + return library; + } +} diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java new file mode 100644 index 00000000000..cebba67b408 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -0,0 +1,84 @@ +/* + * 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.jps.build; + +import com.intellij.openapi.util.io.FileUtil; +import org.jetbrains.jps.model.java.*; + +import java.io.File; +import java.io.IOException; + +public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { + private static final String PROJECT_NAME = "kotlinProject"; + private static final String JDK_NAME = "IDEA_JDK"; + + @Override + public void setUp() throws Exception { + super.setUp(); + File sourceFilesRoot = new File(TEST_DATA_PATH + File.separator + getTestName(true)); + workDir = copyTestDataToTmpDir(sourceFilesRoot); + } + + @Override + public void tearDown() throws Exception { + FileUtil.delete(workDir); + super.tearDown(); + } + + private void initProject() { + addJdk(JDK_NAME); + loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr"); + } + + public void doTest() { + initProject(); + makeAll().assertSuccessful(); + } + + public void testSimpleKotlinProject() { + doTest(); + } + + public void testSimpleKotlinJavaProject() { + doTest(); + } + + public void testJKJProject() { + doTest(); + } + + public void testKJKProject() { + doTest(); + } + + public void testKJCircularProject() { + doTest(); + } + + public void testTwoModules() { + doTest(); + } + + public void testTestOnlyDependency() throws Throwable { + initProject(); + addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST); + makeAll().assertSuccessful(); + change(workDir + "/src/src.kt", "fun foo() { println() }"); + makeAll().assertFailed(); + } + +} diff --git a/jps/jps-plugin/testData/JKJProject/kotlinProject.iml b/jps/jps-plugin/testData/JKJProject/kotlinProject.iml new file mode 100644 index 00000000000..10db71f5cd2 --- /dev/null +++ b/jps/jps-plugin/testData/JKJProject/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/JKJProject/kotlinProject.ipr b/jps/jps-plugin/testData/JKJProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/JKJProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/JKJProject/src/java/JFirst.java b/jps/jps-plugin/testData/JKJProject/src/java/JFirst.java new file mode 100644 index 00000000000..efaf2188e4d --- /dev/null +++ b/jps/jps-plugin/testData/JKJProject/src/java/JFirst.java @@ -0,0 +1,7 @@ +package java; + +public class JFirst { + public void foo() { + new kotlin.KFirst().foo(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/JKJProject/src/java/JSecond.java b/jps/jps-plugin/testData/JKJProject/src/java/JSecond.java new file mode 100644 index 00000000000..8d126964842 --- /dev/null +++ b/jps/jps-plugin/testData/JKJProject/src/java/JSecond.java @@ -0,0 +1,7 @@ +package java; + +public class JSecond { + public void foo() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/JKJProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/JKJProject/src/kotlin/KFirst.kt new file mode 100644 index 00000000000..110919f715d --- /dev/null +++ b/jps/jps-plugin/testData/JKJProject/src/kotlin/KFirst.kt @@ -0,0 +1,7 @@ +package kotlin + +class KFirst() { + fun foo() { + java.JSecond().foo() + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJCircularProject/kotlinProject.iml b/jps/jps-plugin/testData/KJCircularProject/kotlinProject.iml new file mode 100644 index 00000000000..d04ecd6e02e --- /dev/null +++ b/jps/jps-plugin/testData/KJCircularProject/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJCircularProject/kotlinProject.ipr b/jps/jps-plugin/testData/KJCircularProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/KJCircularProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJCircularProject/src/java/JFirst.java b/jps/jps-plugin/testData/KJCircularProject/src/java/JFirst.java new file mode 100644 index 00000000000..686f3641b6c --- /dev/null +++ b/jps/jps-plugin/testData/KJCircularProject/src/java/JFirst.java @@ -0,0 +1,11 @@ +package java; + +public class JFirst { + public void foo() { + new kotlin.KFirst().foo(); + } + + public void bar() { + new kotlin.KFirst().bar(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJCircularProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/KJCircularProject/src/kotlin/KFirst.kt new file mode 100644 index 00000000000..38a327f0713 --- /dev/null +++ b/jps/jps-plugin/testData/KJCircularProject/src/kotlin/KFirst.kt @@ -0,0 +1,9 @@ +package kotlin + +class KFirst() { + fun foo() { + java.JFirst().bar() + } + + fun bar() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJKProject/kotlinProject.iml b/jps/jps-plugin/testData/KJKProject/kotlinProject.iml new file mode 100644 index 00000000000..864e89613d7 --- /dev/null +++ b/jps/jps-plugin/testData/KJKProject/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/KJKProject/kotlinProject.ipr b/jps/jps-plugin/testData/KJKProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/KJKProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJKProject/src/java/JFirst.java b/jps/jps-plugin/testData/KJKProject/src/java/JFirst.java new file mode 100644 index 00000000000..5423b46e09b --- /dev/null +++ b/jps/jps-plugin/testData/KJKProject/src/java/JFirst.java @@ -0,0 +1,7 @@ +package java; + +public class JFirst { + public void foo() { + new kotlin.KSecond().foo(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJKProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/KJKProject/src/kotlin/KFirst.kt new file mode 100644 index 00000000000..29600c79f20 --- /dev/null +++ b/jps/jps-plugin/testData/KJKProject/src/kotlin/KFirst.kt @@ -0,0 +1,7 @@ +package kotlin + +class KFirst() { + fun foo() { + java.JFirst().foo() + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJKProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/KJKProject/src/kotlin/KSecond.kt new file mode 100644 index 00000000000..56d654aed84 --- /dev/null +++ b/jps/jps-plugin/testData/KJKProject/src/kotlin/KSecond.kt @@ -0,0 +1,7 @@ +package kotlin + +class KSecond() { + fun foo() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.iml b/jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.iml new file mode 100644 index 00000000000..d04ecd6e02e --- /dev/null +++ b/jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.ipr b/jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/simpleKotlinJavaProject/src/Test.java b/jps/jps-plugin/testData/simpleKotlinJavaProject/src/Test.java new file mode 100644 index 00000000000..1c47016bd6d --- /dev/null +++ b/jps/jps-plugin/testData/simpleKotlinJavaProject/src/Test.java @@ -0,0 +1,6 @@ +import test.*; +class A { + public static void main(String[] args) { + new Foo().foo(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/simpleKotlinJavaProject/src/kotlinFile.kt b/jps/jps-plugin/testData/simpleKotlinJavaProject/src/kotlinFile.kt new file mode 100644 index 00000000000..cdf55aa68be --- /dev/null +++ b/jps/jps-plugin/testData/simpleKotlinJavaProject/src/kotlinFile.kt @@ -0,0 +1,7 @@ +package test + +class Foo() { + fun foo() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.iml b/jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.ipr b/jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/simpleKotlinProject/src/test1.kt b/jps/jps-plugin/testData/simpleKotlinProject/src/test1.kt new file mode 100644 index 00000000000..a2c4e958bb5 --- /dev/null +++ b/jps/jps-plugin/testData/simpleKotlinProject/src/test1.kt @@ -0,0 +1,3 @@ +fun foo() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/testOnlyDependency/kotlinProject.iml b/jps/jps-plugin/testData/testOnlyDependency/kotlinProject.iml new file mode 100644 index 00000000000..a441b33e10b --- /dev/null +++ b/jps/jps-plugin/testData/testOnlyDependency/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/testOnlyDependency/kotlinProject.ipr b/jps/jps-plugin/testData/testOnlyDependency/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/testOnlyDependency/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/testOnlyDependency/src/src.kt b/jps/jps-plugin/testData/testOnlyDependency/src/src.kt new file mode 100644 index 00000000000..2d1ad72754c --- /dev/null +++ b/jps/jps-plugin/testData/testOnlyDependency/src/src.kt @@ -0,0 +1 @@ +fun foo() { } \ No newline at end of file diff --git a/jps/jps-plugin/testData/testOnlyDependency/test/test.kt b/jps/jps-plugin/testData/testOnlyDependency/test/test.kt new file mode 100644 index 00000000000..e3cac1c58f9 --- /dev/null +++ b/jps/jps-plugin/testData/testOnlyDependency/test/test.kt @@ -0,0 +1,3 @@ +fun test() { + println("a") +} \ No newline at end of file From 9ba7e919421e1ebe5e0e432f4f8bcdb0bd3866f4 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 27 Nov 2012 15:33:09 +0400 Subject: [PATCH 0011/1557] Rename test projects for jps plugin. Do not lowercase first letter in project name Original commit: 1378f836f50d3a98548f1d3dc6d6b42c0775bac8 --- .../jps/build/AbstractKotlinJpsBuildTestCase.java | 2 +- .../jet/jps/build/KotlinJpsBuildTestCase.java | 12 ++++-------- .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/Test.java | 0 .../src/kotlinFile.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/test1.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/src.kt | 0 .../test/test.kt | 0 13 files changed, 5 insertions(+), 9 deletions(-) rename jps/jps-plugin/testData/{simpleKotlinJavaProject => KotlinJavaProject}/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{simpleKotlinJavaProject => KotlinJavaProject}/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{simpleKotlinJavaProject => KotlinJavaProject}/src/Test.java (100%) rename jps/jps-plugin/testData/{simpleKotlinJavaProject => KotlinJavaProject}/src/kotlinFile.kt (100%) rename jps/jps-plugin/testData/{simpleKotlinProject => KotlinProject}/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{simpleKotlinProject => KotlinProject}/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{simpleKotlinProject => KotlinProject}/src/test1.kt (100%) rename jps/jps-plugin/testData/{testOnlyDependency => TestDependencyLibrary}/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{testOnlyDependency => TestDependencyLibrary}/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{testOnlyDependency => TestDependencyLibrary}/src/src.kt (100%) rename jps/jps-plugin/testData/{testOnlyDependency => TestDependencyLibrary}/test/test.kt (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index 21ba13e51a1..50426cc6a6b 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -53,7 +53,7 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { } protected static File copyTestDataToTmpDir(File testDataDir) throws IOException { - assert testDataDir.exists() : "Cannot find source folder"; + assert testDataDir.exists() : "Cannot find source folder " + testDataDir.getAbsolutePath(); File tmpDir = FileUtil.createTempDirectory("jps-build", null); FileUtil.copyDir(testDataDir, tmpDir); return tmpDir; diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index cebba67b408..7def715e90a 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -29,7 +29,7 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { @Override public void setUp() throws Exception { super.setUp(); - File sourceFilesRoot = new File(TEST_DATA_PATH + File.separator + getTestName(true)); + File sourceFilesRoot = new File(TEST_DATA_PATH + getTestName(false)); workDir = copyTestDataToTmpDir(sourceFilesRoot); } @@ -49,11 +49,11 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { makeAll().assertSuccessful(); } - public void testSimpleKotlinProject() { + public void testKotlinProject() { doTest(); } - public void testSimpleKotlinJavaProject() { + public void testKotlinJavaProject() { doTest(); } @@ -69,11 +69,7 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { doTest(); } - public void testTwoModules() { - doTest(); - } - - public void testTestOnlyDependency() throws Throwable { + public void testTestDependencyLibrary() throws Throwable { initProject(); addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST); makeAll().assertSuccessful(); diff --git a/jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.iml b/jps/jps-plugin/testData/KotlinJavaProject/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.iml rename to jps/jps-plugin/testData/KotlinJavaProject/kotlinProject.iml diff --git a/jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.ipr b/jps/jps-plugin/testData/KotlinJavaProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.ipr rename to jps/jps-plugin/testData/KotlinJavaProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/simpleKotlinJavaProject/src/Test.java b/jps/jps-plugin/testData/KotlinJavaProject/src/Test.java similarity index 100% rename from jps/jps-plugin/testData/simpleKotlinJavaProject/src/Test.java rename to jps/jps-plugin/testData/KotlinJavaProject/src/Test.java diff --git a/jps/jps-plugin/testData/simpleKotlinJavaProject/src/kotlinFile.kt b/jps/jps-plugin/testData/KotlinJavaProject/src/kotlinFile.kt similarity index 100% rename from jps/jps-plugin/testData/simpleKotlinJavaProject/src/kotlinFile.kt rename to jps/jps-plugin/testData/KotlinJavaProject/src/kotlinFile.kt diff --git a/jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.iml b/jps/jps-plugin/testData/KotlinProject/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.iml rename to jps/jps-plugin/testData/KotlinProject/kotlinProject.iml diff --git a/jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.ipr b/jps/jps-plugin/testData/KotlinProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/simpleKotlinProject/kotlinProject.ipr rename to jps/jps-plugin/testData/KotlinProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/simpleKotlinProject/src/test1.kt b/jps/jps-plugin/testData/KotlinProject/src/test1.kt similarity index 100% rename from jps/jps-plugin/testData/simpleKotlinProject/src/test1.kt rename to jps/jps-plugin/testData/KotlinProject/src/test1.kt diff --git a/jps/jps-plugin/testData/testOnlyDependency/kotlinProject.iml b/jps/jps-plugin/testData/TestDependencyLibrary/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/testOnlyDependency/kotlinProject.iml rename to jps/jps-plugin/testData/TestDependencyLibrary/kotlinProject.iml diff --git a/jps/jps-plugin/testData/testOnlyDependency/kotlinProject.ipr b/jps/jps-plugin/testData/TestDependencyLibrary/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/testOnlyDependency/kotlinProject.ipr rename to jps/jps-plugin/testData/TestDependencyLibrary/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/testOnlyDependency/src/src.kt b/jps/jps-plugin/testData/TestDependencyLibrary/src/src.kt similarity index 100% rename from jps/jps-plugin/testData/testOnlyDependency/src/src.kt rename to jps/jps-plugin/testData/TestDependencyLibrary/src/src.kt diff --git a/jps/jps-plugin/testData/testOnlyDependency/test/test.kt b/jps/jps-plugin/testData/TestDependencyLibrary/test/test.kt similarity index 100% rename from jps/jps-plugin/testData/testOnlyDependency/test/test.kt rename to jps/jps-plugin/testData/TestDependencyLibrary/test/test.kt From 99d77e35935c44f7945fb415181d10bbed7e0e75 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 3 Dec 2012 12:28:39 +0400 Subject: [PATCH 0012/1557] Don't run the builder if there's no dirty files Original commit: 08a150b09e5d1b74bba1d02425a10a2fc73536db --- .../jetbrains/jet/jps/build/KotlinBuilder.java | 5 ++++- .../jet/jps/build/KotlinSourceFileCollector.java | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index c7471dcbca7..ae64dfd4eab 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -72,8 +72,11 @@ public class KotlinBuilder extends ModuleLevelBuilder { ModuleBuildTarget representativeTarget = chunk.representativeTarget(); // For non-incremental build: take all sources + if (!KotlinSourceFileCollector.hasDirtyFiles(dirtyFilesHolder)) { + return ExitCode.NOTHING_DONE; + } List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); - //List sourceFiles = getDirtySourceFiles(dirtyFilesHolder); + //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); if (sourceFiles.isEmpty()) { return ExitCode.NOTHING_DONE; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index d92306714e1..e02f9c31859 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.jps.build; +import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; @@ -50,6 +51,21 @@ public class KotlinSourceFileCollector { return sourceFiles; } + // For incremental compilation + public static boolean hasDirtyFiles(DirtyFilesHolder dirtyFilesHolder) + throws IOException { + final Ref result = Ref.create(false); + + dirtyFilesHolder.processDirtyFiles(new FileProcessor() { + @Override + public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { + result.set(true); + return false; + } + }); + return result.get(); + } + @NotNull public static List getAllKotlinSourceFiles(@NotNull ModuleBuildTarget target) { final List result = ContainerUtil.newArrayList(); From 40efae00509e54ac9888847a586a35fcd5468f80 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Thu, 6 Dec 2012 18:50:10 +0400 Subject: [PATCH 0013/1557] Add JpsTests for inheritance (J-K-J, K-J-K) Original commit: 1824879dd035942933105bfb55c500eac9db330a --- .../jet/jps/build/KotlinJpsBuildTestCase.java | 15 ++++++++++++++- .../JKJInheritanceProject/kotlinProject.iml | 13 +++++++++++++ .../JKJInheritanceProject/kotlinProject.ipr | 14 ++++++++++++++ .../JKJInheritanceProject/src/java/JFirst.java | 7 +++++++ .../JKJInheritanceProject/src/java/JSecond.java | 7 +++++++ .../JKJInheritanceProject/src/kotlin/KFirst.kt | 5 +++++ .../KJKInheritanceProject/kotlinProject.iml | 13 +++++++++++++ .../KJKInheritanceProject/kotlinProject.ipr | 14 ++++++++++++++ .../KJKInheritanceProject/src/java/JFirst.java | 4 ++++ .../KJKInheritanceProject/src/kotlin/KFirst.kt | 6 ++++++ .../KJKInheritanceProject/src/kotlin/KSecond.kt | 7 +++++++ 11 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java create mode 100644 jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt create mode 100644 jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index 7def715e90a..ec7ee3c206d 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -20,7 +20,6 @@ import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.jps.model.java.*; import java.io.File; -import java.io.IOException; public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { private static final String PROJECT_NAME = "kotlinProject"; @@ -49,6 +48,12 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { makeAll().assertSuccessful(); } + public void doTestWithRuntime() { + initProject(); + addKotlinRuntimeDependency(); + makeAll().assertSuccessful(); + } + public void testKotlinProject() { doTest(); } @@ -69,6 +74,14 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { doTest(); } + public void testJKJInheritanceProject() { + doTestWithRuntime(); + } + + public void testKJKInheritanceProject() { + doTestWithRuntime(); + } + public void testTestDependencyLibrary() throws Throwable { initProject(); addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST); diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml b/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml new file mode 100644 index 00000000000..10db71f5cd2 --- /dev/null +++ b/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr b/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java new file mode 100644 index 00000000000..681465bd981 --- /dev/null +++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java @@ -0,0 +1,7 @@ +package java; + +public class JFirst { + public void foo() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java new file mode 100644 index 00000000000..67a1468df22 --- /dev/null +++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java @@ -0,0 +1,7 @@ +package java; + +public class JSecond extends kotlin.KFirst { + public void bar() { + foo(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt new file mode 100644 index 00000000000..4aad7100d2d --- /dev/null +++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt @@ -0,0 +1,5 @@ +package kotlin + +open class KFirst(): java.JFirst() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml b/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml new file mode 100644 index 00000000000..864e89613d7 --- /dev/null +++ b/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr b/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java b/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java new file mode 100644 index 00000000000..9efa068707f --- /dev/null +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java @@ -0,0 +1,4 @@ +package java; + +public class JFirst extends kotlin.KFirst { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt new file mode 100644 index 00000000000..9e026a45f77 --- /dev/null +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt @@ -0,0 +1,6 @@ +package kotlin + +open class KFirst() { + fun foo() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt new file mode 100644 index 00000000000..eec804c1b7b --- /dev/null +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt @@ -0,0 +1,7 @@ +package kotlin + +class KSecond(): java.JFirst() { + fun bar() { + foo() + } +} \ No newline at end of file From f5749968a630b8c1607a10294ca3652cb326557a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 28 Jan 2013 18:57:25 +0400 Subject: [PATCH 0014/1557] Happy new year 2013! Original commit: 52b7ee6447685f00bcd913c8c7bc7719982b9c2d --- .../jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java | 2 +- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 +- .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 2 +- .../src/org/jetbrains/jet/jps/build/KotlinBuilderService.java | 2 +- .../org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java | 2 +- .../jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java | 2 +- .../org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java index 3950077dc4c..467d6976a59 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 JetBrains s.r.o. + * Copyright 2010-2013 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. diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index ae64dfd4eab..2fbeb0f7ef9 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 JetBrains s.r.o. + * Copyright 2010-2013 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. diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index c43e99653ed..7d7445c89bf 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 JetBrains s.r.o. + * Copyright 2010-2013 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. diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java index df253742ecf..08de8142505 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 JetBrains s.r.o. + * Copyright 2010-2013 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. diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index e02f9c31859..8a2d2838107 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 JetBrains s.r.o. + * Copyright 2010-2013 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. diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index 50426cc6a6b..aeabb3832db 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 JetBrains s.r.o. + * Copyright 2010-2013 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. diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index ec7ee3c206d..7461afc3328 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2012 JetBrains s.r.o. + * Copyright 2010-2013 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. From 0581d8b0af69aeda58a50fa4cb66997ad9333991 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 13 Mar 2013 14:11:44 +0400 Subject: [PATCH 0015/1557] Removed unnecessary final on local variables. Original commit: ec5331057a51930082906d09a72e4427fd190177 --- .../jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index aeabb3832db..7c35ae199be 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -65,7 +65,7 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { } @Override - protected JpsSdk addJdk(final String name, final String path) { + protected JpsSdk addJdk(String name, String path) { String homePath = System.getProperty("java.home"); String versionString = System.getProperty("java.version"); JpsTypedLibrary> jdk = myModel.getGlobal().addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE); From 779e15374907b2ddcfede9a71925c7904dadc123 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 26 Apr 2013 18:12:04 +0400 Subject: [PATCH 0016/1557] Interface extracted from KotlinModuleScriptGenerator Original commit: abd162d466dabeb6b18949e86513b1bfa7902add --- .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 7d7445c89bf..ed89aac90d1 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator; import org.jetbrains.jet.compiler.runner.KotlinModuleScriptGenerator; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.CompileContext; @@ -41,13 +42,13 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.compiler.runner.KotlinModuleScriptGenerator.DependencyProvider; +import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator.DependencyProvider; public class KotlinBuilderModuleScriptGenerator { public static File generateModuleScript(CompileContext context, ModuleBuildTarget target, List sourceFiles) throws IOException { - CharSequence moduleScriptText = KotlinModuleScriptGenerator.generateModuleScript( + CharSequence moduleScriptText = KotlinModuleScriptGenerator.INSTANCE.generateModuleScript( target.getId(), getKotlinModuleDependencies(context, target), sourceFiles, @@ -66,7 +67,7 @@ public class KotlinBuilderModuleScriptGenerator { private static DependencyProvider getKotlinModuleDependencies(final CompileContext context, final ModuleBuildTarget target) { return new DependencyProvider() { @Override - public void processClassPath(@NotNull KotlinModuleScriptGenerator.DependencyProcessor processor) { + public void processClassPath(@NotNull KotlinModuleDescriptionGenerator.DependencyProcessor processor) { processor.processClassPathSection("Classpath", findClassPathRoots(target)); processor.processClassPathSection("Java Source Roots", findSourceRoots(context, target)); processor.processAnnotationRoots(findAnnotationRoots(target)); From db0a5f4f80d8c8a433ca3e48124cbd918a4d2991 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 26 Apr 2013 20:35:04 +0400 Subject: [PATCH 0017/1557] Using XML instead of module scripts when running from IDE Original commit: f1f9d5327cb4e7f1674c273f6cc6fd9c4087537c --- .../jetbrains/jet/jps/build/KotlinBuilder.java | 4 ++-- .../KotlinBuilderModuleScriptGenerator.java | 16 +++++++++++----- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 2fbeb0f7ef9..2f0eb7bb58f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -82,7 +82,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - File scriptFile = KotlinBuilderModuleScriptGenerator.generateModuleScript(context, representativeTarget, sourceFiles); + File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, representativeTarget, sourceFiles); File outputDir = representativeTarget.getOutputDir(); @@ -99,7 +99,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { KotlinCompilerRunner.runCompiler( messageCollector, environment, - scriptFile, + moduleFile, outputItemCollector, /*runOutOfProcess = */false); diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index ed89aac90d1..ce53354d6ad 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -21,7 +21,7 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator; -import org.jetbrains.jet.compiler.runner.KotlinModuleScriptGenerator; +import org.jetbrains.jet.compiler.runner.KotlinModuleXmlGenerator; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; @@ -33,7 +33,10 @@ import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; import org.jetbrains.jps.model.java.JpsJavaExtensionService; import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.JpsLibraryRoot; -import org.jetbrains.jps.model.module.*; +import org.jetbrains.jps.model.module.JpsDependencyElement; +import org.jetbrains.jps.model.module.JpsLibraryDependency; +import org.jetbrains.jps.model.module.JpsModule; +import org.jetbrains.jps.model.module.JpsSdkDependency; import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; @@ -45,10 +48,13 @@ import java.util.List; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator.DependencyProvider; public class KotlinBuilderModuleScriptGenerator { - public static File generateModuleScript(CompileContext context, ModuleBuildTarget target, List sourceFiles) + + public static final KotlinModuleDescriptionGenerator GENERATOR = KotlinModuleXmlGenerator.INSTANCE; + + public static File generateModuleDescription(CompileContext context, ModuleBuildTarget target, List sourceFiles) throws IOException { - CharSequence moduleScriptText = KotlinModuleScriptGenerator.INSTANCE.generateModuleScript( + CharSequence moduleScriptText = GENERATOR.generateModuleScript( target.getId(), getKotlinModuleDependencies(context, target), sourceFiles, @@ -57,7 +63,7 @@ public class KotlinBuilderModuleScriptGenerator { Collections.singleton(target.getOutputDir()) ); - File scriptFile = new File(target.getOutputDir(), "script.kts"); + File scriptFile = new File(target.getOutputDir(), "script." + GENERATOR.getFileExtension()); writeScriptToFile(context, moduleScriptText, scriptFile); From 77a22016f455f6a9ed9f5afcc7acbaf702bf071f Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 29 May 2013 21:07:54 +0400 Subject: [PATCH 0018/1557] Do not fail on circular dependencies + better message Original commit: 6465abe7eb02304bc9a4698031bb9c45a3095391 --- .../jet/jps/build/KotlinBuilder.java | 20 ++++++++++++++++--- .../jet/jps/build/KotlinJpsBuildTestCase.java | 4 ++++ .../kotlinProject.iml | 14 +++++++++++++ .../kotlinProject.ipr | 15 ++++++++++++++ .../module2/module2.iml | 14 +++++++++++++ .../module2/src/JSecond.java | 5 +++++ .../src/JFirst.java | 11 ++++++++++ 7 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 2f0eb7bb58f..0d88d6e635b 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,6 +16,8 @@ package org.jetbrains.jet.jps.build; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; @@ -29,19 +31,27 @@ import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; +import org.jetbrains.jps.model.module.JpsModule; import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; public class KotlinBuilder extends ModuleLevelBuilder { private static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; + private static final Function MODULE_NAME = new Function() { + @Override + public String fun(JpsModule module) { + return module.getName(); + } + }; + protected KotlinBuilder() { super(BuilderCategory.SOURCE_PROCESSOR); } @@ -63,10 +73,14 @@ public class KotlinBuilder extends ModuleLevelBuilder { MessageCollector messageCollector = new MessageCollectorAdapter(context); if (chunk.getModules().size() > 1) { + // We do not support circular dependencies, but if they are present, we should not break the build, + // so we simply yield a warning and report NOTHING_DONE messageCollector.report( - ERROR, "Circular dependencies are not supported: " + chunk.getModules(), + WARNING, "Circular dependencies are not supported. " + + "The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + + "Kotlin is not compiled for these modules", CompilerMessageLocation.NO_LOCATION); - return ExitCode.ABORT; + return ExitCode.NOTHING_DONE; } ModuleBuildTarget representativeTarget = chunk.representativeTarget(); diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index 7461afc3328..72c20c11c83 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -82,6 +82,10 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { doTestWithRuntime(); } + public void testCircularDependenciesNoKotlinFiles() { + doTest(); + } + public void testTestDependencyLibrary() throws Throwable { initProject(); addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST); diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml new file mode 100644 index 00000000000..5559c7ad919 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr new file mode 100644 index 00000000000..809737b0b76 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml new file mode 100644 index 00000000000..eace69878a2 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java new file mode 100644 index 00000000000..e034bf38792 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java @@ -0,0 +1,5 @@ +public class JSecond { + public static void main(String[] args) { + new JFirst().foo(); + } +} diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java new file mode 100644 index 00000000000..12140d2a7e4 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java @@ -0,0 +1,11 @@ +public class JFirst { + JSecond s = null; + + public void foo() { + + } + + public static void main(String[] args) { + System.out.println(1); + } +} \ No newline at end of file From 8b0054af3972409fc6c7f9154d64bd116cd52e3f Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 29 May 2013 21:07:54 +0400 Subject: [PATCH 0019/1557] Do not fail on circular dependencies + better message Original commit: a8267b370e9eb0935025fd8e1b9981ac15efd9db --- .../jet/jps/build/KotlinBuilder.java | 20 ++++++++++++++++--- .../jet/jps/build/KotlinJpsBuildTestCase.java | 4 ++++ .../kotlinProject.iml | 14 +++++++++++++ .../kotlinProject.ipr | 15 ++++++++++++++ .../module2/module2.iml | 14 +++++++++++++ .../module2/src/JSecond.java | 5 +++++ .../src/JFirst.java | 11 ++++++++++ 7 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java create mode 100644 jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 2f0eb7bb58f..0d88d6e635b 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,6 +16,8 @@ package org.jetbrains.jet.jps.build; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; @@ -29,19 +31,27 @@ import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; +import org.jetbrains.jps.model.module.JpsModule; import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.List; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; public class KotlinBuilder extends ModuleLevelBuilder { private static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; + private static final Function MODULE_NAME = new Function() { + @Override + public String fun(JpsModule module) { + return module.getName(); + } + }; + protected KotlinBuilder() { super(BuilderCategory.SOURCE_PROCESSOR); } @@ -63,10 +73,14 @@ public class KotlinBuilder extends ModuleLevelBuilder { MessageCollector messageCollector = new MessageCollectorAdapter(context); if (chunk.getModules().size() > 1) { + // We do not support circular dependencies, but if they are present, we should not break the build, + // so we simply yield a warning and report NOTHING_DONE messageCollector.report( - ERROR, "Circular dependencies are not supported: " + chunk.getModules(), + WARNING, "Circular dependencies are not supported. " + + "The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + + "Kotlin is not compiled for these modules", CompilerMessageLocation.NO_LOCATION); - return ExitCode.ABORT; + return ExitCode.NOTHING_DONE; } ModuleBuildTarget representativeTarget = chunk.representativeTarget(); diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index 7461afc3328..72c20c11c83 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -82,6 +82,10 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { doTestWithRuntime(); } + public void testCircularDependenciesNoKotlinFiles() { + doTest(); + } + public void testTestDependencyLibrary() throws Throwable { initProject(); addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST); diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml new file mode 100644 index 00000000000..5559c7ad919 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr new file mode 100644 index 00000000000..809737b0b76 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml new file mode 100644 index 00000000000..eace69878a2 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java new file mode 100644 index 00000000000..e034bf38792 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java @@ -0,0 +1,5 @@ +public class JSecond { + public static void main(String[] args) { + new JFirst().foo(); + } +} diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java new file mode 100644 index 00000000000..12140d2a7e4 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java @@ -0,0 +1,11 @@ +public class JFirst { + JSecond s = null; + + public void foo() { + + } + + public static void main(String[] args) { + System.out.println(1); + } +} \ No newline at end of file From 005124ed27f80e41543b1fea5106fe61f5651ad0 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 31 May 2013 20:26:18 +0400 Subject: [PATCH 0020/1557] Support custom JDK annotations path for TeamCity Original commit: 6d6e627641a9cc292c2023653ce58f29bf016c3d --- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index ce53354d6ad..593cf2407c6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -130,6 +130,16 @@ public class KotlinBuilderModuleScriptGenerator { } } + // JDK is stored locally on user's machine, so its configuration, including external annotation paths + // is not available on TeamCity. When running on TeamCity, one has to provide extra path to JDK annotations + String extraAnnotationsPaths = System.getProperty("jps.kotlin.extra.annotation.paths"); + if (extraAnnotationsPaths != null) { + String[] paths = extraAnnotationsPaths.split(File.pathSeparator); + for (String path : paths) { + annotationRootFiles.add(new File(path)); + } + } + return annotationRootFiles; } From 9defbe00839d0cdcb257e6e4b2eb35720174e72f Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 10 Jun 2013 14:45:11 +0400 Subject: [PATCH 0021/1557] Path separator must be constant TeamCity agents have different OS'es, but build parameters are fixed Original commit: 7171cd4cc5d7e14b49f6e03593b05d9016579c52 --- .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 593cf2407c6..33b523dab54 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -134,7 +134,7 @@ public class KotlinBuilderModuleScriptGenerator { // is not available on TeamCity. When running on TeamCity, one has to provide extra path to JDK annotations String extraAnnotationsPaths = System.getProperty("jps.kotlin.extra.annotation.paths"); if (extraAnnotationsPaths != null) { - String[] paths = extraAnnotationsPaths.split(File.pathSeparator); + String[] paths = extraAnnotationsPaths.split(";"); for (String path : paths) { annotationRootFiles.add(new File(path)); } From eba00a0cd9627915d16ff403c923e1ba2952406f Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 25 Jul 2013 15:51:23 +0400 Subject: [PATCH 0022/1557] Log version in JPS plugin CompilerVersion.java is moved to cli-common (shared between compiler and JPS plugin) and renamed to KotlinVersion This is needed because on TeamCity a JPS plugin is configured separately from the compiler, so it may happen that JPS plugin version X tries to run compiler version X+100, and causes trouble. Original commit: 387bf2601b3b3a77becd8919f7850fac35acff13 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 0d88d6e635b..a5477e2ae50 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.cli.common.KotlinVersion; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; @@ -39,6 +40,7 @@ import java.util.Collection; import java.util.List; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.INFO; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; public class KotlinBuilder extends ModuleLevelBuilder { @@ -69,9 +71,10 @@ public class KotlinBuilder extends ModuleLevelBuilder { DirtyFilesHolder dirtyFilesHolder, OutputConsumer outputConsumer ) throws ProjectBuildException, IOException { - MessageCollector messageCollector = new MessageCollectorAdapter(context); + messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION); + if (chunk.getModules().size() > 1) { // We do not support circular dependencies, but if they are present, we should not break the build, // so we simply yield a warning and report NOTHING_DONE From cfa8694eb749c0db2773d5ebee5c98b61b2aa421 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Thu, 8 Aug 2013 14:02:29 +0400 Subject: [PATCH 0023/1557] Disable kotlin-jps-plugin when java-jps-plugin is disabled Original commit: 2cc4638b099fb4fd43a68ba5639ed614fd4d6264 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index a5477e2ae50..e215ecb5955 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -30,6 +30,7 @@ import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; +import org.jetbrains.jps.incremental.java.JavaBuilder; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; import org.jetbrains.jps.model.module.JpsModule; @@ -72,6 +73,10 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputConsumer outputConsumer ) throws ProjectBuildException, IOException { MessageCollector messageCollector = new MessageCollectorAdapter(context); + if (!JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) { + messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION); + return ExitCode.NOTHING_DONE; + } messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION); From 48ac33d730307a4c1f7e4dd3ec4e436eae1ab84c Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Thu, 8 Aug 2013 15:50:20 +0400 Subject: [PATCH 0024/1557] Check is JavaBuilder.IS_ENABLED public Original commit: bc9af296a5cd1fa785aa099937b91f5784a54613 --- .../org/jetbrains/jet/jps/build/KotlinBuilder.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index e215ecb5955..998759523e2 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -37,6 +37,8 @@ import org.jetbrains.jps.model.module.JpsModule; import java.io.File; import java.io.IOException; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; import java.util.Collection; import java.util.List; @@ -73,7 +75,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputConsumer outputConsumer ) throws ProjectBuildException, IOException { MessageCollector messageCollector = new MessageCollectorAdapter(context); - if (!JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE)) { + if (!isJavaPluginEnabled(context)) { messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION); return ExitCode.NOTHING_DONE; } @@ -135,6 +137,16 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.OK; } + private static boolean isJavaPluginEnabled(@NotNull CompileContext context) { + try { + Field javaPluginIsEnabledField = JavaBuilder.class.getDeclaredField("IS_ENABLED"); + return Modifier.isPublic(javaPluginIsEnabledField.getModifiers()) ? JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE) : true; + } + catch (NoSuchFieldException e) { + throw new IllegalArgumentException("Cannot check if Java Jps Plugin is enabled", e); + } + } + private static Collection paths(Collection files) { Collection result = ContainerUtil.newArrayList(); for (File file : files) { From 160070be27ac14ed551864ef89ca81b03a747938 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Thu, 8 Aug 2013 15:52:45 +0400 Subject: [PATCH 0025/1557] Implement method from super class Original commit: aec1fa86976ac7fab3fa27b32fcd830e8c2cef7e --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 998759523e2..02fa06e14f9 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -40,6 +40,7 @@ import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Collection; +import java.util.Collections; import java.util.List; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; @@ -49,6 +50,7 @@ import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARN public class KotlinBuilder extends ModuleLevelBuilder { private static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; + private static final List COMPILABLE_FILE_EXTENSIONS = Collections.singletonList("kt"); private static final Function MODULE_NAME = new Function() { @Override @@ -202,4 +204,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { } } + + @Override + public List getCompilableFileExtensions() { + return COMPILABLE_FILE_EXTENSIONS; + } } From f2ba3cf1577b47fb860495a86b1af3a8b47a45cc Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 18 Jul 2013 15:47:39 +0400 Subject: [PATCH 0026/1557] Rename package in JPS plugin tests Package 'kotlin' is not supported until package views are implemented, because its name clashes with the stdlib Original commit: 2af8dd42988351f519a44f5987eb085c8bdc4ac5 --- .../testData/JKJInheritanceProject/src/java/JSecond.java | 4 ++-- .../testData/JKJInheritanceProject/src/kotlin/KFirst.kt | 4 ++-- .../testData/KJKInheritanceProject/src/java/JFirst.java | 4 ++-- .../testData/KJKInheritanceProject/src/kotlin/KFirst.kt | 4 ++-- .../testData/KJKInheritanceProject/src/kotlin/KSecond.kt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java index 67a1468df22..8642080e27e 100644 --- a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java +++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java @@ -1,7 +1,7 @@ package java; -public class JSecond extends kotlin.KFirst { +public class JSecond extends kt.KFirst { public void bar() { foo(); } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt index 4aad7100d2d..0b2d2794572 100644 --- a/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt +++ b/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt @@ -1,5 +1,5 @@ -package kotlin +package kt open class KFirst(): java.JFirst() { -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java b/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java index 9efa068707f..987a5777332 100644 --- a/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java @@ -1,4 +1,4 @@ package java; -public class JFirst extends kotlin.KFirst { -} \ No newline at end of file +public class JFirst extends kt.KFirst { +} diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt index 9e026a45f77..8a5eaf4c6de 100644 --- a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt @@ -1,6 +1,6 @@ -package kotlin +package kt open class KFirst() { fun foo() { } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt index eec804c1b7b..a36c93094f3 100644 --- a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt +++ b/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt @@ -1,7 +1,7 @@ -package kotlin +package kt class KSecond(): java.JFirst() { fun bar() { foo() } -} \ No newline at end of file +} From e092d00c2e1f68faa568dca2ca206f8065f83503 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 27 Aug 2013 15:19:52 +0400 Subject: [PATCH 0027/1557] Support exported dependencies Original commit: 5c58cb946cd73253d35b7b762969fe059c861d15 --- .../KotlinBuilderModuleScriptGenerator.java | 2 +- .../build/AbstractKotlinJpsBuildTestCase.java | 9 +++++---- .../jet/jps/build/KotlinJpsBuildTestCase.java | 17 ++++++++++++++++- .../ReexportedDependency/kotlinProject.iml | 13 +++++++++++++ .../ReexportedDependency/kotlinProject.ipr | 16 ++++++++++++++++ .../ReexportedDependency/module2/module2.iml | 13 +++++++++++++ .../module2/src/JSecond.java | 2 ++ .../ReexportedDependency/module2/src/my.kt | 1 + .../ReexportedDependency/module3/module3.iml | 13 +++++++++++++ .../ReexportedDependency/module3/src/m3.kt | 5 +++++ .../testData/ReexportedDependency/src/main.kt | 6 ++++++ 11 files changed, 91 insertions(+), 6 deletions(-) create mode 100644 jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml create mode 100644 jps/jps-plugin/testData/ReexportedDependency/module2/src/JSecond.java create mode 100644 jps/jps-plugin/testData/ReexportedDependency/module2/src/my.kt create mode 100644 jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml create mode 100644 jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt create mode 100644 jps/jps-plugin/testData/ReexportedDependency/src/main.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 33b523dab54..f6c25fe36dc 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -93,7 +93,7 @@ public class KotlinBuilderModuleScriptGenerator { @NotNull private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { JpsModule module = target.getModule(); - JpsJavaDependenciesEnumerator dependencies = JpsJavaExtensionService.dependencies(module) + JpsJavaDependenciesEnumerator dependencies = JpsJavaExtensionService.dependencies(module).recursively().exportedOnly() .includedIn(JpsJavaClasspathKind.compile(target.isTests())); return dependencies.classes().getRoots(); diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index 7c35ae199be..7dd4d207f22 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -34,6 +34,7 @@ import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; import java.io.IOException; +import java.util.Collection; public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { protected static final String TEST_DATA_PATH = "jps-plugin/testData/"; @@ -75,15 +76,15 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { } protected JpsLibrary addKotlinRuntimeDependency() { - return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE); + return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, myProject.getModules(), false); } - protected JpsLibrary addKotlinRuntimeDependency(JpsJavaDependencyScope type) { + protected JpsLibrary addKotlinRuntimeDependency(JpsJavaDependencyScope type, Collection modules, boolean exported) { JpsLibrary library = myProject.addLibrary("kotlin-runtime", JpsJavaLibraryType.INSTANCE); File runtime = PathUtil.getKotlinPathsForDistDirectory().getRuntimePath(); library.addRoot(runtime, JpsOrderRootType.COMPILED); - for (JpsModule module : myProject.getModules()) { - JpsModuleRootModificationUtil.addDependency(module, library, type, false); + for (JpsModule module : modules) { + JpsModuleRootModificationUtil.addDependency(module, library, type, exported); } return library; } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index 72c20c11c83..599312d91c1 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -16,8 +16,11 @@ package org.jetbrains.jet.jps.build; +import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.jps.model.java.*; +import org.jetbrains.jps.model.module.JpsModule; import java.io.File; @@ -88,10 +91,22 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { public void testTestDependencyLibrary() throws Throwable { initProject(); - addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST); + addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST, myProject.getModules(), false); makeAll().assertSuccessful(); change(workDir + "/src/src.kt", "fun foo() { println() }"); makeAll().assertFailed(); } + public void testReexportedDependency() { + initProject(); + addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, + ContainerUtil.filter(myProject.getModules(), new Condition() { + @Override + public boolean value(JpsModule module) { + return module.getName().equals("module2"); + } + }), true); + makeAll().assertSuccessful(); + } + } diff --git a/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml b/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml new file mode 100644 index 00000000000..96db211cad3 --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr b/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr new file mode 100644 index 00000000000..15ec79bc197 --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml b/jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml new file mode 100644 index 00000000000..cb508e885e9 --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/src/JSecond.java b/jps/jps-plugin/testData/ReexportedDependency/module2/src/JSecond.java new file mode 100644 index 00000000000..3e46ffeedad --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/module2/src/JSecond.java @@ -0,0 +1,2 @@ +public class JSecond { +} diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/src/my.kt b/jps/jps-plugin/testData/ReexportedDependency/module2/src/my.kt new file mode 100644 index 00000000000..ad29e527067 --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/module2/src/my.kt @@ -0,0 +1 @@ +class K2 \ No newline at end of file diff --git a/jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml b/jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml new file mode 100644 index 00000000000..f15211f1c99 --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt b/jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt new file mode 100644 index 00000000000..71200d6e0df --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt @@ -0,0 +1,5 @@ +fun f() { + JSecond() + K2() + println("Hi") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/ReexportedDependency/src/main.kt b/jps/jps-plugin/testData/ReexportedDependency/src/main.kt new file mode 100644 index 00000000000..62660cffa29 --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/src/main.kt @@ -0,0 +1,6 @@ +fun main() { + f() + JSecond() + K2() + println("Hi") +} \ No newline at end of file From 1d3458ab998a27984063d8d6622896165f435841 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 29 Aug 2013 20:02:47 +0400 Subject: [PATCH 0028/1557] Using annotations from reexported libraries Original commit: 1e91fb8d27d5a28a82bdba78d8319a19fcfcadf0 --- .../KotlinBuilderModuleScriptGenerator.java | 38 ++++++++---------- .../ReexportedDependency/kotlinProject.iml | 2 +- .../ReexportedDependency/kotlinProject.ipr | 15 +++++++ .../module2/lib/j/J.class | Bin 0 -> 254 bytes .../ReexportedDependency/module2/lib/j/J.java | 9 +++++ .../module2/lib/j/annotations.xml | 5 +++ .../ReexportedDependency/module2/module2.iml | 5 ++- .../ReexportedDependency/module3/module3.iml | 2 +- .../ReexportedDependency/module3/src/m3.kt | 5 ++- .../testData/ReexportedDependency/src/main.kt | 1 + 10 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.class create mode 100644 jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java create mode 100644 jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index f6c25fe36dc..c1b7a2cccf8 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -27,17 +27,13 @@ import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.jetbrains.jps.model.java.JpsAnnotationRootType; -import org.jetbrains.jps.model.java.JpsJavaClasspathKind; -import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; -import org.jetbrains.jps.model.java.JpsJavaExtensionService; +import org.jetbrains.jps.model.JpsDummyElement; +import org.jetbrains.jps.model.java.*; import org.jetbrains.jps.model.library.JpsLibrary; -import org.jetbrains.jps.model.library.JpsLibraryRoot; +import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.module.JpsDependencyElement; import org.jetbrains.jps.model.module.JpsLibraryDependency; -import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsSdkDependency; -import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; import java.io.IOException; @@ -92,11 +88,8 @@ public class KotlinBuilderModuleScriptGenerator { @NotNull private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { - JpsModule module = target.getModule(); - JpsJavaDependenciesEnumerator dependencies = JpsJavaExtensionService.dependencies(module).recursively().exportedOnly() - .includedIn(JpsJavaClasspathKind.compile(target.isTests())); - return dependencies.classes().getRoots(); + return getAllDependencies(target).classes().getRoots(); } @NotNull @@ -114,20 +107,15 @@ public class KotlinBuilderModuleScriptGenerator { @NotNull private static List findAnnotationRoots(@NotNull ModuleBuildTarget target) { - JpsModule module = target.getModule(); - List dependencies = module.getDependenciesList().getDependencies(); - List annotationRootFiles = ContainerUtil.newArrayList(); - for (JpsDependencyElement dependencyElement : dependencies) { - JpsLibrary library = getLibrary(dependencyElement); - if (library == null) continue; - List annotationRoots = library.getRoots(JpsAnnotationRootType.INSTANCE); - for (JpsLibraryRoot root : annotationRoots) { - File file = new File(JpsPathUtil.urlToPath(root.getUrl())); + JpsSdk sdk = target.getModule().getSdk(JpsJavaSdkType.INSTANCE); + if (sdk != null) { + annotationRootFiles.addAll(sdk.getParent().getFiles(JpsAnnotationRootType.INSTANCE)); + } - annotationRootFiles.add(file); - } + for (JpsLibrary library : getAllDependencies(target).getLibraries()) { + annotationRootFiles.addAll(library.getFiles(JpsAnnotationRootType.INSTANCE)); } // JDK is stored locally on user's machine, so its configuration, including external annotation paths @@ -143,6 +131,12 @@ public class KotlinBuilderModuleScriptGenerator { return annotationRootFiles; } + @NotNull + private static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { + return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly() + .includedIn(JpsJavaClasspathKind.compile(target.isTests())); + } + @Nullable private static JpsLibrary getLibrary(@NotNull JpsDependencyElement dependencyElement) { if (dependencyElement instanceof JpsSdkDependency) { diff --git a/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml b/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml index 96db211cad3..d0e6f385eb5 100644 --- a/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml +++ b/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml @@ -5,7 +5,7 @@ - + diff --git a/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr b/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr index 15ec79bc197..79176c748e4 100644 --- a/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr +++ b/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr @@ -13,4 +13,19 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.class b/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.class new file mode 100644 index 0000000000000000000000000000000000000000..7acb6f1e5255101eae568638ab1f05e2faef0eeb GIT binary patch literal 254 zcmYk0F>iuU6otC=8bdaHAO_wGP#OPqt9rS4)p^y;h?`o$e9r^?OQBBXA z>K)E`_uTI!@A~`w1K!rFPw0u9}xD zFPYfqx)#i$cw1!eSyE=zB{{T>t}c%P|4?_$QEjv#-E?J;01jLMSS^xNF#hlD^Fke4 yEMfCAW-L;qsUEilokckJUyx5e1bwPGGo%jSQw=(&o7A3KAGBN0<2GbwA@~D26eimM literal 0 HcmV?d00001 diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java b/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java new file mode 100644 index 00000000000..bfa3c7fce0e --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java @@ -0,0 +1,9 @@ +package j; + +import java.lang.String; + +public class J { + public String foo() { + return ""; + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml b/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml new file mode 100644 index 00000000000..fed8e0dba5a --- /dev/null +++ b/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml b/jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml index cb508e885e9..053fd136108 100644 --- a/jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml +++ b/jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml @@ -5,9 +5,10 @@ - + - + + diff --git a/jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml b/jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml index f15211f1c99..ec820d23084 100644 --- a/jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml +++ b/jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml @@ -5,7 +5,7 @@ - + diff --git a/jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt b/jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt index 71200d6e0df..3310c2c0f0f 100644 --- a/jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt +++ b/jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt @@ -2,4 +2,7 @@ fun f() { JSecond() K2() println("Hi") -} \ No newline at end of file + takeNN(j.J().foo()) +} + +fun takeNN(a: Any) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/ReexportedDependency/src/main.kt b/jps/jps-plugin/testData/ReexportedDependency/src/main.kt index 62660cffa29..da493d01c7d 100644 --- a/jps/jps-plugin/testData/ReexportedDependency/src/main.kt +++ b/jps/jps-plugin/testData/ReexportedDependency/src/main.kt @@ -3,4 +3,5 @@ fun main() { JSecond() K2() println("Hi") + takeNN(j.J().foo()) } \ No newline at end of file From a9f6f525a4d800b49f39d6f224b0f4f468ab8471 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 10 Sep 2013 16:22:26 +0400 Subject: [PATCH 0029/1557] Missed sdk annotations for Android Sdk #KT-3965 Fixed Original commit: 188e8b983eb9c2b2c7d42139b1f0168ab8d78294 --- .../build/KotlinBuilderModuleScriptGenerator.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index c1b7a2cccf8..beecde4bfad 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -31,8 +31,10 @@ import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.java.*; import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.sdk.JpsSdk; +import org.jetbrains.jps.model.library.sdk.JpsSdkType; import org.jetbrains.jps.model.module.JpsDependencyElement; import org.jetbrains.jps.model.module.JpsLibraryDependency; +import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsSdkDependency; import java.io.File; @@ -109,7 +111,8 @@ public class KotlinBuilderModuleScriptGenerator { private static List findAnnotationRoots(@NotNull ModuleBuildTarget target) { List annotationRootFiles = ContainerUtil.newArrayList(); - JpsSdk sdk = target.getModule().getSdk(JpsJavaSdkType.INSTANCE); + JpsModule module = target.getModule(); + JpsSdk sdk = module.getSdk(getSdkType(module)); if (sdk != null) { annotationRootFiles.addAll(sdk.getParent().getFiles(JpsAnnotationRootType.INSTANCE)); } @@ -131,6 +134,16 @@ public class KotlinBuilderModuleScriptGenerator { return annotationRootFiles; } + @NotNull + private static JpsSdkType getSdkType(@NotNull JpsModule module) { + for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) { + if (dependency instanceof JpsSdkDependency) { + return ((JpsSdkDependency) dependency).getSdkType(); + } + } + return JpsJavaSdkType.INSTANCE; + } + @NotNull private static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly() From 81a216cb0ebd96e1b93a2f6382ebeb03277c3857 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 1 Oct 2013 19:46:56 +0400 Subject: [PATCH 0030/1557] JPS plugin: remove unnecessary method KotlinSourceFileCollector#hasDirtyFiles. Original commit: fc6b77366aa95bf2bcf652d0b205286f1b37d1ef --- .../jetbrains/jet/jps/build/KotlinBuilder.java | 2 +- .../jet/jps/build/KotlinSourceFileCollector.java | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 02fa06e14f9..b4522aec9da 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -98,7 +98,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { ModuleBuildTarget representativeTarget = chunk.representativeTarget(); // For non-incremental build: take all sources - if (!KotlinSourceFileCollector.hasDirtyFiles(dirtyFilesHolder)) { + if (!dirtyFilesHolder.hasDirtyFiles()) { return ExitCode.NOTHING_DONE; } List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index 8a2d2838107..029a59ff91e 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.jps.build; -import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; @@ -51,21 +50,6 @@ public class KotlinSourceFileCollector { return sourceFiles; } - // For incremental compilation - public static boolean hasDirtyFiles(DirtyFilesHolder dirtyFilesHolder) - throws IOException { - final Ref result = Ref.create(false); - - dirtyFilesHolder.processDirtyFiles(new FileProcessor() { - @Override - public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { - result.set(true); - return false; - } - }); - return result.get(); - } - @NotNull public static List getAllKotlinSourceFiles(@NotNull ModuleBuildTarget target) { final List result = ContainerUtil.newArrayList(); From 7906832d75712b884473ec08befcb4259700612a Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 1 Oct 2013 20:40:48 +0400 Subject: [PATCH 0031/1557] JPS plugin: make the code more understandable -- added some comments and rename scriptFile to moduleFile. Original commit: cfb7104ae9e3cdfa06c7a062469009b7cc981bed --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index b4522aec9da..39d6cef1493 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -77,6 +77,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputConsumer outputConsumer ) throws ProjectBuildException, IOException { MessageCollector messageCollector = new MessageCollectorAdapter(context); + // Workaround for Android Studio if (!isJavaPluginEnabled(context)) { messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION); return ExitCode.NOTHING_DONE; @@ -141,6 +142,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { private static boolean isJavaPluginEnabled(@NotNull CompileContext context) { try { + // Using reflection for backward compatibility with IDEA 12 Field javaPluginIsEnabledField = JavaBuilder.class.getDeclaredField("IS_ENABLED"); return Modifier.isPublic(javaPluginIsEnabledField.getModifiers()) ? JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE) : true; } From a048b51f4b154b8d3425f6e34d481fc99d45a02a Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 3 Oct 2013 12:47:47 +0400 Subject: [PATCH 0032/1557] JPS plugin: add support external compilation for JS modules. Original commit: 2b9b563efb851e5b619a0693aeac4c8659aeab77 --- .../org/jetbrains/jet/jps/build/JpsUtil.java | 31 +++++++ .../jet/jps/build/KotlinBuilder.java | 92 ++++++++++++++++--- .../KotlinBuilderModuleScriptGenerator.java | 8 +- 3 files changed, 110 insertions(+), 21 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtil.java diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtil.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtil.java new file mode 100644 index 00000000000..3fa9a5d1947 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtil.java @@ -0,0 +1,31 @@ +/* + * Copyright 2010-2013 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.jps.build; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jps.incremental.ModuleBuildTarget; +import org.jetbrains.jps.model.java.JpsJavaClasspathKind; +import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; +import org.jetbrains.jps.model.java.JpsJavaExtensionService; + +public class JpsUtil { + @NotNull + public static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { + return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly() + .includedIn(JpsJavaClasspathKind.compile(target.isTests())); + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 39d6cef1493..4d4680f9ea8 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -17,6 +17,7 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.Consumer; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -25,6 +26,7 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.compiler.runner.*; +import org.jetbrains.jet.utils.LibraryUtils; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -33,19 +35,22 @@ import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.java.JavaBuilder; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; +import org.jetbrains.jps.model.java.JavaSourceRootType; +import org.jetbrains.jps.model.java.JpsJavaModuleType; +import org.jetbrains.jps.model.library.JpsLibrary; +import org.jetbrains.jps.model.library.JpsLibraryRoot; +import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.model.module.JpsModule; +import org.jetbrains.jps.model.module.JpsModuleSourceRoot; +import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.Collections; -import java.util.List; +import java.util.*; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.INFO; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*; public class KotlinBuilder extends ModuleLevelBuilder { @@ -109,8 +114,6 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, representativeTarget, sourceFiles); - File outputDir = representativeTarget.getOutputDir(); CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir); @@ -123,12 +126,27 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl(outputDir); - KotlinCompilerRunner.runCompiler( - messageCollector, - environment, - moduleFile, - outputItemCollector, - /*runOutOfProcess = */false); + if (isJsKotlinModule(representativeTarget)) { + File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); + + KotlinCompilerRunner.runK2JsCompiler( + messageCollector, + environment, + outputItemCollector, + sourceFiles, + getLibraryFilesAndDependencies(representativeTarget), + outputFile); + } + else { + File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, representativeTarget, sourceFiles); + + KotlinCompilerRunner.runK2JvmCompiler( + messageCollector, + environment, + moduleFile, + outputItemCollector, + /*runOutOfProcess = */false); + } for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { outputConsumer.registerOutputFile( @@ -211,4 +229,50 @@ public class KotlinBuilder extends ModuleLevelBuilder { public List getCompilableFileExtensions() { return COMPILABLE_FILE_EXTENSIONS; } + + private static boolean isJsKotlinModule(@NotNull ModuleBuildTarget target) { + Set libraries = JpsUtil.getAllDependencies(target).getLibraries(); + for (JpsLibrary library : libraries) { + for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { + if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(root.getUrl()))) + return true; + } + } + return false; + } + + @NotNull + private static Set getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { + Set result = new HashSet(); + getLibraryPaths(target, result); + getDependencyModulesAndSources(target, result); + return result; + } + + private static void getLibraryPaths(@NotNull ModuleBuildTarget target, Set result) { + Set libraries = JpsUtil.getAllDependencies(target).getLibraries(); + for (JpsLibrary library : libraries) { + for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { + String path = JpsPathUtil.urlToOsPath(root.getUrl()); + if (path.endsWith(PathUtil.JS_LIB_JAR_NAME)) { + result.add(path); + } + } + } + } + + private static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, final Set result) { + JpsUtil.getAllDependencies(target).processModules(new Consumer() { + @Override + public void consume(JpsModule module) { + if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return; + + result.add("@" + module.getName()); + + for (JpsModuleSourceRoot root : module.getSourceRoots(JavaSourceRootType.SOURCE)) { + result.add(JpsPathUtil.urlToOsPath(root.getUrl())); + } + } + }); + } } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index beecde4bfad..34a967fb3c5 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -27,7 +27,6 @@ import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.java.*; import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.sdk.JpsSdk; @@ -44,6 +43,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator.DependencyProvider; +import static org.jetbrains.jet.jps.build.JpsUtil.getAllDependencies; public class KotlinBuilderModuleScriptGenerator { @@ -144,12 +144,6 @@ public class KotlinBuilderModuleScriptGenerator { return JpsJavaSdkType.INSTANCE; } - @NotNull - private static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { - return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly() - .includedIn(JpsJavaClasspathKind.compile(target.isTests())); - } - @Nullable private static JpsLibrary getLibrary(@NotNull JpsDependencyElement dependencyElement) { if (dependencyElement instanceof JpsSdkDependency) { From 59380368013c40325f6cd75f905356e70cb599cd Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 3 Oct 2013 15:50:38 +0400 Subject: [PATCH 0033/1557] JPS plugin: refactoring: - extract utility methods from KotlinBuilder; - use StringUtil#join instead for iteration; - add private constructor to LibraryUtils. Original commit: dd553ef671f1a17ce1e7dfedb5d6ae5658ff814e --- .../jet/jps/build/JpsJsModuleUtils.java | 73 +++++++++++++++++++ .../jps/build/{JpsUtil.java => JpsUtils.java} | 24 +++++- .../jet/jps/build/KotlinBuilder.java | 59 +-------------- .../KotlinBuilderModuleScriptGenerator.java | 2 +- 4 files changed, 98 insertions(+), 60 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java rename jps/jps-plugin/src/org/jetbrains/jet/jps/build/{JpsUtil.java => JpsUtils.java} (56%) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java new file mode 100644 index 00000000000..e1ece25113a --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java @@ -0,0 +1,73 @@ +/* + * Copyright 2010-2013 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.jps.build; + +import com.intellij.util.Consumer; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.utils.LibraryUtils; +import org.jetbrains.jps.incremental.ModuleBuildTarget; +import org.jetbrains.jps.model.java.JavaSourceRootType; +import org.jetbrains.jps.model.java.JpsJavaModuleType; +import org.jetbrains.jps.model.library.JpsLibrary; +import org.jetbrains.jps.model.library.JpsLibraryRoot; +import org.jetbrains.jps.model.library.JpsOrderRootType; +import org.jetbrains.jps.model.module.JpsModule; +import org.jetbrains.jps.model.module.JpsModuleSourceRoot; +import org.jetbrains.jps.util.JpsPathUtil; + +import java.util.HashSet; +import java.util.Set; + +class JpsJsModuleUtils { + private JpsJsModuleUtils() {} + + @NotNull + static Set getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { + Set result = new HashSet(); + getLibraryFiles(target, result); + getDependencyModulesAndSources(target, result); + return result; + } + + static void getLibraryFiles(@NotNull ModuleBuildTarget target, @NotNull Set result) { + Set libraries = JpsUtils.getAllDependencies(target).getLibraries(); + for (JpsLibrary library : libraries) { + for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { + String path = JpsPathUtil.urlToOsPath(root.getUrl()); + // TODO: Do we need to add to dependency all libraries? + if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(path))) { + result.add(path); + } + } + } + } + + static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, @NotNull final Set result) { + JpsUtils.getAllDependencies(target).processModules(new Consumer() { + @Override + public void consume(JpsModule module) { + if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return; + + result.add("@" + module.getName()); + + for (JpsModuleSourceRoot root : module.getSourceRoots(JavaSourceRootType.SOURCE)) { + result.add(JpsPathUtil.urlToOsPath(root.getUrl())); + } + } + }); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtil.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java similarity index 56% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtil.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java index 3fa9a5d1947..81b980b07df 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java @@ -17,15 +17,35 @@ package org.jetbrains.jet.jps.build; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.utils.LibraryUtils; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.model.java.JpsJavaClasspathKind; import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; import org.jetbrains.jps.model.java.JpsJavaExtensionService; +import org.jetbrains.jps.model.library.JpsLibrary; +import org.jetbrains.jps.model.library.JpsLibraryRoot; +import org.jetbrains.jps.model.library.JpsOrderRootType; +import org.jetbrains.jps.util.JpsPathUtil; + +import java.util.Set; + +class JpsUtils { + private JpsUtils() {} -public class JpsUtil { @NotNull - public static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { + static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly() .includedIn(JpsJavaClasspathKind.compile(target.isTests())); } + + static boolean isJsKotlinModule(@NotNull ModuleBuildTarget target) { + Set libraries = getAllDependencies(target).getLibraries(); + for (JpsLibrary library : libraries) { + for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { + if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(root.getUrl()))) + return true; + } + } + return false; + } } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 4d4680f9ea8..6b8f4db3769 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -17,7 +17,6 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.Consumer; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -26,7 +25,6 @@ import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.compiler.runner.*; -import org.jetbrains.jet.utils.LibraryUtils; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -35,14 +33,7 @@ import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.java.JavaBuilder; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.jetbrains.jps.model.java.JavaSourceRootType; -import org.jetbrains.jps.model.java.JpsJavaModuleType; -import org.jetbrains.jps.model.library.JpsLibrary; -import org.jetbrains.jps.model.library.JpsLibraryRoot; -import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.model.module.JpsModule; -import org.jetbrains.jps.model.module.JpsModuleSourceRoot; -import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; import java.io.IOException; @@ -126,7 +117,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl(outputDir); - if (isJsKotlinModule(representativeTarget)) { + if (JpsUtils.isJsKotlinModule(representativeTarget)) { File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); KotlinCompilerRunner.runK2JsCompiler( @@ -134,7 +125,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { environment, outputItemCollector, sourceFiles, - getLibraryFilesAndDependencies(representativeTarget), + JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget), outputFile); } else { @@ -229,50 +220,4 @@ public class KotlinBuilder extends ModuleLevelBuilder { public List getCompilableFileExtensions() { return COMPILABLE_FILE_EXTENSIONS; } - - private static boolean isJsKotlinModule(@NotNull ModuleBuildTarget target) { - Set libraries = JpsUtil.getAllDependencies(target).getLibraries(); - for (JpsLibrary library : libraries) { - for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { - if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(root.getUrl()))) - return true; - } - } - return false; - } - - @NotNull - private static Set getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { - Set result = new HashSet(); - getLibraryPaths(target, result); - getDependencyModulesAndSources(target, result); - return result; - } - - private static void getLibraryPaths(@NotNull ModuleBuildTarget target, Set result) { - Set libraries = JpsUtil.getAllDependencies(target).getLibraries(); - for (JpsLibrary library : libraries) { - for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { - String path = JpsPathUtil.urlToOsPath(root.getUrl()); - if (path.endsWith(PathUtil.JS_LIB_JAR_NAME)) { - result.add(path); - } - } - } - } - - private static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, final Set result) { - JpsUtil.getAllDependencies(target).processModules(new Consumer() { - @Override - public void consume(JpsModule module) { - if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return; - - result.add("@" + module.getName()); - - for (JpsModuleSourceRoot root : module.getSourceRoots(JavaSourceRootType.SOURCE)) { - result.add(JpsPathUtil.urlToOsPath(root.getUrl())); - } - } - }); - } } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 34a967fb3c5..f5da7b33997 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.List; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator.DependencyProvider; -import static org.jetbrains.jet.jps.build.JpsUtil.getAllDependencies; +import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies; public class KotlinBuilderModuleScriptGenerator { From e3cba725c88b9d388335c771068f448ea761f98d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 9 Oct 2013 18:26:54 +0400 Subject: [PATCH 0034/1557] Each module carries its output directory Original commit: d4a89d04d7880d73d24f42b348ebc8c9ff40f591 --- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index f5da7b33997..810fbe7633b 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -52,16 +52,22 @@ public class KotlinBuilderModuleScriptGenerator { public static File generateModuleDescription(CompileContext context, ModuleBuildTarget target, List sourceFiles) throws IOException { + File outputDir = target.getOutputDir(); + if (outputDir == null) { + throw new IllegalStateException("No output directory found for " + target); + + } CharSequence moduleScriptText = GENERATOR.generateModuleScript( target.getId(), + outputDir.getAbsolutePath(), getKotlinModuleDependencies(context, target), sourceFiles, target.isTests(), // this excludes the output directory from the class path, to be removed for true incremental compilation - Collections.singleton(target.getOutputDir()) + Collections.singleton(outputDir) ); - File scriptFile = new File(target.getOutputDir(), "script." + GENERATOR.getFileExtension()); + File scriptFile = new File(outputDir, "script." + GENERATOR.getFileExtension()); writeScriptToFile(context, moduleScriptText, scriptFile); From e4f46190805a6e5421ac4e9ba387c78bead4a7a1 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 9 Oct 2013 22:13:39 +0400 Subject: [PATCH 0035/1557] Support circular dependencies We generate a module script with information on all modules in the chunk, then build the whole chunk as "one big module" Original commit: 60425b15e6dcf3b35965a7f0817fdeaf78aa6263 --- .../jet/jps/build/KotlinBuilder.java | 57 ++++++++++------ .../KotlinBuilderModuleScriptGenerator.java | 68 ++++++++++++------- .../jet/jps/build/KotlinJpsBuildTestCase.java | 41 ++++++++++- .../kotlinProject.iml | 14 ++++ .../kotlinProject.ipr | 32 +++++++++ .../module2/module2.iml | 14 ++++ .../module2/src/JSecond.java | 5 ++ .../module2/src/kt1.kt | 7 ++ .../src/JFirst.java | 11 +++ .../src/kt2.kt | 7 ++ 10 files changed, 212 insertions(+), 44 deletions(-) create mode 100644 jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml create mode 100644 jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java create mode 100644 jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt create mode 100644 jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java create mode 100644 jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 6b8f4db3769..f3feaf01107 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -39,9 +39,13 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.*; +import java.util.Collection; +import java.util.Collections; +import java.util.List; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.INFO; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; public class KotlinBuilder extends ModuleLevelBuilder { @@ -81,29 +85,12 @@ public class KotlinBuilder extends ModuleLevelBuilder { messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION); - if (chunk.getModules().size() > 1) { - // We do not support circular dependencies, but if they are present, we should not break the build, - // so we simply yield a warning and report NOTHING_DONE - messageCollector.report( - WARNING, "Circular dependencies are not supported. " + - "The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + - "Kotlin is not compiled for these modules", - CompilerMessageLocation.NO_LOCATION); - return ExitCode.NOTHING_DONE; - } - ModuleBuildTarget representativeTarget = chunk.representativeTarget(); // For non-incremental build: take all sources if (!dirtyFilesHolder.hasDirtyFiles()) { return ExitCode.NOTHING_DONE; } - List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); - //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); - - if (sourceFiles.isEmpty()) { - return ExitCode.NOTHING_DONE; - } File outputDir = representativeTarget.getOutputDir(); @@ -118,6 +105,24 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl(outputDir); if (JpsUtils.isJsKotlinModule(representativeTarget)) { + if (chunk.getModules().size() > 1) { + // We do not support circular dependencies, but if they are present, we do our best should not break the build, + // so we simply yield a warning and report NOTHING_DONE + messageCollector.report( + WARNING, "Circular dependencies are not supported. " + + "The following JS modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + + "Kotlin is not compiled for these modules", + CompilerMessageLocation.NO_LOCATION); + return ExitCode.NOTHING_DONE; + } + + List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); + //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); + + if (sourceFiles.isEmpty()) { + return ExitCode.NOTHING_DONE; + } + File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); KotlinCompilerRunner.runK2JsCompiler( @@ -129,7 +134,19 @@ public class KotlinBuilder extends ModuleLevelBuilder { outputFile); } else { - File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, representativeTarget, sourceFiles); + if (chunk.getModules().size() > 1) { + messageCollector.report( + WARNING, "Circular dependencies are only partially supported. " + + "The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + + "Kotlin will compile them, but some strange effect may happen", + CompilerMessageLocation.NO_LOCATION); + } + + File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk); + if (moduleFile == null) { + // No Kotlin sources found + return ExitCode.NOTHING_DONE; + } KotlinCompilerRunner.runK2JvmCompiler( messageCollector, diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 810fbe7633b..f2195085954 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -20,14 +20,17 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator; -import org.jetbrains.jet.compiler.runner.KotlinModuleXmlGenerator; +import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder; +import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilderFactory; +import org.jetbrains.jet.compiler.runner.KotlinModuleXmlBuilderFactory; +import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.jetbrains.jps.model.java.*; +import org.jetbrains.jps.model.java.JpsAnnotationRootType; +import org.jetbrains.jps.model.java.JpsJavaSdkType; import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.library.sdk.JpsSdkType; @@ -42,42 +45,61 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionGenerator.DependencyProvider; +import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProcessor; +import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProvider; import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies; public class KotlinBuilderModuleScriptGenerator { - public static final KotlinModuleDescriptionGenerator GENERATOR = KotlinModuleXmlGenerator.INSTANCE; + public static final KotlinModuleDescriptionBuilderFactory FACTORY = KotlinModuleXmlBuilderFactory.INSTANCE; - public static File generateModuleDescription(CompileContext context, ModuleBuildTarget target, List sourceFiles) + @Nullable + public static File generateModuleDescription(CompileContext context, ModuleChunk chunk) throws IOException { + KotlinModuleDescriptionBuilder builder = FACTORY.create(); + + boolean noSources = true; + + for (ModuleBuildTarget target : chunk.getTargets()) { + File outputDir = getOutputDir(target); + + List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(target); + noSources &= sourceFiles.isEmpty(); + + builder.addModule( + target.getId(), + outputDir.getAbsolutePath(), + getKotlinModuleDependencies(context, target), + sourceFiles, + target.isTests(), + // this excludes the output directory from the class path, to be removed for true incremental compilation + Collections.singleton(outputDir) + ); + } + + if (noSources) return null; + + File scriptFile = new File(getOutputDir(chunk.representativeTarget()), "script." + FACTORY.getFileExtension()); + + writeScriptToFile(context, builder.asText(), scriptFile); + + return scriptFile; + } + + @NotNull + private static File getOutputDir(@NotNull ModuleBuildTarget target) { File outputDir = target.getOutputDir(); if (outputDir == null) { throw new IllegalStateException("No output directory found for " + target); - } - CharSequence moduleScriptText = GENERATOR.generateModuleScript( - target.getId(), - outputDir.getAbsolutePath(), - getKotlinModuleDependencies(context, target), - sourceFiles, - target.isTests(), - // this excludes the output directory from the class path, to be removed for true incremental compilation - Collections.singleton(outputDir) - ); - - File scriptFile = new File(outputDir, "script." + GENERATOR.getFileExtension()); - - writeScriptToFile(context, moduleScriptText, scriptFile); - - return scriptFile; + return outputDir; } private static DependencyProvider getKotlinModuleDependencies(final CompileContext context, final ModuleBuildTarget target) { return new DependencyProvider() { @Override - public void processClassPath(@NotNull KotlinModuleDescriptionGenerator.DependencyProcessor processor) { + public void processClassPath(@NotNull DependencyProcessor processor) { processor.processClassPathSection("Classpath", findClassPathRoots(target)); processor.processClassPathSection("Java Source Roots", findSourceRoots(context, target)); processor.processAnnotationRoots(findAnnotationRoots(target)); diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index 599312d91c1..1a7320ee144 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -19,8 +19,11 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.jps.model.java.*; +import org.jetbrains.jps.builders.BuildResult; +import org.jetbrains.jps.model.java.JpsJavaDependencyScope; +import org.jetbrains.jps.model.java.JpsJavaExtensionService; import org.jetbrains.jps.model.module.JpsModule; +import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; @@ -89,6 +92,22 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { doTest(); } + public void testCircularDependenciesWithKotlinFilesDifferentPackages() { + initProject(); + BuildResult result = makeAll(); + + // Check that outputs are located properly + for (JpsModule module : myProject.getModules()) { + if (module.getName().equals("module2")) { + assertFileExistsInOutput(module, "kt1/Kt1Package.class"); + } + if (module.getName().equals("kotlinProject")) { + assertFileExistsInOutput(module, "kt2/Kt2Package.class"); + } + } + result.assertSuccessful(); + } + public void testTestDependencyLibrary() throws Throwable { initProject(); addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST, myProject.getModules(), false); @@ -109,4 +128,24 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { makeAll().assertSuccessful(); } + private static void assertFileExistsInOutput(JpsModule module, String relativePath) { + String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false); + assertNotNull(outputUrl); + File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); + File outputFile = new File(outputDir, relativePath); + assertTrue("Output not written: " + outputFile.getAbsolutePath() + "\n Directory contents: \n" + dirContents(outputFile.getParentFile()), + outputFile.exists()); + } + + private static String dirContents(File dir) { + File[] files = dir.listFiles(); + if (files == null) { + return ""; + } + StringBuilder builder = new StringBuilder(); + for (File file : files) { + builder.append(" * ").append(file.getName()).append("\n"); + } + return builder.toString(); + } } diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml new file mode 100644 index 00000000000..5559c7ad919 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr new file mode 100644 index 00000000000..03619a4f72c --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml new file mode 100644 index 00000000000..eace69878a2 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java new file mode 100644 index 00000000000..e034bf38792 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java @@ -0,0 +1,5 @@ +public class JSecond { + public static void main(String[] args) { + new JFirst().foo(); + } +} diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt new file mode 100644 index 00000000000..90c4941858e --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt @@ -0,0 +1,7 @@ +package kt1 + +fun foo() {} + +fun bar() { + kt2.bar() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java new file mode 100644 index 00000000000..12140d2a7e4 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java @@ -0,0 +1,11 @@ +public class JFirst { + JSecond s = null; + + public void foo() { + + } + + public static void main(String[] args) { + System.out.println(1); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt new file mode 100644 index 00000000000..96dfcda26c4 --- /dev/null +++ b/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt @@ -0,0 +1,7 @@ +package kt2 + +fun foo() { + kt1.foo() +} + +fun bar() {} \ No newline at end of file From 2485f201d4ad7249bd3dee14dccdd580529c78f1 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 10 Oct 2013 15:05:12 +0400 Subject: [PATCH 0036/1557] JPS: transferring compiler settings to the JPS Original commit: 1176d58f409f7a7277e29e8a897e2983a0686585 --- ....serialization.JpsModelSerializerExtension | 1 + .../jet/jps/JpsKotlinCompilerSettings.java | 121 ++++++++++++++++++ .../Kotlin2JsCompilerSettingsSerializer.java | 48 +++++++ .../Kotlin2JvmCompilerSettingsSerializer.java | 48 +++++++ ...otlinCommonCompilerSettingsSerializer.java | 48 +++++++ .../model/KotlinModelSerializerService.java | 34 +++++ 6 files changed, 300 insertions(+) create mode 100644 jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension new file mode 100644 index 00000000000..6026c57ec4b --- /dev/null +++ b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension @@ -0,0 +1 @@ +org.jetbrains.jet.jps.model.KotlinModelSerializerService diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java new file mode 100644 index 00000000000..b46de016e22 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java @@ -0,0 +1,121 @@ +/* + * Copyright 2010-2013 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.jps; + +import com.intellij.util.xmlb.Accessor; +import com.intellij.util.xmlb.XmlSerializerUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.jps.model.JpsElementChildRole; +import org.jetbrains.jps.model.JpsProject; +import org.jetbrains.jps.model.ex.JpsElementBase; +import org.jetbrains.jps.model.ex.JpsElementChildRoleBase; + +public class JpsKotlinCompilerSettings extends JpsElementBase { + static final JpsElementChildRole ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); + + @NotNull + public CommonCompilerArguments commonCompilerSettings = CommonCompilerArguments.DUMMY; + @NotNull + public K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments(); + @NotNull + public K2JSCompilerArguments k2JsCompilerSettings = new K2JSCompilerArguments(); + + @NotNull + @Override + public JpsKotlinCompilerSettings createCopy() { + JpsKotlinCompilerSettings copy = new JpsKotlinCompilerSettings(); + copy.commonCompilerSettings = this.commonCompilerSettings; + copy.k2JvmCompilerSettings = this.k2JvmCompilerSettings; + copy.k2JsCompilerSettings = this.k2JsCompilerSettings; + return copy; + } + + @Override + public void applyChanges(@NotNull JpsKotlinCompilerSettings modified) { + // do nothing + } + + @NotNull + public static JpsKotlinCompilerSettings getSettings(@NotNull JpsProject project) { + JpsKotlinCompilerSettings settings = project.getContainer().getChild(ROLE); + if (settings == null) { + settings = new JpsKotlinCompilerSettings(); + } + return settings; + } + + @NotNull + public static JpsKotlinCompilerSettings getOrCreateSettings(@NotNull JpsProject project) { + JpsKotlinCompilerSettings settings = project.getContainer().getChild(ROLE); + if (settings == null) { + settings = new JpsKotlinCompilerSettings(); + project.getContainer().setChild(ROLE, settings); + } + return settings; + } + + @NotNull + public static CommonCompilerArguments getCommonSettings(@NotNull JpsProject project) { + JpsKotlinCompilerSettings settings = getSettings(project); + return settings.commonCompilerSettings; + } + + public static void setCommonSettings(@NotNull JpsProject project, @NotNull CommonCompilerArguments commonCompilerSettings) { + JpsKotlinCompilerSettings settings = getOrCreateSettings(project); + settings.commonCompilerSettings = commonCompilerSettings; + } + + @NotNull + public static K2JVMCompilerArguments getMergedK2JvmSettings(@NotNull JpsProject project) { + JpsKotlinCompilerSettings settings = getSettings(project); + return merge(settings.commonCompilerSettings, settings.k2JvmCompilerSettings); + } + + public static void setK2JvmSettings(@NotNull JpsProject project, @NotNull K2JVMCompilerArguments k2JvmCompilerSettings) { + JpsKotlinCompilerSettings settings = getOrCreateSettings(project); + settings.k2JvmCompilerSettings = k2JvmCompilerSettings; + } + + @NotNull + public static K2JSCompilerArguments getMergedK2JsSettings(@NotNull JpsProject project) { + JpsKotlinCompilerSettings settings = getSettings(project); + return merge(settings.commonCompilerSettings, settings.k2JsCompilerSettings); + } + + public static void setK2JsSettings(@NotNull JpsProject project, @NotNull K2JSCompilerArguments k2JsCompilerSettings) { + JpsKotlinCompilerSettings settings = getOrCreateSettings(project); + settings.k2JsCompilerSettings = k2JsCompilerSettings; + } + + @NotNull + private static T merge(@NotNull CommonCompilerArguments from, @NotNull T to) { + Class fromClass = CommonCompilerArguments.class; + + assert fromClass.isAssignableFrom(to.getClass()) : to.getClass() + " is not assignable to " + fromClass; + + T mergedCopy = XmlSerializerUtil.createCopy(to); + + for (Accessor accessor : XmlSerializerUtil.getAccessors(fromClass)) { + accessor.write(mergedCopy, accessor.read(from)); + } + + return mergedCopy; + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java new file mode 100644 index 00000000000..e0d061646bd --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java @@ -0,0 +1,48 @@ +/* + * Copyright 2010-2013 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.jps.model; + +import com.intellij.util.xmlb.XmlSerializer; +import org.jdom.Element; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; +import org.jetbrains.jps.model.JpsProject; +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; + +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION; + +class Kotlin2JsCompilerSettingsSerializer extends JpsProjectExtensionSerializer { + Kotlin2JsCompilerSettingsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION); + } + + @Override + public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + K2JSCompilerArguments settings = XmlSerializer.deserialize(componentTag, K2JSCompilerArguments.class); + if (settings == null) { + settings = new K2JSCompilerArguments(); + } + + JpsKotlinCompilerSettings.setK2JsSettings(project, settings); + } + + @Override + public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java new file mode 100644 index 00000000000..8f9752b55a3 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java @@ -0,0 +1,48 @@ +/* + * Copyright 2010-2013 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.jps.model; + +import com.intellij.util.xmlb.XmlSerializer; +import org.jdom.Element; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; +import org.jetbrains.jps.model.JpsProject; +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; + +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION; + +class Kotlin2JvmCompilerSettingsSerializer extends JpsProjectExtensionSerializer { + Kotlin2JvmCompilerSettingsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION); + } + + @Override + public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + K2JVMCompilerArguments settings = XmlSerializer.deserialize(componentTag, K2JVMCompilerArguments.class); + if (settings == null) { + settings = new K2JVMCompilerArguments(); + } + + JpsKotlinCompilerSettings.setK2JvmSettings(project, settings); + } + + @Override + public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java new file mode 100644 index 00000000000..9a284e1ebad --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java @@ -0,0 +1,48 @@ +/* + * Copyright 2010-2013 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.jps.model; + +import com.intellij.util.xmlb.XmlSerializer; +import org.jdom.Element; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; +import org.jetbrains.jps.model.JpsProject; +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; + +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; + +class KotlinCommonCompilerSettingsSerializer extends JpsProjectExtensionSerializer { + KotlinCommonCompilerSettingsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMMON_COMPILER_SETTINGS_SECTION); + } + + @Override + public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + CommonCompilerArguments settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl.class); + if (settings == null) { + settings = CommonCompilerArguments.DUMMY; + } + + JpsKotlinCompilerSettings.setCommonSettings(project, settings); + } + + @Override + public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java new file mode 100644 index 00000000000..7ce881cc715 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java @@ -0,0 +1,34 @@ +/* + * Copyright 2010-2013 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.jps.model; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension; +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; + +import java.util.Arrays; +import java.util.List; + +public class KotlinModelSerializerService extends JpsModelSerializerExtension { + @NotNull + @Override + public List getProjectExtensionSerializers() { + return Arrays.asList(new KotlinCommonCompilerSettingsSerializer(), + new Kotlin2JvmCompilerSettingsSerializer(), + new Kotlin2JsCompilerSettingsSerializer()); + } +} From 5a0c58b72b658b99ffc9ea6949a91d3f2dd233f0 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 10 Oct 2013 15:15:20 +0400 Subject: [PATCH 0037/1557] JPS: removed unnecessary code for running compiler out of process. Original commit: 41d0a8be242823e6db7efa0bf903fb6736a3b37e --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index f3feaf01107..24f12b14800 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -152,8 +152,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { messageCollector, environment, moduleFile, - outputItemCollector, - /*runOutOfProcess = */false); + outputItemCollector); } for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { From 06549c64133774084ffa4e1cbdfa73b3b082d7b9 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 11 Oct 2013 15:48:36 +0400 Subject: [PATCH 0038/1557] JPS: switch to using *CompilerArgument classes(from IDEA Project Settings) in build. Original commit: 5e0ef68d6445fee8c258f2bfead1062c5b176c18 --- .../jet/jps/JpsKotlinCompilerSettings.java | 39 ++++--------------- .../jet/jps/build/KotlinBuilder.java | 30 ++++++++------ 2 files changed, 26 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java index b46de016e22..2ca6b28331f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java @@ -16,8 +16,6 @@ package org.jetbrains.jet.jps; -import com.intellij.util.xmlb.Accessor; -import com.intellij.util.xmlb.XmlSerializerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; @@ -73,49 +71,28 @@ public class JpsKotlinCompilerSettings extends JpsElementBase T merge(@NotNull CommonCompilerArguments from, @NotNull T to) { - Class fromClass = CommonCompilerArguments.class; - - assert fromClass.isAssignableFrom(to.getClass()) : to.getClass() + " is not assignable to " + fromClass; - - T mergedCopy = XmlSerializerUtil.createCopy(to); - - for (Accessor accessor : XmlSerializerUtil.getAccessors(fromClass)) { - accessor.write(mergedCopy, accessor.read(from)); - } - - return mergedCopy; + getOrCreateSettings(project).k2JsCompilerSettings = k2JsCompilerSettings; } } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 24f12b14800..5c47f983ee1 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -21,10 +21,14 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.KotlinVersion; +import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; import org.jetbrains.jet.compiler.runner.*; +import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -33,6 +37,7 @@ import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.java.JavaBuilder; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; +import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.module.JpsModule; import java.io.File; @@ -42,11 +47,15 @@ import java.lang.reflect.Modifier; import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Set; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.INFO; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; +import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler; +import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler; + public class KotlinBuilder extends ModuleLevelBuilder { private static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; @@ -104,6 +113,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl(outputDir); + JpsProject project = representativeTarget.getModule().getProject(); + CommonCompilerArguments commonSettings = JpsKotlinCompilerSettings.getCommonSettings(project); + if (JpsUtils.isJsKotlinModule(representativeTarget)) { if (chunk.getModules().size() > 1) { // We do not support circular dependencies, but if they are present, we do our best should not break the build, @@ -124,14 +136,10 @@ public class KotlinBuilder extends ModuleLevelBuilder { } File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); + Set libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); + K2JSCompilerArguments k2JsSettings = JpsKotlinCompilerSettings.getK2JsSettings(project); - KotlinCompilerRunner.runK2JsCompiler( - messageCollector, - environment, - outputItemCollector, - sourceFiles, - JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget), - outputFile); + runK2JsCompiler(commonSettings, k2JsSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile); } else { if (chunk.getModules().size() > 1) { @@ -148,11 +156,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - KotlinCompilerRunner.runK2JvmCompiler( - messageCollector, - environment, - moduleFile, - outputItemCollector); + K2JVMCompilerArguments k2JvmSettings = JpsKotlinCompilerSettings.getK2JvmSettings(project); + + runK2JvmCompiler(commonSettings, k2JvmSettings, messageCollector, environment, moduleFile, outputItemCollector); } for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { From 4e5b04ce1f632b537b370d64690321a02b2c8d1a Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 15 Oct 2013 17:56:06 +0400 Subject: [PATCH 0039/1557] CLI: drop CompilerArguments and unnecessary methods from *CompilerArguments classes Original commit: 31a4d91122741531ff79c73f31cbb7930c05f2e0 --- .../src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java | 2 +- .../jet/jps/model/KotlinCommonCompilerSettingsSerializer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java index 2ca6b28331f..29cbeb5a775 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java @@ -29,7 +29,7 @@ public class JpsKotlinCompilerSettings extends JpsElementBase ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); @NotNull - public CommonCompilerArguments commonCompilerSettings = CommonCompilerArguments.DUMMY; + public CommonCompilerArguments commonCompilerSettings = new CommonCompilerArguments.DummyImpl(); @NotNull public K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments(); @NotNull diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java index 9a284e1ebad..4522c25792d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java @@ -36,7 +36,7 @@ class KotlinCommonCompilerSettingsSerializer extends JpsProjectExtensionSerializ public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { CommonCompilerArguments settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl.class); if (settings == null) { - settings = CommonCompilerArguments.DUMMY; + settings = new CommonCompilerArguments.DummyImpl(); } JpsKotlinCompilerSettings.setCommonSettings(project, settings); From dd1dc67cfbd3f80eadd60e8b83f04257198003f1 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 18 Oct 2013 12:22:50 +0400 Subject: [PATCH 0040/1557] Do not fail on bad Kotlin configuration if there are no Kotlin files Original commit: 61270e8ee569cd691ed1e3eaf1770c44b107f6a3 --- .../jet/jps/build/KotlinBuilder.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 5c47f983ee1..d72e18d2df0 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -27,7 +27,10 @@ import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.compiler.runner.*; +import org.jetbrains.jet.compiler.runner.CompilerEnvironment; +import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants; +import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; +import org.jetbrains.jet.compiler.runner.SimpleOutputItem; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; @@ -49,10 +52,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.EXCEPTION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.INFO; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.WARNING; - +import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*; import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler; import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler; @@ -105,6 +105,10 @@ public class KotlinBuilder extends ModuleLevelBuilder { CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir); if (!environment.success()) { + if (!hasKotlinFiles(chunk)) { + // Configuration is bad, but there's nothing to compile anyways + return ExitCode.NOTHING_DONE; + } environment.reportErrorsTo(messageCollector); return ExitCode.ABORT; } @@ -171,6 +175,18 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.OK; } + private static boolean hasKotlinFiles(@NotNull ModuleChunk chunk) { + boolean hasKotlinFiles = false; + for (ModuleBuildTarget target : chunk.getTargets()) { + List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(target); + if (!sourceFiles.isEmpty()) { + hasKotlinFiles = true; + break; + } + } + return hasKotlinFiles; + } + private static boolean isJavaPluginEnabled(@NotNull CompileContext context) { try { // Using reflection for backward compatibility with IDEA 12 From 75f677e7056773352db2fee298711de97f9e83e5 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 18 Oct 2013 18:17:26 +0400 Subject: [PATCH 0041/1557] Check removed files as well as dirty ones Original commit: 251c659e91c9a2aa9cbfb6f91a3ef22a09327f12 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index d72e18d2df0..82f42320026 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -97,7 +97,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { ModuleBuildTarget representativeTarget = chunk.representativeTarget(); // For non-incremental build: take all sources - if (!dirtyFilesHolder.hasDirtyFiles()) { + if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()) { return ExitCode.NOTHING_DONE; } From 5112c4350196906ffb68d84a2b0683f40ece6edb Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Fri, 18 Oct 2013 18:17:53 +0400 Subject: [PATCH 0042/1557] Correctly report locations of output files Original commit: c84e5823976e1aaaa3d02b6e6fcf841c75802cb0 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 82f42320026..7b72857b7c6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -115,7 +115,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { assert outputDir != null : "CompilerEnvironment must have checked for outputDir to be not null, but it didn't"; - OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl(outputDir); + OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl(); JpsProject project = representativeTarget.getModule().getProject(); CommonCompilerArguments commonSettings = JpsKotlinCompilerSettings.getCommonSettings(project); From 88c7255e2c5fecdef2bbaf4130bb5391f4a2343d Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 21 Oct 2013 17:54:02 +0400 Subject: [PATCH 0043/1557] Report correct build targets for outputs + tests on output removal Original commit: 2a43d2adee001234d8675721a31462587714018a --- jps/jps-plugin/jps-plugin.iml | 2 + .../jet/jps/build/KotlinBuilder.java | 19 +++++-- .../jet/jps/build/KotlinJpsBuildTestCase.java | 54 ++++++++++++++++--- .../kotlinProject.iml | 12 +++++ .../kotlinProject.ipr | 14 +++++ .../src/test1.kt | 3 ++ .../src/test2.kt | 3 ++ 7 files changed, 94 insertions(+), 13 deletions(-) create mode 100644 jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test1.kt create mode 100644 jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test2.kt diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 83efc10247f..c3a06774179 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -14,6 +14,8 @@ + + diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 7b72857b7c6..70e32c89e5e 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -34,6 +34,7 @@ import org.jetbrains.jet.compiler.runner.SimpleOutputItem; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; +import org.jetbrains.jps.builders.BuildTarget; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; @@ -47,10 +48,7 @@ import java.io.File; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Set; +import java.util.*; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*; import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler; @@ -165,9 +163,20 @@ public class KotlinBuilder extends ModuleLevelBuilder { runK2JvmCompiler(commonSettings, k2JvmSettings, messageCollector, environment, moduleFile, outputItemCollector); } + // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below + Map> sourceToTarget = new HashMap>(); + if (chunk.getTargets().size() > 1) { + for (ModuleBuildTarget target : chunk.getTargets()) { + for (File file : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { + sourceToTarget.put(file, target); + } + } + } + for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { + BuildTarget target = sourceToTarget.get(outputItem.getSourceFiles().iterator().next()); outputConsumer.registerOutputFile( - representativeTarget, + target != null ? target : representativeTarget, outputItem.getOutputFile(), paths(outputItem.getSourceFiles())); } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index 1a7320ee144..ac6b16c4fde 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -18,7 +18,10 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.jet.codegen.NamespaceCodegen; +import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaExtensionService; @@ -26,6 +29,7 @@ import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; +import java.io.IOException; public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { private static final String PROJECT_NAME = "kotlinProject"; @@ -36,6 +40,7 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { super.setUp(); File sourceFilesRoot = new File(TEST_DATA_PATH + getTestName(false)); workDir = copyTestDataToTmpDir(sourceFilesRoot); + getOrCreateProjectDir(); } @Override @@ -44,6 +49,11 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { super.tearDown(); } + @Override + protected File doGetProjectDir() throws IOException { + return workDir; + } + private void initProject() { addJdk(JDK_NAME); loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr"); @@ -62,6 +72,15 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { public void testKotlinProject() { doTest(); + + assertOutputDeleted("src/test1.kt", "_DefaultPackage", "kotlinProject"); + } + + public void testKotlinProjectTwoFilesInOnePackage() { + doTest(); + + assertOutputDeleted("src/test1.kt", "_DefaultPackage", "kotlinProject"); + assertOutputDeleted("src/test2.kt", "_DefaultPackage", "kotlinProject"); } public void testKotlinJavaProject() { @@ -106,14 +125,9 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { } } result.assertSuccessful(); - } - public void testTestDependencyLibrary() throws Throwable { - initProject(); - addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST, myProject.getModules(), false); - makeAll().assertSuccessful(); - change(workDir + "/src/src.kt", "fun foo() { println() }"); - makeAll().assertFailed(); + assertOutputDeleted("src/kt2.kt", "kt2.Kt2Package", "kotlinProject"); + assertOutputDeleted("module2/src/kt1.kt", "kt1.Kt1Package", "module2"); } public void testReexportedDependency() { @@ -133,7 +147,10 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { assertNotNull(outputUrl); File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); File outputFile = new File(outputDir, relativePath); - assertTrue("Output not written: " + outputFile.getAbsolutePath() + "\n Directory contents: \n" + dirContents(outputFile.getParentFile()), + assertTrue("Output not written: " + + outputFile.getAbsolutePath() + + "\n Directory contents: \n" + + dirContents(outputFile.getParentFile()), outputFile.exists()); } @@ -148,4 +165,25 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { } return builder.toString(); } + + private void assertOutputDeleted(String sourceFileName, String packageClassFqName, String moduleName) { + File file = new File(workDir, sourceFileName); + change(file.getAbsolutePath()); + makeAll(); + + String outputDirPrefix = "out/production/" + moduleName + "/"; + assertDeleted(outputDirPrefix + packageClassFqName.replace('.', '/') + ".class", + outputDirPrefix + getInternalNameForPackagePartClass(file, packageClassFqName) + ".class"); + } + + private static String getInternalNameForPackagePartClass(File sourceFile, String packageClassFqName) { + LightVirtualFile fakeVirtualFile = new LightVirtualFile(sourceFile.getPath()) { + @Override + public String getPath() { + // strip extra "/" from the beginning + return super.getPath().substring(1); + } + }; + return NamespaceCodegen.getNamespacePartType(new FqName(packageClassFqName), fakeVirtualFile).getInternalName(); + } } diff --git a/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml b/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr b/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test1.kt b/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test1.kt new file mode 100644 index 00000000000..a2c4e958bb5 --- /dev/null +++ b/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test1.kt @@ -0,0 +1,3 @@ +fun foo() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test2.kt b/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test2.kt new file mode 100644 index 00000000000..6ec77d22887 --- /dev/null +++ b/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test2.kt @@ -0,0 +1,3 @@ +fun bar() { + +} \ No newline at end of file From e77b4443b47136d27942e58326a8c93a23431ccf Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 21 Oct 2013 19:04:25 +0400 Subject: [PATCH 0044/1557] Ignore all output directories in a chunk Otherwise the class files generated by previous builds for one of the targets in the chunk would interfere with source definitions, and we get overload resolution ambiguities and such Original commit: aacf133ef6cd33e6c961336f5c43300cfa5b6f8c --- .../build/KotlinBuilderModuleScriptGenerator.java | 12 +++++++----- .../jet/jps/build/KotlinJpsBuildTestCase.java | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index f2195085954..f105f36047c 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -41,9 +41,7 @@ import org.jetbrains.jps.model.module.JpsSdkDependency; import java.io.File; import java.io.IOException; -import java.util.Collection; -import java.util.Collections; -import java.util.List; +import java.util.*; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProcessor; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProvider; @@ -61,6 +59,10 @@ public class KotlinBuilderModuleScriptGenerator { boolean noSources = true; + Set outputDirs = new HashSet(); + for (ModuleBuildTarget target : chunk.getTargets()) { + outputDirs.add(getOutputDir(target)); + } for (ModuleBuildTarget target : chunk.getTargets()) { File outputDir = getOutputDir(target); @@ -73,8 +75,8 @@ public class KotlinBuilderModuleScriptGenerator { getKotlinModuleDependencies(context, target), sourceFiles, target.isTests(), - // this excludes the output directory from the class path, to be removed for true incremental compilation - Collections.singleton(outputDir) + // this excludes the output directories from the class path, to be removed for true incremental compilation + outputDirs ); } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index ac6b16c4fde..1108dab9584 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -169,7 +169,7 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { private void assertOutputDeleted(String sourceFileName, String packageClassFqName, String moduleName) { File file = new File(workDir, sourceFileName); change(file.getAbsolutePath()); - makeAll(); + makeAll().assertSuccessful(); String outputDirPrefix = "out/production/" + moduleName + "/"; assertDeleted(outputDirPrefix + packageClassFqName.replace('.', '/') + ".class", From bd486b1ac51f4bf142125d600fd0061326756fb3 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 22 Oct 2013 12:51:00 +0400 Subject: [PATCH 0045/1557] CLI & JPS: use List instead Set for libraries and decencies. Original commit: 4d68262b7f591afcfc0540cc753de89a6233052b --- .../jetbrains/jet/jps/build/JpsJsModuleUtils.java | 14 ++++++++------ .../org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java index e1ece25113a..9e521435843 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java @@ -29,34 +29,36 @@ import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import org.jetbrains.jps.util.JpsPathUtil; -import java.util.HashSet; +import java.io.File; +import java.util.ArrayList; +import java.util.List; import java.util.Set; class JpsJsModuleUtils { private JpsJsModuleUtils() {} @NotNull - static Set getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { - Set result = new HashSet(); + static List getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { + List result = new ArrayList(); getLibraryFiles(target, result); getDependencyModulesAndSources(target, result); return result; } - static void getLibraryFiles(@NotNull ModuleBuildTarget target, @NotNull Set result) { + static void getLibraryFiles(@NotNull ModuleBuildTarget target, @NotNull List result) { Set libraries = JpsUtils.getAllDependencies(target).getLibraries(); for (JpsLibrary library : libraries) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { String path = JpsPathUtil.urlToOsPath(root.getUrl()); // TODO: Do we need to add to dependency all libraries? - if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(path))) { + if (LibraryUtils.isJsRuntimeLibrary(new File(path))) { result.add(path); } } } } - static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, @NotNull final Set result) { + static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, @NotNull final List result) { JpsUtils.getAllDependencies(target).processModules(new Consumer() { @Override public void consume(JpsModule module) { diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 70e32c89e5e..30886961a3d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -138,7 +138,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { } File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); - Set libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); + List libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); K2JSCompilerArguments k2JsSettings = JpsKotlinCompilerSettings.getK2JsSettings(project); runK2JsCompiler(commonSettings, k2JsSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile); From 107d804945bc4843e448ec4e5859869829925fe7 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 23 Oct 2013 17:19:35 +0400 Subject: [PATCH 0046/1557] Added "Additional command line parameters" to the Kotlin Compiler Settings tab. Original commit: faa82317b64fb6f215d096e96739a4a8170454f4 --- .../jet/jps/JpsKotlinCompilerSettings.java | 13 +++++ .../jet/jps/build/KotlinBuilder.java | 8 +++- ...nAdditionalCompilerSettingsSerializer.java | 48 +++++++++++++++++++ .../model/KotlinModelSerializerService.java | 3 +- 4 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java index 29cbeb5a775..908e237c3a6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java @@ -20,6 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.jet.compiler.AdditionalCompilerSettings; import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.ex.JpsElementBase; @@ -34,6 +35,8 @@ public class JpsKotlinCompilerSettings extends JpsElementBase 1) { @@ -141,7 +143,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { List libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); K2JSCompilerArguments k2JsSettings = JpsKotlinCompilerSettings.getK2JsSettings(project); - runK2JsCompiler(commonSettings, k2JsSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile); + runK2JsCompiler(commonSettings, k2JsSettings, additionalSettings, messageCollector, environment, + outputItemCollector, sourceFiles, libraryFiles, outputFile); } else { if (chunk.getModules().size() > 1) { @@ -160,7 +163,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { K2JVMCompilerArguments k2JvmSettings = JpsKotlinCompilerSettings.getK2JvmSettings(project); - runK2JvmCompiler(commonSettings, k2JvmSettings, messageCollector, environment, moduleFile, outputItemCollector); + runK2JvmCompiler(commonSettings, k2JvmSettings, additionalSettings, messageCollector, environment, + moduleFile, outputItemCollector); } // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java new file mode 100644 index 00000000000..ccb86bae311 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java @@ -0,0 +1,48 @@ +/* + * Copyright 2010-2013 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.jps.model; + +import com.intellij.util.xmlb.XmlSerializer; +import org.jdom.Element; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.compiler.AdditionalCompilerSettings; +import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; +import org.jetbrains.jps.model.JpsProject; +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; + +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; + +class KotlinAdditionalCompilerSettingsSerializer extends JpsProjectExtensionSerializer { + KotlinAdditionalCompilerSettingsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION); + } + + @Override + public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + AdditionalCompilerSettings settings = XmlSerializer.deserialize(componentTag, AdditionalCompilerSettings.class); + if (settings == null) { + settings = new AdditionalCompilerSettings(); + } + + JpsKotlinCompilerSettings.setAdditionalSettings(project, settings); + } + + @Override + public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java index 7ce881cc715..e7885d2f643 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java @@ -29,6 +29,7 @@ public class KotlinModelSerializerService extends JpsModelSerializerExtension { public List getProjectExtensionSerializers() { return Arrays.asList(new KotlinCommonCompilerSettingsSerializer(), new Kotlin2JvmCompilerSettingsSerializer(), - new Kotlin2JsCompilerSettingsSerializer()); + new Kotlin2JsCompilerSettingsSerializer(), + new KotlinAdditionalCompilerSettingsSerializer()); } } From 39172ceed6de8ed5c7991904ba56aedc027439d7 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 24 Oct 2013 15:23:27 +0400 Subject: [PATCH 0047/1557] Make private all fields in JpsKotlinCompilerSettings. Original commit: 3f4cd455e25ce1b29e4c6ad897d5c1450482a8af --- .../org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java index 908e237c3a6..bdf56d787b0 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java @@ -30,13 +30,13 @@ public class JpsKotlinCompilerSettings extends JpsElementBase ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); @NotNull - public CommonCompilerArguments commonCompilerSettings = new CommonCompilerArguments.DummyImpl(); + private CommonCompilerArguments commonCompilerSettings = new CommonCompilerArguments.DummyImpl(); @NotNull - public K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments(); + private K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments(); @NotNull - public K2JSCompilerArguments k2JsCompilerSettings = new K2JSCompilerArguments(); + private K2JSCompilerArguments k2JsCompilerSettings = new K2JSCompilerArguments(); @NotNull - public AdditionalCompilerSettings additionalCompilerSettings = new AdditionalCompilerSettings(); + private AdditionalCompilerSettings additionalCompilerSettings = new AdditionalCompilerSettings(); @NotNull @Override From 84890122776d48c7a15310bf9124aabfadce5023 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 24 Oct 2013 13:13:17 +0400 Subject: [PATCH 0048/1557] Minor refactoring -- rename some classes and variables. Original commit: da718af8b7023f4d9c2670521b85c2f568a12713 --- .../jet/jps/JpsKotlinCompilerSettings.java | 50 +++++++++---------- .../jet/jps/build/KotlinBuilder.java | 14 +++--- ...Kotlin2JsCompilerArgumentsSerializer.java} | 10 ++-- ...otlin2JvmCompilerArgumentsSerializer.java} | 10 ++-- ...linCommonCompilerArgumentsSerializer.java} | 10 ++-- ... => KotlinCompilerSettingsSerializer.java} | 16 +++--- .../model/KotlinModelSerializerService.java | 8 +-- 7 files changed, 59 insertions(+), 59 deletions(-) rename jps/jps-plugin/src/org/jetbrains/jet/jps/model/{Kotlin2JsCompilerSettingsSerializer.java => Kotlin2JsCompilerArgumentsSerializer.java} (86%) rename jps/jps-plugin/src/org/jetbrains/jet/jps/model/{Kotlin2JvmCompilerSettingsSerializer.java => Kotlin2JvmCompilerArgumentsSerializer.java} (85%) rename jps/jps-plugin/src/org/jetbrains/jet/jps/model/{KotlinCommonCompilerSettingsSerializer.java => KotlinCommonCompilerArgumentsSerializer.java} (85%) rename jps/jps-plugin/src/org/jetbrains/jet/jps/model/{KotlinAdditionalCompilerSettingsSerializer.java => KotlinCompilerSettingsSerializer.java} (69%) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java index bdf56d787b0..e22c1971769 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java @@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.compiler.AdditionalCompilerSettings; +import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.ex.JpsElementBase; @@ -30,22 +30,22 @@ public class JpsKotlinCompilerSettings extends JpsElementBase ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); @NotNull - private CommonCompilerArguments commonCompilerSettings = new CommonCompilerArguments.DummyImpl(); + private CommonCompilerArguments commonCompilerArguments = new CommonCompilerArguments.DummyImpl(); @NotNull - private K2JVMCompilerArguments k2JvmCompilerSettings = new K2JVMCompilerArguments(); + private K2JVMCompilerArguments k2JvmCompilerArguments = new K2JVMCompilerArguments(); @NotNull - private K2JSCompilerArguments k2JsCompilerSettings = new K2JSCompilerArguments(); + private K2JSCompilerArguments k2JsCompilerArguments = new K2JSCompilerArguments(); @NotNull - private AdditionalCompilerSettings additionalCompilerSettings = new AdditionalCompilerSettings(); + private CompilerSettings compilerSettings = new CompilerSettings(); @NotNull @Override public JpsKotlinCompilerSettings createCopy() { JpsKotlinCompilerSettings copy = new JpsKotlinCompilerSettings(); - copy.commonCompilerSettings = this.commonCompilerSettings; - copy.k2JvmCompilerSettings = this.k2JvmCompilerSettings; - copy.k2JsCompilerSettings = this.k2JsCompilerSettings; - copy.additionalCompilerSettings = this.additionalCompilerSettings; + copy.commonCompilerArguments = this.commonCompilerArguments; + copy.k2JvmCompilerArguments = this.k2JvmCompilerArguments; + copy.k2JsCompilerArguments = this.k2JsCompilerArguments; + copy.compilerSettings = this.compilerSettings; return copy; } @@ -74,38 +74,38 @@ public class JpsKotlinCompilerSettings extends JpsElementBase 1) { @@ -141,9 +141,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); List libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); - K2JSCompilerArguments k2JsSettings = JpsKotlinCompilerSettings.getK2JsSettings(project); + K2JSCompilerArguments k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project); - runK2JsCompiler(commonSettings, k2JsSettings, additionalSettings, messageCollector, environment, + runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile); } else { @@ -161,9 +161,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - K2JVMCompilerArguments k2JvmSettings = JpsKotlinCompilerSettings.getK2JvmSettings(project); + K2JVMCompilerArguments k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project); - runK2JvmCompiler(commonSettings, k2JvmSettings, additionalSettings, messageCollector, environment, + runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector); } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java similarity index 86% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index e0d061646bd..64590df88e6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JsCompilerArgumentsSerializer.java @@ -25,11 +25,11 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; -class Kotlin2JsCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - Kotlin2JsCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JS_COMPILER_SETTINGS_SECTION); +class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { + Kotlin2JsCompilerArgumentsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION); } @Override @@ -39,7 +39,7 @@ class Kotlin2JsCompilerSettingsSerializer extends JpsProjectExtensionSerializer settings = new K2JSCompilerArguments(); } - JpsKotlinCompilerSettings.setK2JsSettings(project, settings); + JpsKotlinCompilerSettings.setK2JsCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java similarity index 85% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index 8f9752b55a3..2138bbd38d5 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java @@ -25,11 +25,11 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; -class Kotlin2JvmCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - Kotlin2JvmCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JVM_COMPILER_SETTINGS_SECTION); +class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { + Kotlin2JvmCompilerArgumentsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION); } @Override @@ -39,7 +39,7 @@ class Kotlin2JvmCompilerSettingsSerializer extends JpsProjectExtensionSerializer settings = new K2JVMCompilerArguments(); } - JpsKotlinCompilerSettings.setK2JvmSettings(project, settings); + JpsKotlinCompilerSettings.setK2JvmCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java similarity index 85% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 4522c25792d..793f1625103 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCommonCompilerArgumentsSerializer.java @@ -24,12 +24,12 @@ import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -class KotlinCommonCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - KotlinCommonCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMMON_COMPILER_SETTINGS_SECTION); +class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { + KotlinCommonCompilerArgumentsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION); } @Override @@ -39,7 +39,7 @@ class KotlinCommonCompilerSettingsSerializer extends JpsProjectExtensionSerializ settings = new CommonCompilerArguments.DummyImpl(); } - JpsKotlinCompilerSettings.setCommonSettings(project, settings); + JpsKotlinCompilerSettings.setCommonCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java similarity index 69% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java index ccb86bae311..c49532277fc 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinAdditionalCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinCompilerSettingsSerializer.java @@ -19,27 +19,27 @@ package org.jetbrains.jet.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.compiler.AdditionalCompilerSettings; +import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -class KotlinAdditionalCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - KotlinAdditionalCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_ADDITIONAL_COMPILER_SETTINGS_SECTION); +class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer { + KotlinCompilerSettingsSerializer() { + super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMPILER_SETTINGS_SECTION); } @Override public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { - AdditionalCompilerSettings settings = XmlSerializer.deserialize(componentTag, AdditionalCompilerSettings.class); + CompilerSettings settings = XmlSerializer.deserialize(componentTag, CompilerSettings.class); if (settings == null) { - settings = new AdditionalCompilerSettings(); + settings = new CompilerSettings(); } - JpsKotlinCompilerSettings.setAdditionalSettings(project, settings); + JpsKotlinCompilerSettings.setCompilerSettings(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java index e7885d2f643..feef8743763 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/model/KotlinModelSerializerService.java @@ -27,9 +27,9 @@ public class KotlinModelSerializerService extends JpsModelSerializerExtension { @NotNull @Override public List getProjectExtensionSerializers() { - return Arrays.asList(new KotlinCommonCompilerSettingsSerializer(), - new Kotlin2JvmCompilerSettingsSerializer(), - new Kotlin2JsCompilerSettingsSerializer(), - new KotlinAdditionalCompilerSettingsSerializer()); + return Arrays.asList(new KotlinCommonCompilerArgumentsSerializer(), + new Kotlin2JvmCompilerArgumentsSerializer(), + new Kotlin2JsCompilerArgumentsSerializer(), + new KotlinCompilerSettingsSerializer()); } } From 372c0e944bc3c3eaed1cf237efa1969981af13c0 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 31 Oct 2013 18:31:00 +0400 Subject: [PATCH 0049/1557] Do not use a method that is not present in some versions fo JPS Original commit: b726b5070aaf6d53a67c2e72f7ee79e783b13b9c --- .../src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java index 9e521435843..90032353e32 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java @@ -49,7 +49,7 @@ class JpsJsModuleUtils { Set libraries = JpsUtils.getAllDependencies(target).getLibraries(); for (JpsLibrary library : libraries) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { - String path = JpsPathUtil.urlToOsPath(root.getUrl()); + String path = JpsPathUtil.urlToPath(root.getUrl()); // TODO: Do we need to add to dependency all libraries? if (LibraryUtils.isJsRuntimeLibrary(new File(path))) { result.add(path); @@ -67,7 +67,7 @@ class JpsJsModuleUtils { result.add("@" + module.getName()); for (JpsModuleSourceRoot root : module.getSourceRoots(JavaSourceRootType.SOURCE)) { - result.add(JpsPathUtil.urlToOsPath(root.getUrl())); + result.add(JpsPathUtil.urlToPath(root.getUrl())); } } }); From a5fbb9e61bde7f20340b7bcd1698f2981e7e8114 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 8 Nov 2013 12:26:39 +0400 Subject: [PATCH 0050/1557] Refresh FS after compilation for js and sourcemap files. Original commit: 1409dd78126a52a8136cd24c2240a8d43ef42068 --- .../jet/jps/build/KotlinBuilder.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index cdea129cb77..49159f3cbff 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -51,7 +51,9 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.*; +import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*; +import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX; import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler; import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler; @@ -87,11 +89,11 @@ public class KotlinBuilder extends ModuleLevelBuilder { MessageCollector messageCollector = new MessageCollectorAdapter(context); // Workaround for Android Studio if (!isJavaPluginEnabled(context)) { - messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION); + messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION); return ExitCode.NOTHING_DONE; } - messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION); + messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION); ModuleBuildTarget representativeTarget = chunk.representativeTarget(); @@ -128,7 +130,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { WARNING, "Circular dependencies are not supported. " + "The following JS modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + "Kotlin is not compiled for these modules", - CompilerMessageLocation.NO_LOCATION); + NO_LOCATION); return ExitCode.NOTHING_DONE; } @@ -152,7 +154,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { WARNING, "Circular dependencies are only partially supported. " + "The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + "Kotlin will compile them, but some strange effect may happen", - CompilerMessageLocation.NO_LOCATION); + NO_LOCATION); } File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk); @@ -178,7 +180,17 @@ public class KotlinBuilder extends ModuleLevelBuilder { } for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { - BuildTarget target = sourceToTarget.get(outputItem.getSourceFiles().iterator().next()); + BuildTarget target = null; + Collection sourceFiles = outputItem.getSourceFiles(); + if (sourceFiles != null && !sourceFiles.isEmpty()) { + target = sourceToTarget.get(sourceFiles.iterator().next()); + } + else { + messageCollector.report(ERROR, + INTERNAL_ERROR_PREFIX + "outputItem.sourceFiles is null or empty, outputItem = " + outputItem, + NO_LOCATION); + } + outputConsumer.registerOutputFile( target != null ? target : representativeTarget, outputItem.getOutputFile(), @@ -235,7 +247,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { ) { String prefix = ""; if (severity == EXCEPTION) { - prefix = CompilerRunnerConstants.INTERNAL_ERROR_PREFIX; + prefix = INTERNAL_ERROR_PREFIX; } context.processMessage(new CompilerMessage( CompilerRunnerConstants.KOTLIN_COMPILER_NAME, From a85a00f4229c3c4d547e3753e533593f025b0f45 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 8 Nov 2013 13:51:21 +0400 Subject: [PATCH 0051/1557] JPS: switched to use dirty files without incremental compilation (temporary hack for recompiling all). Fixed compiling files from excluded directories. Original commit: e5a58e0c705a14ead27981bc1dc78a03959cac51 --- .../jet/jps/build/KotlinBuilder.java | 37 ++++++------ .../KotlinBuilderModuleScriptGenerator.java | 36 ++++++++---- .../jps/build/KotlinSourceFileCollector.java | 46 ++++++++++++++- .../jet/jps/build/KotlinJpsBuildTestCase.java | 58 ++++++++++++++++--- .../kotlinProject.iml | 13 +++++ .../kotlinProject.ipr | 14 +++++ .../src/exclude/foo.kt | 1 + .../ExcludeFolderInSourceRoot/src/foo.kt | 1 + .../kotlinProject.iml | 13 +++++ .../kotlinProject.ipr | 15 +++++ .../src/foo.kt | 1 + .../src/module2/module2.iml | 13 +++++ .../src/module2/src/foo.kt | 1 + 13 files changed, 210 insertions(+), 39 deletions(-) create mode 100644 jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/foo.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/foo.kt create mode 100644 jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt create mode 100644 jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml create mode 100644 jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 49159f3cbff..1cd94d78c3f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -134,8 +134,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); - //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); + List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); if (sourceFiles.isEmpty()) { return ExitCode.NOTHING_DONE; @@ -157,7 +156,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { NO_LOCATION); } - File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk); + File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, dirtyFilesHolder); if (moduleFile == null) { // No Kotlin sources found return ExitCode.NOTHING_DONE; @@ -169,15 +168,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { moduleFile, outputItemCollector); } - // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below - Map> sourceToTarget = new HashMap>(); - if (chunk.getTargets().size() > 1) { - for (ModuleBuildTarget target : chunk.getTargets()) { - for (File file : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { - sourceToTarget.put(file, target); - } - } - } + Map sourceToTarget = KotlinSourceFileCollector.getMapDirtySourcesToTarget(dirtyFilesHolder); + + boolean isAllRegistered = false; for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { BuildTarget target = null; @@ -186,15 +179,21 @@ public class KotlinBuilder extends ModuleLevelBuilder { target = sourceToTarget.get(sourceFiles.iterator().next()); } else { - messageCollector.report(ERROR, - INTERNAL_ERROR_PREFIX + "outputItem.sourceFiles is null or empty, outputItem = " + outputItem, - NO_LOCATION); + messageCollector.report(EXCEPTION, "KotlinBuilder: outputItem.sourceFiles is null or empty, outputItem = " + outputItem, NO_LOCATION); } - outputConsumer.registerOutputFile( - target != null ? target : representativeTarget, - outputItem.getOutputFile(), - paths(outputItem.getSourceFiles())); + //TODO FIX: Hack for compile all files if someone changed, because we don't have incremental compilation. + if (!isAllRegistered) { + isAllRegistered = true; + sourceFiles = sourceToTarget.keySet(); + } + + if (target == null) { + messageCollector.report(EXCEPTION, "KotlinBuilder: target is null for outputItem = " + outputItem, NO_LOCATION); + } + else { + outputConsumer.registerOutputFile(target, outputItem.getOutputFile(), paths(sourceFiles)); + } } return ExitCode.OK; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index f105f36047c..4d3a2133601 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -17,13 +17,14 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilderFactory; import org.jetbrains.jet.compiler.runner.KotlinModuleXmlBuilderFactory; -import org.jetbrains.jps.ModuleChunk; +import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; @@ -46,27 +47,39 @@ import java.util.*; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProcessor; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProvider; import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies; +import static org.jetbrains.jet.jps.build.KotlinSourceFileCollector.getMapTargetToDirtySources; public class KotlinBuilderModuleScriptGenerator { public static final KotlinModuleDescriptionBuilderFactory FACTORY = KotlinModuleXmlBuilderFactory.INSTANCE; @Nullable - public static File generateModuleDescription(CompileContext context, ModuleChunk chunk) - throws IOException - { + public static File generateModuleDescription( + CompileContext context, + DirtyFilesHolder dirtyFilesHolder + ) throws IOException { KotlinModuleDescriptionBuilder builder = FACTORY.create(); boolean noSources = true; - Set outputDirs = new HashSet(); - for (ModuleBuildTarget target : chunk.getTargets()) { - outputDirs.add(getOutputDir(target)); - } - for (ModuleBuildTarget target : chunk.getTargets()) { + Map> target2sources = getMapTargetToDirtySources(dirtyFilesHolder); + + Set targets = target2sources.keySet(); + Set outputDirs = ContainerUtil.map2Set(targets, new Function() { + @Override + public File fun(ModuleBuildTarget target) { + return getOutputDir(target); + } + }); + + for (ModuleBuildTarget target : targets) { File outputDir = getOutputDir(target); - List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(target); + List sourceFiles = target2sources.get(target); + if (sourceFiles == null) { + sourceFiles = Collections.emptyList(); + } + noSources &= sourceFiles.isEmpty(); builder.addModule( @@ -82,7 +95,8 @@ public class KotlinBuilderModuleScriptGenerator { if (noSources) return null; - File scriptFile = new File(getOutputDir(chunk.representativeTarget()), "script." + FACTORY.getFileExtension()); + ModuleBuildTarget representativeTarget = targets.iterator().next(); + File scriptFile = new File(getOutputDir(representativeTarget), "script." + FACTORY.getFileExtension()); writeScriptToFile(context, builder.asText(), scriptFile); diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index 029a59ff91e..2f71e54e3d9 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -18,6 +18,7 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.Processor; +import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -29,7 +30,7 @@ import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import java.io.File; import java.io.IOException; -import java.util.List; +import java.util.*; public class KotlinSourceFileCollector { // For incremental compilation @@ -50,6 +51,49 @@ public class KotlinSourceFileCollector { return sourceFiles; } + public static Map> getMapTargetToDirtySources( + DirtyFilesHolder dirtyFilesHolder + ) throws IOException { + final Map> target2sources = new HashMap>(); + + dirtyFilesHolder.processDirtyFiles(new FileProcessor() { + @Override + public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { + List sources = target2sources.get(target); + if (sources == null) { + sources = new SmartList(); + target2sources.put(target, sources); + } + + if (isKotlinSourceFile(file)) { + sources.add(file); + } + return true; + } + }); + + return target2sources; + } + + + public static Map getMapDirtySourcesToTarget( + DirtyFilesHolder dirtyFilesHolder + ) throws IOException { + final Map source2target = new HashMap(); + + dirtyFilesHolder.processDirtyFiles(new FileProcessor() { + @Override + public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { + if (isKotlinSourceFile(file)) { + source2target.put(file, target); + } + return true; + } + }); + + return source2target; + } + @NotNull public static List getAllKotlinSourceFiles(@NotNull ModuleBuildTarget target) { final List result = ContainerUtil.newArrayList(); diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index 1108dab9584..8c5d57d4293 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -19,6 +19,7 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightVirtualFile; +import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.jet.codegen.NamespaceCodegen; import org.jetbrains.jet.lang.resolve.name.FqName; @@ -73,14 +74,34 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { public void testKotlinProject() { doTest(); - assertOutputDeleted("src/test1.kt", "_DefaultPackage", "kotlinProject"); + assertOutputDeletedPackageInModule("kotlinProject", "src/test1.kt", "_DefaultPackage"); + } + + public void testExcludeFolderInSourceRoot() { + doTest(); + + JpsModule module = myProject.getModules().get(0); + assertFileExistsInOutput(module, "Foo.class"); + + assertOutputDeletedInModule("kotlinProject", "src/foo.kt", "Foo"); + } + + public void testExcludeModuleFolderInSourceRootOfAnotherModule() { + doTest(); + + for (JpsModule module : myProject.getModules()) { + assertFileExistsInOutput(module, "Foo.class"); + } + + assertOutputDeletedInModule("kotlinProject", "src/foo.kt", "Foo"); + assertOutputDeletedInModule("module2", "src/module2/src/foo.kt", "Foo"); } public void testKotlinProjectTwoFilesInOnePackage() { doTest(); - assertOutputDeleted("src/test1.kt", "_DefaultPackage", "kotlinProject"); - assertOutputDeleted("src/test2.kt", "_DefaultPackage", "kotlinProject"); + assertOutputDeletedPackageInModule("kotlinProject", "src/test1.kt", "_DefaultPackage"); + assertOutputDeletedPackageInModule("kotlinProject", "src/test2.kt", "_DefaultPackage"); } public void testKotlinJavaProject() { @@ -126,8 +147,8 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { } result.assertSuccessful(); - assertOutputDeleted("src/kt2.kt", "kt2.Kt2Package", "kotlinProject"); - assertOutputDeleted("module2/src/kt1.kt", "kt1.Kt1Package", "module2"); + assertOutputDeletedPackageInModule("kotlinProject", "src/kt2.kt", "kt2.Kt2Package"); + assertOutputDeletedPackageInModule("module2", "module2/src/kt1.kt", "kt1.Kt1Package"); } public void testReexportedDependency() { @@ -166,14 +187,35 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { return builder.toString(); } - private void assertOutputDeleted(String sourceFileName, String packageClassFqName, String moduleName) { + private void assertOutputDeletedPackageInModule(String moduleName, String sourceFileName, String packageClassFqNames) { + File file = new File(workDir, sourceFileName); + String[] packageClasses = { packageClassFqNames, getInternalNameForPackagePartClass(file, packageClassFqNames) }; + + assertOutputDeletedInModule(moduleName, sourceFileName, packageClasses); + } + + private void assertOutputDeletedInModule(final String moduleName, String sourceFileName, String... classFqNames) { + String[] paths = ContainerUtil.map2Array(classFqNames, String.class, new Function() { + @Override + public String fun(String classFqName) { + return outputPathInModuleByClassFqName(moduleName, classFqName); + } + }); + + assertOutputDeleted(sourceFileName, paths); + } + + private void assertOutputDeleted(String sourceFileName, String... paths) { File file = new File(workDir, sourceFileName); change(file.getAbsolutePath()); makeAll().assertSuccessful(); + assertDeleted(paths); + } + + private static String outputPathInModuleByClassFqName(String moduleName, String classFqName) { String outputDirPrefix = "out/production/" + moduleName + "/"; - assertDeleted(outputDirPrefix + packageClassFqName.replace('.', '/') + ".class", - outputDirPrefix + getInternalNameForPackagePartClass(file, packageClassFqName) + ".class"); + return outputDirPrefix + classFqName.replace('.', '/') + ".class"; } private static String getInternalNameForPackagePartClass(File sourceFile, String packageClassFqName) { diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.iml b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.iml new file mode 100644 index 00000000000..54f25b2ccec --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.ipr b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/foo.kt b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/foo.kt new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/foo.kt @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/foo.kt b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/foo.kt new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/foo.kt @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml new file mode 100644 index 00000000000..5cff40145f7 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr new file mode 100644 index 00000000000..35b084995b6 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml new file mode 100644 index 00000000000..3b1ba79ed61 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt @@ -0,0 +1 @@ +class Foo \ No newline at end of file From fcce7f25a72a087fc9dfc4083bfa5653a8943609 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 12 Nov 2013 13:33:27 +0400 Subject: [PATCH 0052/1557] JPS: revert KotlinBuilder changes for using dirty files, because it's wrong. Original commit: 923fd74c0a1c74dd58d85cdeaaa81326554b6738 --- .../jet/jps/build/KotlinBuilder.java | 30 ++++++------ .../KotlinBuilderModuleScriptGenerator.java | 36 +++++---------- .../jps/build/KotlinSourceFileCollector.java | 46 +------------------ 3 files changed, 25 insertions(+), 87 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 1cd94d78c3f..3b21e8d228d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -134,7 +134,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); + List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); + //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); if (sourceFiles.isEmpty()) { return ExitCode.NOTHING_DONE; @@ -156,7 +157,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { NO_LOCATION); } - File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, dirtyFilesHolder); + File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk); if (moduleFile == null) { // No Kotlin sources found return ExitCode.NOTHING_DONE; @@ -168,9 +169,15 @@ public class KotlinBuilder extends ModuleLevelBuilder { moduleFile, outputItemCollector); } - Map sourceToTarget = KotlinSourceFileCollector.getMapDirtySourcesToTarget(dirtyFilesHolder); - - boolean isAllRegistered = false; + // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below + Map> sourceToTarget = new HashMap>(); + if (chunk.getTargets().size() > 1) { + for (ModuleBuildTarget target : chunk.getTargets()) { + for (File file : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { + sourceToTarget.put(file, target); + } + } + } for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { BuildTarget target = null; @@ -182,18 +189,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { messageCollector.report(EXCEPTION, "KotlinBuilder: outputItem.sourceFiles is null or empty, outputItem = " + outputItem, NO_LOCATION); } - //TODO FIX: Hack for compile all files if someone changed, because we don't have incremental compilation. - if (!isAllRegistered) { - isAllRegistered = true; - sourceFiles = sourceToTarget.keySet(); - } - - if (target == null) { - messageCollector.report(EXCEPTION, "KotlinBuilder: target is null for outputItem = " + outputItem, NO_LOCATION); - } - else { - outputConsumer.registerOutputFile(target, outputItem.getOutputFile(), paths(sourceFiles)); - } + outputConsumer.registerOutputFile(target != null ? target : representativeTarget, outputItem.getOutputFile(), paths(sourceFiles)); } return ExitCode.OK; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 4d3a2133601..f105f36047c 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -17,14 +17,13 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilderFactory; import org.jetbrains.jet.compiler.runner.KotlinModuleXmlBuilderFactory; -import org.jetbrains.jps.builders.DirtyFilesHolder; +import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; @@ -47,39 +46,27 @@ import java.util.*; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProcessor; import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProvider; import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies; -import static org.jetbrains.jet.jps.build.KotlinSourceFileCollector.getMapTargetToDirtySources; public class KotlinBuilderModuleScriptGenerator { public static final KotlinModuleDescriptionBuilderFactory FACTORY = KotlinModuleXmlBuilderFactory.INSTANCE; @Nullable - public static File generateModuleDescription( - CompileContext context, - DirtyFilesHolder dirtyFilesHolder - ) throws IOException { + public static File generateModuleDescription(CompileContext context, ModuleChunk chunk) + throws IOException + { KotlinModuleDescriptionBuilder builder = FACTORY.create(); boolean noSources = true; - Map> target2sources = getMapTargetToDirtySources(dirtyFilesHolder); - - Set targets = target2sources.keySet(); - Set outputDirs = ContainerUtil.map2Set(targets, new Function() { - @Override - public File fun(ModuleBuildTarget target) { - return getOutputDir(target); - } - }); - - for (ModuleBuildTarget target : targets) { + Set outputDirs = new HashSet(); + for (ModuleBuildTarget target : chunk.getTargets()) { + outputDirs.add(getOutputDir(target)); + } + for (ModuleBuildTarget target : chunk.getTargets()) { File outputDir = getOutputDir(target); - List sourceFiles = target2sources.get(target); - if (sourceFiles == null) { - sourceFiles = Collections.emptyList(); - } - + List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(target); noSources &= sourceFiles.isEmpty(); builder.addModule( @@ -95,8 +82,7 @@ public class KotlinBuilderModuleScriptGenerator { if (noSources) return null; - ModuleBuildTarget representativeTarget = targets.iterator().next(); - File scriptFile = new File(getOutputDir(representativeTarget), "script." + FACTORY.getFileExtension()); + File scriptFile = new File(getOutputDir(chunk.representativeTarget()), "script." + FACTORY.getFileExtension()); writeScriptToFile(context, builder.asText(), scriptFile); diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index 2f71e54e3d9..029a59ff91e 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.Processor; -import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -30,7 +29,7 @@ import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import java.io.File; import java.io.IOException; -import java.util.*; +import java.util.List; public class KotlinSourceFileCollector { // For incremental compilation @@ -51,49 +50,6 @@ public class KotlinSourceFileCollector { return sourceFiles; } - public static Map> getMapTargetToDirtySources( - DirtyFilesHolder dirtyFilesHolder - ) throws IOException { - final Map> target2sources = new HashMap>(); - - dirtyFilesHolder.processDirtyFiles(new FileProcessor() { - @Override - public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { - List sources = target2sources.get(target); - if (sources == null) { - sources = new SmartList(); - target2sources.put(target, sources); - } - - if (isKotlinSourceFile(file)) { - sources.add(file); - } - return true; - } - }); - - return target2sources; - } - - - public static Map getMapDirtySourcesToTarget( - DirtyFilesHolder dirtyFilesHolder - ) throws IOException { - final Map source2target = new HashMap(); - - dirtyFilesHolder.processDirtyFiles(new FileProcessor() { - @Override - public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { - if (isKotlinSourceFile(file)) { - source2target.put(file, target); - } - return true; - } - }); - - return source2target; - } - @NotNull public static List getAllKotlinSourceFiles(@NotNull ModuleBuildTarget target) { final List result = ContainerUtil.newArrayList(); From 0ae7b9a6b0e8aca8d2cc6ffc4b428ae84d47538a Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 12 Nov 2013 15:44:51 +0400 Subject: [PATCH 0053/1557] JPS: ignore excluded directories and files in compilation. #KT-4188 fixed Original commit: b31e2d7421b6a514da9a7d816d71cbd916e1fc2b --- .../jps/build/KotlinSourceFileCollector.java | 48 +++++++++++++++---- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index 029a59ff91e..55051bad53f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -16,7 +16,9 @@ package org.jetbrains.jet.jps.build; +import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.Function; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -25,7 +27,10 @@ import org.jetbrains.jps.builders.FileProcessor; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.model.java.JavaSourceRootType; +import org.jetbrains.jps.model.java.JpsJavaExtensionService; +import org.jetbrains.jps.model.java.compiler.JpsCompilerExcludes; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; +import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; import java.io.IOException; @@ -52,17 +57,42 @@ public class KotlinSourceFileCollector { @NotNull public static List getAllKotlinSourceFiles(@NotNull ModuleBuildTarget target) { + final List moduleExcludes = ContainerUtil.map(target.getModule().getExcludeRootsList().getUrls(), new Function() { + @Override + public File fun(String url) { + return JpsPathUtil.urlToFile(url); + } + }); + + final JpsCompilerExcludes compilerExcludes = + JpsJavaExtensionService.getInstance().getOrCreateCompilerConfiguration(target.getModule().getProject()).getCompilerExcludes(); + final List result = ContainerUtil.newArrayList(); for (JpsModuleSourceRoot sourceRoot : getRelevantSourceRoots(target)) { - FileUtil.processFilesRecursively(sourceRoot.getFile(), new Processor() { - @Override - public boolean process(File file) { - if (file.isFile() && isKotlinSourceFile(file)) { - result.add(file); - } - return true; - } - }); + FileUtil.processFilesRecursively( + sourceRoot.getFile(), + new Processor() { + @Override + public boolean process(File file) { + if (compilerExcludes.isExcluded(file)) return true; + + if (file.isFile() && isKotlinSourceFile(file)) { + result.add(file); + } + return true; + } + }, + new Processor() { + @Override + public boolean process(final File dir) { + return ContainerUtil.find(moduleExcludes, new Condition() { + @Override + public boolean value(File exclude) { + return FileUtil.filesEqual(exclude, dir); + } + }) == null; + } + }); } return result; } From c35258d34cbbd83bc63b3b6a77c1e5c3ec72c1ac Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 12 Nov 2013 15:49:37 +0400 Subject: [PATCH 0054/1557] JPS: add tests for: exclude in compiler settings, project with more then one file. Original commit: 4fb995c50b5c447632e3ba4e2b4b4065d716de7e --- .../jet/jps/build/KotlinJpsBuildTestCase.java | 157 ++++++++++++++---- .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 18 ++ .../src/Excluded.kt | 1 + .../src/dir/YetAnotherExcluded.kt | 1 + .../src/dir/bar.kt | 1 + .../src}/foo.kt | 0 .../src/exclude/Excluded.kt | 1 + .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 19 +++ .../src/dir/Excluded.kt | 1 + .../src/dir/subdir/YetAnotherExcluded.kt | 1 + .../src/dir/subdir/bar.kt | 1 + .../src/foo.kt | 1 + .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 17 ++ .../src/bar.kt | 1 + .../src/exclude/Excluded.kt | 1 + .../src/exclude/YetAnotherExcluded.kt | 1 + .../src/exclude/subdir/Excluded.kt | 1 + .../src/exclude/subdir/YetAnotherExcluded.kt | 1 + .../src/foo.kt | 1 + .../testData/ManyFiles/kotlinProject.iml | 12 ++ .../testData/ManyFiles/kotlinProject.ipr | 14 ++ jps/jps-plugin/testData/ManyFiles/src/Bar.kt | 3 + jps/jps-plugin/testData/ManyFiles/src/boo.kt | 6 + jps/jps-plugin/testData/ManyFiles/src/main.kt | 8 + 27 files changed, 276 insertions(+), 28 deletions(-) create mode 100644 jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt rename jps/jps-plugin/testData/{ExcludeFolderInSourceRoot/src/exclude => ExcludeFileUsingCompilerSettings/src}/foo.kt (100%) create mode 100644 jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt create mode 100644 jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt create mode 100644 jps/jps-plugin/testData/ManyFiles/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/ManyFiles/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/ManyFiles/src/Bar.kt create mode 100644 jps/jps-plugin/testData/ManyFiles/src/boo.kt create mode 100644 jps/jps-plugin/testData/ManyFiles/src/main.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index 8c5d57d4293..0e58632ba7c 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -36,6 +36,9 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { private static final String PROJECT_NAME = "kotlinProject"; private static final String JDK_NAME = "IDEA_JDK"; + private static final String[] EXCLUDE_FILES = { "Excluded.class", "YetAnotherExcluded.class" }; + private static final String[] NOTHING = {}; + @Override public void setUp() throws Exception { super.setUp(); @@ -74,34 +77,88 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { public void testKotlinProject() { doTest(); - assertOutputDeletedPackageInModule("kotlinProject", "src/test1.kt", "_DefaultPackage"); + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test1.kt", "_DefaultPackage"); } public void testExcludeFolderInSourceRoot() { doTest(); JpsModule module = myProject.getModules().get(0); - assertFileExistsInOutput(module, "Foo.class"); + assertFilesExistInOutput(module, "Foo.class"); + assertFilesNotExistInOutput(module, EXCLUDE_FILES); - assertOutputDeletedInModule("kotlinProject", "src/foo.kt", "Foo"); + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); } public void testExcludeModuleFolderInSourceRootOfAnotherModule() { doTest(); for (JpsModule module : myProject.getModules()) { - assertFileExistsInOutput(module, "Foo.class"); + assertFilesExistInOutput(module, "Foo.class"); } - assertOutputDeletedInModule("kotlinProject", "src/foo.kt", "Foo"); - assertOutputDeletedInModule("module2", "src/module2/src/foo.kt", "Foo"); + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "module2", "src/module2/src/foo.kt", "Foo"); + } + + public void testExcludeFileUsingCompilerSettings() { + doTest(); + + JpsModule module = myProject.getModules().get(0); + assertFilesExistInOutput(module, "Foo.class", "Bar.class"); + assertFilesNotExistInOutput(module, EXCLUDE_FILES); + + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); + checkExcludesNotAffectedToOutput("kotlinProject", "src/Excluded.kt", "src/dir/YetAnotherExcluded.kt"); + } + + public void testExcludeFolderNonRecursivelyUsingCompilerSettings() { + doTest(); + + JpsModule module = myProject.getModules().get(0); + assertFilesExistInOutput(module, "Foo.class", "Bar.class"); + assertFilesNotExistInOutput(module, EXCLUDE_FILES); + + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/dir/subdir/bar.kt", "Bar"); + checkExcludesNotAffectedToOutput("kotlinProject", "src/dir/Excluded.kt", "src/dir/subdir/YetAnotherExcluded.kt"); + } + + public void testExcludeFolderRecursivelyUsingCompilerSettings() { + doTest(); + + JpsModule module = myProject.getModules().get(0); + assertFilesExistInOutput(module, "Foo.class", "Bar.class"); + assertFilesNotExistInOutput(module, EXCLUDE_FILES); + + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); + checkExcludesNotAffectedToOutput("kotlinProject", + "src/exclude/Excluded.kt", "src/exclude/YetAnotherExcluded.kt", + "src/exclude/subdir/Excluded.kt", "src/exclude/subdir/YetAnotherExcluded.kt"); + } + + public void testManyFiles() { + doTest(); + + JpsModule module = myProject.getModules().get(0); + assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class"); + + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/main.kt", "foo.FooPackage"); + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/boo.kt", "boo.BooPackage"); + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/Bar.kt", "foo.Bar", "foo.FooPackage"); + + checkPackageDeletedFromOutputWhen(Operation.DELETE, "kotlinProject", "src/main.kt", "foo.FooPackage"); + assertFilesNotExistInOutput(module, "foo/FooPackage.class"); + + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/boo.kt", "boo.BooPackage"); + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/Bar.kt", "foo.Bar"); } public void testKotlinProjectTwoFilesInOnePackage() { doTest(); - assertOutputDeletedPackageInModule("kotlinProject", "src/test1.kt", "_DefaultPackage"); - assertOutputDeletedPackageInModule("kotlinProject", "src/test2.kt", "_DefaultPackage"); + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test1.kt", "_DefaultPackage"); + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test2.kt", "_DefaultPackage"); } public void testKotlinJavaProject() { @@ -139,16 +196,16 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { // Check that outputs are located properly for (JpsModule module : myProject.getModules()) { if (module.getName().equals("module2")) { - assertFileExistsInOutput(module, "kt1/Kt1Package.class"); + assertFilesExistInOutput(module, "kt1/Kt1Package.class"); } if (module.getName().equals("kotlinProject")) { - assertFileExistsInOutput(module, "kt2/Kt2Package.class"); + assertFilesExistInOutput(module, "kt2/Kt2Package.class"); } } result.assertSuccessful(); - assertOutputDeletedPackageInModule("kotlinProject", "src/kt2.kt", "kt2.Kt2Package"); - assertOutputDeletedPackageInModule("module2", "module2/src/kt1.kt", "kt1.Kt1Package"); + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/kt2.kt", "kt2.Kt2Package"); + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module2", "module2/src/kt1.kt", "kt1.Kt1Package"); } public void testReexportedDependency() { @@ -163,16 +220,35 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { makeAll().assertSuccessful(); } - private static void assertFileExistsInOutput(JpsModule module, String relativePath) { + private static void assertFilesExistInOutput(JpsModule module, String... relativePaths) { String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false); assertNotNull(outputUrl); File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); - File outputFile = new File(outputDir, relativePath); - assertTrue("Output not written: " + - outputFile.getAbsolutePath() + - "\n Directory contents: \n" + - dirContents(outputFile.getParentFile()), - outputFile.exists()); + for (String path : relativePaths) { + File outputFile = new File(outputDir, path); + assertTrue("Output not written: " + + outputFile.getAbsolutePath() + + "\n Directory contents: \n" + + dirContents(outputFile.getParentFile()), + outputFile.exists()); + } + } + + private void checkExcludesNotAffectedToOutput(String module, String... excludeRelativePaths) { + for (String path : excludeRelativePaths) { + checkClassesDeletedFromOutputWhen(Operation.CHANGE, module, path, NOTHING); + } + } + + private static void assertFilesNotExistInOutput(JpsModule module, String... relativePaths) { + String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false); + assertNotNull(outputUrl); + File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); + for (String path : relativePaths) { + File outputFile = new File(outputDir, path); + assertFalse("Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"", + outputFile.exists()); + } } private static String dirContents(File dir) { @@ -187,30 +263,51 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { return builder.toString(); } - private void assertOutputDeletedPackageInModule(String moduleName, String sourceFileName, String packageClassFqNames) { + private void checkPackageDeletedFromOutputWhen( + Operation operation, + String moduleName, + String sourceFileName, + String packageClassFqNamesToDelete + ) { File file = new File(workDir, sourceFileName); - String[] packageClasses = { packageClassFqNames, getInternalNameForPackagePartClass(file, packageClassFqNames) }; + String[] packageClasses = { packageClassFqNamesToDelete, getInternalNameForPackagePartClass(file, packageClassFqNamesToDelete) }; - assertOutputDeletedInModule(moduleName, sourceFileName, packageClasses); + checkClassesDeletedFromOutputWhen(operation, moduleName, sourceFileName, packageClasses); } - private void assertOutputDeletedInModule(final String moduleName, String sourceFileName, String... classFqNames) { - String[] paths = ContainerUtil.map2Array(classFqNames, String.class, new Function() { + private void checkClassesDeletedFromOutputWhen( + Operation operation, + final String moduleName, + String sourceFileName, + String... classFqNamesToDelete + ) { + String[] paths = ContainerUtil.map2Array(classFqNamesToDelete, String.class, new Function() { @Override public String fun(String classFqName) { return outputPathInModuleByClassFqName(moduleName, classFqName); } }); - assertOutputDeleted(sourceFileName, paths); + checkFilesDeletedFromOutputWhen(operation, sourceFileName, paths); } - private void assertOutputDeleted(String sourceFileName, String... paths) { + private void checkFilesDeletedFromOutputWhen(Operation operation, String sourceFileName, String... pathsToDelete) { File file = new File(workDir, sourceFileName); - change(file.getAbsolutePath()); + + if (operation == Operation.CHANGE) { + change(file.getAbsolutePath()); + } + else if(operation == Operation.DELETE) { + assertTrue("Can not delete file \"" + file.getAbsolutePath() + "\"", + file.delete()); + } + else { + fail("Unknown operation"); + } + makeAll().assertSuccessful(); - assertDeleted(paths); + assertDeleted(pathsToDelete); } private static String outputPathInModuleByClassFqName(String moduleName, String classFqName) { @@ -228,4 +325,8 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { }; return NamespaceCodegen.getNamespacePartType(new FqName(packageClassFqName), fakeVirtualFile).getInternalName(); } + + private static enum Operation { + CHANGE, DELETE + } } diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml new file mode 100644 index 00000000000..0c4fb67a3d4 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr new file mode 100644 index 00000000000..da39ecb6ab2 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt new file mode 100644 index 00000000000..06d7528e228 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt @@ -0,0 +1 @@ +class Excluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt new file mode 100644 index 00000000000..4b5f5c0c428 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt @@ -0,0 +1 @@ +class YetAnotherExcluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt new file mode 100644 index 00000000000..4a643c4dde8 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt @@ -0,0 +1 @@ +class Bar \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/foo.kt b/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/foo.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/foo.kt rename to jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/foo.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt new file mode 100644 index 00000000000..06d7528e228 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt @@ -0,0 +1 @@ +class Excluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml new file mode 100644 index 00000000000..0c4fb67a3d4 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr new file mode 100644 index 00000000000..852485b023c --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr @@ -0,0 +1,19 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt new file mode 100644 index 00000000000..06d7528e228 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt @@ -0,0 +1 @@ +class Excluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt new file mode 100644 index 00000000000..4b5f5c0c428 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt @@ -0,0 +1 @@ +class YetAnotherExcluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt new file mode 100644 index 00000000000..4a643c4dde8 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt @@ -0,0 +1 @@ +class Bar \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml new file mode 100644 index 00000000000..0c4fb67a3d4 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr new file mode 100644 index 00000000000..9b497ed5475 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr @@ -0,0 +1,17 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt new file mode 100644 index 00000000000..4a643c4dde8 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt @@ -0,0 +1 @@ +class Bar \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt new file mode 100644 index 00000000000..06d7528e228 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt @@ -0,0 +1 @@ +class Excluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt new file mode 100644 index 00000000000..4b5f5c0c428 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt @@ -0,0 +1 @@ +class YetAnotherExcluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt new file mode 100644 index 00000000000..06d7528e228 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt @@ -0,0 +1 @@ +class Excluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt new file mode 100644 index 00000000000..4b5f5c0c428 --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt @@ -0,0 +1 @@ +class YetAnotherExcluded \ No newline at end of file diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/ManyFiles/kotlinProject.iml b/jps/jps-plugin/testData/ManyFiles/kotlinProject.iml new file mode 100644 index 00000000000..0c4fb67a3d4 --- /dev/null +++ b/jps/jps-plugin/testData/ManyFiles/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ManyFiles/kotlinProject.ipr b/jps/jps-plugin/testData/ManyFiles/kotlinProject.ipr new file mode 100644 index 00000000000..8226e21ade3 --- /dev/null +++ b/jps/jps-plugin/testData/ManyFiles/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/ManyFiles/src/Bar.kt b/jps/jps-plugin/testData/ManyFiles/src/Bar.kt new file mode 100644 index 00000000000..2c990ada4c7 --- /dev/null +++ b/jps/jps-plugin/testData/ManyFiles/src/Bar.kt @@ -0,0 +1,3 @@ +package foo + +class Bar diff --git a/jps/jps-plugin/testData/ManyFiles/src/boo.kt b/jps/jps-plugin/testData/ManyFiles/src/boo.kt new file mode 100644 index 00000000000..e9a050624da --- /dev/null +++ b/jps/jps-plugin/testData/ManyFiles/src/boo.kt @@ -0,0 +1,6 @@ +package boo + +import foo.Bar + +fun boo(bar: Bar) { +} diff --git a/jps/jps-plugin/testData/ManyFiles/src/main.kt b/jps/jps-plugin/testData/ManyFiles/src/main.kt new file mode 100644 index 00000000000..cfcbc18690b --- /dev/null +++ b/jps/jps-plugin/testData/ManyFiles/src/main.kt @@ -0,0 +1,8 @@ +package foo + +import boo.boo + +fun main(args: Array) { + val bar = Bar() + boo(bar) +} From f1af824e5d9e89d710f65a6819ebae453d8296ea Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 12 Nov 2013 20:34:23 +0400 Subject: [PATCH 0055/1557] KotlinJpsBuildTestCase -> KotlinJpsBuildTest Original commit: 8917bd033142c02d0328d1032fe99155231e7408 --- .../{KotlinJpsBuildTestCase.java => KotlinJpsBuildTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename jps/jps-plugin/test/org/jetbrains/jet/jps/build/{KotlinJpsBuildTestCase.java => KotlinJpsBuildTest.java} (99%) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java similarity index 99% rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java rename to jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 0e58632ba7c..96943f6127f 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -32,7 +32,7 @@ import org.jetbrains.jps.util.JpsPathUtil; import java.io.File; import java.io.IOException; -public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { +public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final String PROJECT_NAME = "kotlinProject"; private static final String JDK_NAME = "IDEA_JDK"; From b972ebe05b0e8b464c88cf0d3feba9551684906d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 10 Jan 2014 00:38:19 +0400 Subject: [PATCH 0056/1557] Got rid of "namespace" word in backend. Original commit: 4239f5bb18fed2bb22b7f4145a4a04d2537dfecf --- .../test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 96943f6127f..3d065cb8dfd 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.jet.codegen.NamespaceCodegen; +import org.jetbrains.jet.codegen.PackageCodegen; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; @@ -323,7 +323,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { return super.getPath().substring(1); } }; - return NamespaceCodegen.getNamespacePartType(new FqName(packageClassFqName), fakeVirtualFile).getInternalName(); + return PackageCodegen.getPackagePartType(new FqName(packageClassFqName), fakeVirtualFile).getInternalName(); } private static enum Operation { From 27829c15e5d78e421d01e564434bc212e308023a Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 16 Jan 2014 20:01:41 +0400 Subject: [PATCH 0057/1557] Fix for KT-4413 Do not add error types to supertype lists The list is not filtered upon creation because it would force lazy types to compute #KT-4413 Fixed Original commit: 0155bf01898a9872e81da10412b6ee18e3bdf305 --- .../jet/jps/build/SimpleKotlinJpsBuildTest.kt | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt new file mode 100644 index 00000000000..651fcebdffc --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt @@ -0,0 +1,74 @@ +/* + * Copyright 2010-2014 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.jps.build + +import org.jetbrains.jps.builders.JpsBuildTestCase +import com.intellij.util.PathUtil +import org.jetbrains.jps.model.java.JpsJavaExtensionService + +public class SimpleKotlinJpsBuildTest : JpsBuildTestCase() { + override fun setUp() { + super.setUp() + System.setProperty("kotlin.jps.tests", "true") + } + + override fun tearDown() { + System.clearProperty("kotlin.jps.tests") + super.tearDown() + } + + public fun testThreeModulesNoReexport() { + val aFile = createFile("a/a.kt", + """ + trait A1 { + fun bar() + } + trait A2 { + fun bar() + } + """) + val a = addModule("a", PathUtil.getParentPath(aFile)) + + val bFile = createFile("b/b.kt", + """ + trait B1 { + fun foo(): B2? = null + } + + trait B2 : A1, A2 { + override fun bar() {} + } + """) + val b = addModule("b", PathUtil.getParentPath(bFile)) + JpsJavaExtensionService.getInstance().getOrCreateDependencyExtension( + b.getDependenciesList().addModuleDependency(a) + ).setExported(false) + + val cFile = createFile("c/c.kt", + """ + class C : B1 { + fun test() { + foo()?.bar() + } + } + """) + val c = addModule("c", PathUtil.getParentPath(cFile)) + c.getDependenciesList().addModuleDependency(b) + + rebuildAll() + } +} From 1576c63073c7ecc355641eebb068d5b816c39230 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 20 Jan 2014 20:07:20 +0400 Subject: [PATCH 0058/1557] Always use Project SDK Original commit: 77c340d8725df3a8832d117e043725789c0e0866 --- .../kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml index 59b1954066a..e99b5a3918b 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml +++ b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml @@ -5,7 +5,7 @@ - + From b1634905d4833a0cee2cbbcd7878b7223bb6e5d9 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 20 Jan 2014 20:12:17 +0400 Subject: [PATCH 0059/1557] Use Project SDK for jps-plugin Original commit: 2c61ff90858411c44d0f52e9d9fc17ad2d217bd4 --- jps/jps-plugin/jps-plugin.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index c3a06774179..4f321f16eb3 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -6,7 +6,7 @@ - + From a19d7c7542c704267dd0b191ccf2c030872ecd21 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 12 Feb 2014 23:30:25 +0400 Subject: [PATCH 0060/1557] Introduced protobuf generating script. It generates two variants: lite (for runtime usage) and debug (for tests). Original commit: 846ee2c8acf5c0398002f9f8675ec689004a14cd --- .../serialization/DebugJavaProtoBuf.java | 3883 +++++ .../serialization/DebugProtoBuf.java | 14006 ++++++++++++++++ 2 files changed, 17889 insertions(+) create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java diff --git a/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java b/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java new file mode 100644 index 00000000000..69e40086b29 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java @@ -0,0 +1,3883 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: core/serialization.java/src/java_descriptors.debug.proto + +package org.jetbrains.jet.descriptors.serialization; + +public final class DebugJavaProtoBuf { + private DebugJavaProtoBuf() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.methodSignature); + registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.propertySignature); + registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.implClassName); + registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.index); + } + public interface JavaTypeOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + * + * 
+     * One of these should be present
+     *
+ */ + boolean hasPrimitiveType(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + * + * 
+     * One of these should be present
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType(); + + // optional int32 class_fq_name = 2; + /** + * optional int32 class_fq_name = 2; + */ + boolean hasClassFqName(); + /** + * optional int32 class_fq_name = 2; + */ + int getClassFqName(); + + // optional int32 array_dimension = 3 [default = 0]; + /** + * optional int32 array_dimension = 3 [default = 0]; + */ + boolean hasArrayDimension(); + /** + * optional int32 array_dimension = 3 [default = 0]; + */ + int getArrayDimension(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaType} + */ + public static final class JavaType extends + com.google.protobuf.GeneratedMessage + implements JavaTypeOrBuilder { + // Use JavaType.newBuilder() to construct. + private JavaType(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private JavaType(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final JavaType defaultInstance; + public static JavaType getDefaultInstance() { + return defaultInstance; + } + + public JavaType getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private JavaType( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType value = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + primitiveType_ = value; + } + break; + } + case 16: { + bitField0_ |= 0x00000002; + classFqName_ = input.readInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + arrayDimension_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public JavaType parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new JavaType(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType} + */ + public enum PrimitiveType + implements com.google.protobuf.ProtocolMessageEnum { + /** + * VOID = 0; + * + * 
+       * These values correspond to ASM Type sorts
+       *
+ */ + VOID(0, 0), + /** + * BOOLEAN = 1; + */ + BOOLEAN(1, 1), + /** + * CHAR = 2; + */ + CHAR(2, 2), + /** + * BYTE = 3; + */ + BYTE(3, 3), + /** + * SHORT = 4; + */ + SHORT(4, 4), + /** + * INT = 5; + */ + INT(5, 5), + /** + * FLOAT = 6; + */ + FLOAT(6, 6), + /** + * LONG = 7; + */ + LONG(7, 7), + /** + * DOUBLE = 8; + */ + DOUBLE(8, 8), + ; + + /** + * VOID = 0; + * + * 
+       * These values correspond to ASM Type sorts
+       *
+ */ + public static final int VOID_VALUE = 0; + /** + * BOOLEAN = 1; + */ + public static final int BOOLEAN_VALUE = 1; + /** + * CHAR = 2; + */ + public static final int CHAR_VALUE = 2; + /** + * BYTE = 3; + */ + public static final int BYTE_VALUE = 3; + /** + * SHORT = 4; + */ + public static final int SHORT_VALUE = 4; + /** + * INT = 5; + */ + public static final int INT_VALUE = 5; + /** + * FLOAT = 6; + */ + public static final int FLOAT_VALUE = 6; + /** + * LONG = 7; + */ + public static final int LONG_VALUE = 7; + /** + * DOUBLE = 8; + */ + public static final int DOUBLE_VALUE = 8; + + + public final int getNumber() { return value; } + + public static PrimitiveType valueOf(int value) { + switch (value) { + case 0: return VOID; + case 1: return BOOLEAN; + case 2: return CHAR; + case 3: return BYTE; + case 4: return SHORT; + case 5: return INT; + case 6: return FLOAT; + case 7: return LONG; + case 8: return DOUBLE; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public PrimitiveType findValueByNumber(int number) { + return PrimitiveType.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDescriptor().getEnumTypes().get(0); + } + + private static final PrimitiveType[] VALUES = values(); + + public static PrimitiveType valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private PrimitiveType(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType) + } + + private int bitField0_; + // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + public static final int PRIMITIVE_TYPE_FIELD_NUMBER = 1; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType primitiveType_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + * + * 
+     * One of these should be present
+     *
+ */ + public boolean hasPrimitiveType() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + * + * 
+     * One of these should be present
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType() { + return primitiveType_; + } + + // optional int32 class_fq_name = 2; + public static final int CLASS_FQ_NAME_FIELD_NUMBER = 2; + private int classFqName_; + /** + * optional int32 class_fq_name = 2; + */ + public boolean hasClassFqName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 class_fq_name = 2; + */ + public int getClassFqName() { + return classFqName_; + } + + // optional int32 array_dimension = 3 [default = 0]; + public static final int ARRAY_DIMENSION_FIELD_NUMBER = 3; + private int arrayDimension_; + /** + * optional int32 array_dimension = 3 [default = 0]; + */ + public boolean hasArrayDimension() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 array_dimension = 3 [default = 0]; + */ + public int getArrayDimension() { + return arrayDimension_; + } + + private void initFields() { + primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID; + classFqName_ = 0; + arrayDimension_ = 0; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeEnum(1, primitiveType_.getNumber()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, classFqName_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, arrayDimension_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, primitiveType_.getNumber()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, classFqName_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, arrayDimension_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaType} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID; + bitField0_ = (bitField0_ & ~0x00000001); + classFqName_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + arrayDimension_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType build() { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.primitiveType_ = primitiveType_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.classFqName_ = classFqName_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.arrayDimension_ = arrayDimension_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) return this; + if (other.hasPrimitiveType()) { + setPrimitiveType(other.getPrimitiveType()); + } + if (other.hasClassFqName()) { + setClassFqName(other.getClassFqName()); + } + if (other.hasArrayDimension()) { + setArrayDimension(other.getArrayDimension()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + * + * 
+       * One of these should be present
+       *
+ */ + public boolean hasPrimitiveType() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + * + * 
+       * One of these should be present
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType() { + return primitiveType_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + * + * 
+       * One of these should be present
+       *
+ */ + public Builder setPrimitiveType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + primitiveType_ = value; + onChanged(); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; + * + * 
+       * One of these should be present
+       *
+ */ + public Builder clearPrimitiveType() { + bitField0_ = (bitField0_ & ~0x00000001); + primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID; + onChanged(); + return this; + } + + // optional int32 class_fq_name = 2; + private int classFqName_ ; + /** + * optional int32 class_fq_name = 2; + */ + public boolean hasClassFqName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional int32 class_fq_name = 2; + */ + public int getClassFqName() { + return classFqName_; + } + /** + * optional int32 class_fq_name = 2; + */ + public Builder setClassFqName(int value) { + bitField0_ |= 0x00000002; + classFqName_ = value; + onChanged(); + return this; + } + /** + * optional int32 class_fq_name = 2; + */ + public Builder clearClassFqName() { + bitField0_ = (bitField0_ & ~0x00000002); + classFqName_ = 0; + onChanged(); + return this; + } + + // optional int32 array_dimension = 3 [default = 0]; + private int arrayDimension_ ; + /** + * optional int32 array_dimension = 3 [default = 0]; + */ + public boolean hasArrayDimension() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 array_dimension = 3 [default = 0]; + */ + public int getArrayDimension() { + return arrayDimension_; + } + /** + * optional int32 array_dimension = 3 [default = 0]; + */ + public Builder setArrayDimension(int value) { + bitField0_ |= 0x00000004; + arrayDimension_ = value; + onChanged(); + return this; + } + /** + * optional int32 array_dimension = 3 [default = 0]; + */ + public Builder clearArrayDimension() { + bitField0_ = (bitField0_ & ~0x00000004); + arrayDimension_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaType) + } + + static { + defaultInstance = new JavaType(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaType) + } + + public interface JavaMethodSignatureOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // required int32 name = 1; + /** + * required int32 name = 1; + */ + boolean hasName(); + /** + * required int32 name = 1; + */ + int getName(); + + // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + boolean hasReturnType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder(); + + // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + java.util.List + getParameterTypeList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + int getParameterTypeCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + java.util.List + getParameterTypeOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder( + int index); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaMethodSignature} + */ + public static final class JavaMethodSignature extends + com.google.protobuf.GeneratedMessage + implements JavaMethodSignatureOrBuilder { + // Use JavaMethodSignature.newBuilder() to construct. + private JavaMethodSignature(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private JavaMethodSignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final JavaMethodSignature defaultInstance; + public static JavaMethodSignature getDefaultInstance() { + return defaultInstance; + } + + public JavaMethodSignature getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private JavaMethodSignature( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + name_ = input.readInt32(); + break; + } + case 18: { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = returnType_.toBuilder(); + } + returnType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(returnType_); + returnType_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000002; + break; + } + case 26: { + if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + parameterType_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000004; + } + parameterType_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + parameterType_ = java.util.Collections.unmodifiableList(parameterType_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public JavaMethodSignature parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new JavaMethodSignature(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // required int32 name = 1; + public static final int NAME_FIELD_NUMBER = 1; + private int name_; + /** + * required int32 name = 1; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required int32 name = 1; + */ + public int getName() { + return name_; + } + + // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + public static final int RETURN_TYPE_FIELD_NUMBER = 2; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType returnType_; + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public boolean hasReturnType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType() { + return returnType_; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder() { + return returnType_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + public static final int PARAMETER_TYPE_FIELD_NUMBER = 3; + private java.util.List parameterType_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public java.util.List getParameterTypeList() { + return parameterType_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public java.util.List + getParameterTypeOrBuilderList() { + return parameterType_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public int getParameterTypeCount() { + return parameterType_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index) { + return parameterType_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder( + int index) { + return parameterType_.get(index); + } + + private void initFields() { + name_ = 0; + returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + parameterType_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasName()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasReturnType()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, name_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeMessage(2, returnType_); + } + for (int i = 0; i < parameterType_.size(); i++) { + output.writeMessage(3, parameterType_.get(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, name_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, returnType_); + } + for (int i = 0; i < parameterType_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, parameterType_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaMethodSignature} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getReturnTypeFieldBuilder(); + getParameterTypeFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + name_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + if (returnTypeBuilder_ == null) { + returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + } else { + returnTypeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + if (parameterTypeBuilder_ == null) { + parameterType_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + } else { + parameterTypeBuilder_.clear(); + } + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature build() { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.name_ = name_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + if (returnTypeBuilder_ == null) { + result.returnType_ = returnType_; + } else { + result.returnType_ = returnTypeBuilder_.build(); + } + if (parameterTypeBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004)) { + parameterType_ = java.util.Collections.unmodifiableList(parameterType_); + bitField0_ = (bitField0_ & ~0x00000004); + } + result.parameterType_ = parameterType_; + } else { + result.parameterType_ = parameterTypeBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) return this; + if (other.hasName()) { + setName(other.getName()); + } + if (other.hasReturnType()) { + mergeReturnType(other.getReturnType()); + } + if (parameterTypeBuilder_ == null) { + if (!other.parameterType_.isEmpty()) { + if (parameterType_.isEmpty()) { + parameterType_ = other.parameterType_; + bitField0_ = (bitField0_ & ~0x00000004); + } else { + ensureParameterTypeIsMutable(); + parameterType_.addAll(other.parameterType_); + } + onChanged(); + } + } else { + if (!other.parameterType_.isEmpty()) { + if (parameterTypeBuilder_.isEmpty()) { + parameterTypeBuilder_.dispose(); + parameterTypeBuilder_ = null; + parameterType_ = other.parameterType_; + bitField0_ = (bitField0_ & ~0x00000004); + parameterTypeBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getParameterTypeFieldBuilder() : null; + } else { + parameterTypeBuilder_.addAllMessages(other.parameterType_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasName()) { + + return false; + } + if (!hasReturnType()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // required int32 name = 1; + private int name_ ; + /** + * required int32 name = 1; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required int32 name = 1; + */ + public int getName() { + return name_; + } + /** + * required int32 name = 1; + */ + public Builder setName(int value) { + bitField0_ |= 0x00000001; + name_ = value; + onChanged(); + return this; + } + /** + * required int32 name = 1; + */ + public Builder clearName() { + bitField0_ = (bitField0_ & ~0x00000001); + name_ = 0; + onChanged(); + return this; + } + + // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> returnTypeBuilder_; + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public boolean hasReturnType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType() { + if (returnTypeBuilder_ == null) { + return returnType_; + } else { + return returnTypeBuilder_.getMessage(); + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public Builder setReturnType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { + if (returnTypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + returnType_ = value; + onChanged(); + } else { + returnTypeBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public Builder setReturnType( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { + if (returnTypeBuilder_ == null) { + returnType_ = builderForValue.build(); + onChanged(); + } else { + returnTypeBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public Builder mergeReturnType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { + if (returnTypeBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + returnType_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) { + returnType_ = + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder(returnType_).mergeFrom(value).buildPartial(); + } else { + returnType_ = value; + } + onChanged(); + } else { + returnTypeBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public Builder clearReturnType() { + if (returnTypeBuilder_ == null) { + returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + onChanged(); + } else { + returnTypeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getReturnTypeBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getReturnTypeFieldBuilder().getBuilder(); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder() { + if (returnTypeBuilder_ != null) { + return returnTypeBuilder_.getMessageOrBuilder(); + } else { + return returnType_; + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> + getReturnTypeFieldBuilder() { + if (returnTypeBuilder_ == null) { + returnTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>( + returnType_, + getParentForChildren(), + isClean()); + returnType_ = null; + } + return returnTypeBuilder_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + private java.util.List parameterType_ = + java.util.Collections.emptyList(); + private void ensureParameterTypeIsMutable() { + if (!((bitField0_ & 0x00000004) == 0x00000004)) { + parameterType_ = new java.util.ArrayList(parameterType_); + bitField0_ |= 0x00000004; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> parameterTypeBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public java.util.List getParameterTypeList() { + if (parameterTypeBuilder_ == null) { + return java.util.Collections.unmodifiableList(parameterType_); + } else { + return parameterTypeBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public int getParameterTypeCount() { + if (parameterTypeBuilder_ == null) { + return parameterType_.size(); + } else { + return parameterTypeBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index) { + if (parameterTypeBuilder_ == null) { + return parameterType_.get(index); + } else { + return parameterTypeBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder setParameterType( + int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { + if (parameterTypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureParameterTypeIsMutable(); + parameterType_.set(index, value); + onChanged(); + } else { + parameterTypeBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder setParameterType( + int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { + if (parameterTypeBuilder_ == null) { + ensureParameterTypeIsMutable(); + parameterType_.set(index, builderForValue.build()); + onChanged(); + } else { + parameterTypeBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder addParameterType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { + if (parameterTypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureParameterTypeIsMutable(); + parameterType_.add(value); + onChanged(); + } else { + parameterTypeBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder addParameterType( + int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { + if (parameterTypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureParameterTypeIsMutable(); + parameterType_.add(index, value); + onChanged(); + } else { + parameterTypeBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder addParameterType( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { + if (parameterTypeBuilder_ == null) { + ensureParameterTypeIsMutable(); + parameterType_.add(builderForValue.build()); + onChanged(); + } else { + parameterTypeBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder addParameterType( + int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { + if (parameterTypeBuilder_ == null) { + ensureParameterTypeIsMutable(); + parameterType_.add(index, builderForValue.build()); + onChanged(); + } else { + parameterTypeBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder addAllParameterType( + java.lang.Iterable values) { + if (parameterTypeBuilder_ == null) { + ensureParameterTypeIsMutable(); + super.addAll(values, parameterType_); + onChanged(); + } else { + parameterTypeBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder clearParameterType() { + if (parameterTypeBuilder_ == null) { + parameterType_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000004); + onChanged(); + } else { + parameterTypeBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public Builder removeParameterType(int index) { + if (parameterTypeBuilder_ == null) { + ensureParameterTypeIsMutable(); + parameterType_.remove(index); + onChanged(); + } else { + parameterTypeBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getParameterTypeBuilder( + int index) { + return getParameterTypeFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder( + int index) { + if (parameterTypeBuilder_ == null) { + return parameterType_.get(index); } else { + return parameterTypeBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public java.util.List + getParameterTypeOrBuilderList() { + if (parameterTypeBuilder_ != null) { + return parameterTypeBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(parameterType_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder addParameterTypeBuilder() { + return getParameterTypeFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder addParameterTypeBuilder( + int index) { + return getParameterTypeFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; + */ + public java.util.List + getParameterTypeBuilderList() { + return getParameterTypeFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> + getParameterTypeFieldBuilder() { + if (parameterTypeBuilder_ == null) { + parameterTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>( + parameterType_, + ((bitField0_ & 0x00000004) == 0x00000004), + getParentForChildren(), + isClean()); + parameterType_ = null; + } + return parameterTypeBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaMethodSignature) + } + + static { + defaultInstance = new JavaMethodSignature(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaMethodSignature) + } + + public interface JavaFieldSignatureOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // required int32 name = 1; + /** + * required int32 name = 1; + */ + boolean hasName(); + /** + * required int32 name = 1; + */ + int getName(); + + // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + boolean hasType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder(); + + // optional bool is_static_in_outer = 3 [default = false]; + /** + * optional bool is_static_in_outer = 3 [default = false]; + * + * 
+     * True iff this field is a backing field for a class object and is really present as a static
+     * field in the outer class, not as an instance field here
+     *
+ */ + boolean hasIsStaticInOuter(); + /** + * optional bool is_static_in_outer = 3 [default = false]; + * + * 
+     * True iff this field is a backing field for a class object and is really present as a static
+     * field in the outer class, not as an instance field here
+     *
+ */ + boolean getIsStaticInOuter(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaFieldSignature} + */ + public static final class JavaFieldSignature extends + com.google.protobuf.GeneratedMessage + implements JavaFieldSignatureOrBuilder { + // Use JavaFieldSignature.newBuilder() to construct. + private JavaFieldSignature(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private JavaFieldSignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final JavaFieldSignature defaultInstance; + public static JavaFieldSignature getDefaultInstance() { + return defaultInstance; + } + + public JavaFieldSignature getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private JavaFieldSignature( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + name_ = input.readInt32(); + break; + } + case 18: { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = type_.toBuilder(); + } + type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(type_); + type_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000002; + break; + } + case 24: { + bitField0_ |= 0x00000004; + isStaticInOuter_ = input.readBool(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public JavaFieldSignature parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new JavaFieldSignature(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // required int32 name = 1; + public static final int NAME_FIELD_NUMBER = 1; + private int name_; + /** + * required int32 name = 1; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required int32 name = 1; + */ + public int getName() { + return name_; + } + + // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + public static final int TYPE_FIELD_NUMBER = 2; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType type_; + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType() { + return type_; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder() { + return type_; + } + + // optional bool is_static_in_outer = 3 [default = false]; + public static final int IS_STATIC_IN_OUTER_FIELD_NUMBER = 3; + private boolean isStaticInOuter_; + /** + * optional bool is_static_in_outer = 3 [default = false]; + * + * 
+     * True iff this field is a backing field for a class object and is really present as a static
+     * field in the outer class, not as an instance field here
+     *
+ */ + public boolean hasIsStaticInOuter() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bool is_static_in_outer = 3 [default = false]; + * + * 
+     * True iff this field is a backing field for a class object and is really present as a static
+     * field in the outer class, not as an instance field here
+     *
+ */ + public boolean getIsStaticInOuter() { + return isStaticInOuter_; + } + + private void initFields() { + name_ = 0; + type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + isStaticInOuter_ = false; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasName()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasType()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, name_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeMessage(2, type_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBool(3, isStaticInOuter_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, name_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, type_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(3, isStaticInOuter_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaFieldSignature} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getTypeFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + name_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + if (typeBuilder_ == null) { + type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + } else { + typeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + isStaticInOuter_ = false; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature build() { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.name_ = name_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + if (typeBuilder_ == null) { + result.type_ = type_; + } else { + result.type_ = typeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.isStaticInOuter_ = isStaticInOuter_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance()) return this; + if (other.hasName()) { + setName(other.getName()); + } + if (other.hasType()) { + mergeType(other.getType()); + } + if (other.hasIsStaticInOuter()) { + setIsStaticInOuter(other.getIsStaticInOuter()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasName()) { + + return false; + } + if (!hasType()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // required int32 name = 1; + private int name_ ; + /** + * required int32 name = 1; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required int32 name = 1; + */ + public int getName() { + return name_; + } + /** + * required int32 name = 1; + */ + public Builder setName(int value) { + bitField0_ |= 0x00000001; + name_ = value; + onChanged(); + return this; + } + /** + * required int32 name = 1; + */ + public Builder clearName() { + bitField0_ = (bitField0_ & ~0x00000001); + name_ = 0; + onChanged(); + return this; + } + + // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> typeBuilder_; + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType() { + if (typeBuilder_ == null) { + return type_; + } else { + return typeBuilder_.getMessage(); + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { + if (typeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + type_ = value; + onChanged(); + } else { + typeBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public Builder setType( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { + if (typeBuilder_ == null) { + type_ = builderForValue.build(); + onChanged(); + } else { + typeBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { + if (typeBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + type_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) { + type_ = + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder(type_).mergeFrom(value).buildPartial(); + } else { + type_ = value; + } + onChanged(); + } else { + typeBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public Builder clearType() { + if (typeBuilder_ == null) { + type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); + onChanged(); + } else { + typeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getTypeBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getTypeFieldBuilder().getBuilder(); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder() { + if (typeBuilder_ != null) { + return typeBuilder_.getMessageOrBuilder(); + } else { + return type_; + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> + getTypeFieldBuilder() { + if (typeBuilder_ == null) { + typeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>( + type_, + getParentForChildren(), + isClean()); + type_ = null; + } + return typeBuilder_; + } + + // optional bool is_static_in_outer = 3 [default = false]; + private boolean isStaticInOuter_ ; + /** + * optional bool is_static_in_outer = 3 [default = false]; + * + * 
+       * True iff this field is a backing field for a class object and is really present as a static
+       * field in the outer class, not as an instance field here
+       *
+ */ + public boolean hasIsStaticInOuter() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bool is_static_in_outer = 3 [default = false]; + * + * 
+       * True iff this field is a backing field for a class object and is really present as a static
+       * field in the outer class, not as an instance field here
+       *
+ */ + public boolean getIsStaticInOuter() { + return isStaticInOuter_; + } + /** + * optional bool is_static_in_outer = 3 [default = false]; + * + * 
+       * True iff this field is a backing field for a class object and is really present as a static
+       * field in the outer class, not as an instance field here
+       *
+ */ + public Builder setIsStaticInOuter(boolean value) { + bitField0_ |= 0x00000004; + isStaticInOuter_ = value; + onChanged(); + return this; + } + /** + * optional bool is_static_in_outer = 3 [default = false]; + * + * 
+       * True iff this field is a backing field for a class object and is really present as a static
+       * field in the outer class, not as an instance field here
+       *
+ */ + public Builder clearIsStaticInOuter() { + bitField0_ = (bitField0_ & ~0x00000004); + isStaticInOuter_ = false; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaFieldSignature) + } + + static { + defaultInstance = new JavaFieldSignature(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaFieldSignature) + } + + public interface JavaPropertySignatureOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+     * A property itself is identified either by the field, or by the synthetic method.
+     * If the property is annotated, then either field or synthetic_method should be present
+     *
+ */ + boolean hasField(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+     * A property itself is identified either by the field, or by the synthetic method.
+     * If the property is annotated, then either field or synthetic_method should be present
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+     * A property itself is identified either by the field, or by the synthetic method.
+     * If the property is annotated, then either field or synthetic_method should be present
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder(); + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+     * Annotations on properties without backing fields are written on a synthetic method with this signature
+     *
+ */ + boolean hasSyntheticMethod(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+     * Annotations on properties without backing fields are written on a synthetic method with this signature
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+     * Annotations on properties without backing fields are written on a synthetic method with this signature
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder(); + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + boolean hasGetter(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder(); + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + boolean hasSetter(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaPropertySignature} + */ + public static final class JavaPropertySignature extends + com.google.protobuf.GeneratedMessage + implements JavaPropertySignatureOrBuilder { + // Use JavaPropertySignature.newBuilder() to construct. + private JavaPropertySignature(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private JavaPropertySignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final JavaPropertySignature defaultInstance; + public static JavaPropertySignature getDefaultInstance() { + return defaultInstance; + } + + public JavaPropertySignature getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private JavaPropertySignature( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = field_.toBuilder(); + } + field_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(field_); + field_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 18: { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = syntheticMethod_.toBuilder(); + } + syntheticMethod_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(syntheticMethod_); + syntheticMethod_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000002; + break; + } + case 26: { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null; + if (((bitField0_ & 0x00000004) == 0x00000004)) { + subBuilder = getter_.toBuilder(); + } + getter_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(getter_); + getter_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000004; + break; + } + case 34: { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null; + if (((bitField0_ & 0x00000008) == 0x00000008)) { + subBuilder = setter_.toBuilder(); + } + setter_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(setter_); + setter_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000008; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public JavaPropertySignature parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new JavaPropertySignature(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + public static final int FIELD_FIELD_NUMBER = 1; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature field_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+     * A property itself is identified either by the field, or by the synthetic method.
+     * If the property is annotated, then either field or synthetic_method should be present
+     *
+ */ + public boolean hasField() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+     * A property itself is identified either by the field, or by the synthetic method.
+     * If the property is annotated, then either field or synthetic_method should be present
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField() { + return field_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+     * A property itself is identified either by the field, or by the synthetic method.
+     * If the property is annotated, then either field or synthetic_method should be present
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder() { + return field_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature syntheticMethod_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+     * Annotations on properties without backing fields are written on a synthetic method with this signature
+     *
+ */ + public boolean hasSyntheticMethod() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+     * Annotations on properties without backing fields are written on a synthetic method with this signature
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod() { + return syntheticMethod_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+     * Annotations on properties without backing fields are written on a synthetic method with this signature
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder() { + return syntheticMethod_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + public static final int GETTER_FIELD_NUMBER = 3; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getter_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public boolean hasGetter() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter() { + return getter_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder() { + return getter_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + public static final int SETTER_FIELD_NUMBER = 4; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature setter_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public boolean hasSetter() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter() { + return setter_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder() { + return setter_; + } + + private void initFields() { + field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); + syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (hasField()) { + if (!getField().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasSyntheticMethod()) { + if (!getSyntheticMethod().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasGetter()) { + if (!getGetter().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasSetter()) { + if (!getSetter().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, field_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeMessage(2, syntheticMethod_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeMessage(3, getter_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeMessage(4, setter_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, field_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, syntheticMethod_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, getter_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, setter_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaPropertySignature} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignatureOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getFieldFieldBuilder(); + getSyntheticMethodFieldBuilder(); + getGetterFieldBuilder(); + getSetterFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (fieldBuilder_ == null) { + field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); + } else { + fieldBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + if (syntheticMethodBuilder_ == null) { + syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + } else { + syntheticMethodBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + if (getterBuilder_ == null) { + getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + } else { + getterBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + if (setterBuilder_ == null) { + setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + } else { + setterBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature build() { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + if (fieldBuilder_ == null) { + result.field_ = field_; + } else { + result.field_ = fieldBuilder_.build(); + } + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + if (syntheticMethodBuilder_ == null) { + result.syntheticMethod_ = syntheticMethod_; + } else { + result.syntheticMethod_ = syntheticMethodBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + if (getterBuilder_ == null) { + result.getter_ = getter_; + } else { + result.getter_ = getterBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + if (setterBuilder_ == null) { + result.setter_ = setter_; + } else { + result.setter_ = setterBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance()) return this; + if (other.hasField()) { + mergeField(other.getField()); + } + if (other.hasSyntheticMethod()) { + mergeSyntheticMethod(other.getSyntheticMethod()); + } + if (other.hasGetter()) { + mergeGetter(other.getGetter()); + } + if (other.hasSetter()) { + mergeSetter(other.getSetter()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (hasField()) { + if (!getField().isInitialized()) { + + return false; + } + } + if (hasSyntheticMethod()) { + if (!getSyntheticMethod().isInitialized()) { + + return false; + } + } + if (hasGetter()) { + if (!getGetter().isInitialized()) { + + return false; + } + } + if (hasSetter()) { + if (!getSetter().isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder> fieldBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + public boolean hasField() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField() { + if (fieldBuilder_ == null) { + return field_; + } else { + return fieldBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + public Builder setField(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature value) { + if (fieldBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + field_ = value; + onChanged(); + } else { + fieldBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + public Builder setField( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder builderForValue) { + if (fieldBuilder_ == null) { + field_ = builderForValue.build(); + onChanged(); + } else { + fieldBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + public Builder mergeField(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature value) { + if (fieldBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + field_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance()) { + field_ = + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial(); + } else { + field_ = value; + } + onChanged(); + } else { + fieldBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + public Builder clearField() { + if (fieldBuilder_ == null) { + field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); + onChanged(); + } else { + fieldBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder getFieldBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getFieldFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder() { + if (fieldBuilder_ != null) { + return fieldBuilder_.getMessageOrBuilder(); + } else { + return field_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; + * + * 
+       * A property itself is identified either by the field, or by the synthetic method.
+       * If the property is annotated, then either field or synthetic_method should be present
+       *
+ */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder> + getFieldFieldBuilder() { + if (fieldBuilder_ == null) { + fieldBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder>( + field_, + getParentForChildren(), + isClean()); + field_ = null; + } + return fieldBuilder_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> syntheticMethodBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + public boolean hasSyntheticMethod() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod() { + if (syntheticMethodBuilder_ == null) { + return syntheticMethod_; + } else { + return syntheticMethodBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + public Builder setSyntheticMethod(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { + if (syntheticMethodBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + syntheticMethod_ = value; + onChanged(); + } else { + syntheticMethodBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + public Builder setSyntheticMethod( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) { + if (syntheticMethodBuilder_ == null) { + syntheticMethod_ = builderForValue.build(); + onChanged(); + } else { + syntheticMethodBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + public Builder mergeSyntheticMethod(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { + if (syntheticMethodBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + syntheticMethod_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) { + syntheticMethod_ = + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial(); + } else { + syntheticMethod_ = value; + } + onChanged(); + } else { + syntheticMethodBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + public Builder clearSyntheticMethod() { + if (syntheticMethodBuilder_ == null) { + syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + onChanged(); + } else { + syntheticMethodBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getSyntheticMethodBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getSyntheticMethodFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder() { + if (syntheticMethodBuilder_ != null) { + return syntheticMethodBuilder_.getMessageOrBuilder(); + } else { + return syntheticMethod_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; + * + * 
+       * Annotations on properties without backing fields are written on a synthetic method with this signature
+       *
+ */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> + getSyntheticMethodFieldBuilder() { + if (syntheticMethodBuilder_ == null) { + syntheticMethodBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>( + syntheticMethod_, + getParentForChildren(), + isClean()); + syntheticMethod_ = null; + } + return syntheticMethodBuilder_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> getterBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public boolean hasGetter() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter() { + if (getterBuilder_ == null) { + return getter_; + } else { + return getterBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public Builder setGetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { + if (getterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + getter_ = value; + onChanged(); + } else { + getterBuilder_.setMessage(value); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public Builder setGetter( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) { + if (getterBuilder_ == null) { + getter_ = builderForValue.build(); + onChanged(); + } else { + getterBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public Builder mergeGetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { + if (getterBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004) && + getter_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) { + getter_ = + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial(); + } else { + getter_ = value; + } + onChanged(); + } else { + getterBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public Builder clearGetter() { + if (getterBuilder_ == null) { + getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + onChanged(); + } else { + getterBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getGetterBuilder() { + bitField0_ |= 0x00000004; + onChanged(); + return getGetterFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder() { + if (getterBuilder_ != null) { + return getterBuilder_.getMessageOrBuilder(); + } else { + return getter_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> + getGetterFieldBuilder() { + if (getterBuilder_ == null) { + getterBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>( + getter_, + getParentForChildren(), + isClean()); + getter_ = null; + } + return getterBuilder_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> setterBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public boolean hasSetter() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter() { + if (setterBuilder_ == null) { + return setter_; + } else { + return setterBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public Builder setSetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { + if (setterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + setter_ = value; + onChanged(); + } else { + setterBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public Builder setSetter( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) { + if (setterBuilder_ == null) { + setter_ = builderForValue.build(); + onChanged(); + } else { + setterBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public Builder mergeSetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { + if (setterBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008) && + setter_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) { + setter_ = + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial(); + } else { + setter_ = value; + } + onChanged(); + } else { + setterBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public Builder clearSetter() { + if (setterBuilder_ == null) { + setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); + onChanged(); + } else { + setterBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getSetterBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getSetterFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder() { + if (setterBuilder_ != null) { + return setterBuilder_.getMessageOrBuilder(); + } else { + return setter_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> + getSetterFieldBuilder() { + if (setterBuilder_ == null) { + setterBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>( + setter_, + getParentForChildren(), + isClean()); + setter_ = null; + } + return setterBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaPropertySignature) + } + + static { + defaultInstance = new JavaPropertySignature(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaPropertySignature) + } + + public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100; + /** + * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... } + */ + public static final + com.google.protobuf.GeneratedMessage.GeneratedExtension< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature> methodSignature = com.google.protobuf.GeneratedMessage + .newFileScopedGeneratedExtension( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class, + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()); + public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 101; + /** + * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... } + */ + public static final + com.google.protobuf.GeneratedMessage.GeneratedExtension< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature> propertySignature = com.google.protobuf.GeneratedMessage + .newFileScopedGeneratedExtension( + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class, + org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance()); + public static final int IMPL_CLASS_NAME_FIELD_NUMBER = 102; + /** + * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... } + */ + public static final + com.google.protobuf.GeneratedMessage.GeneratedExtension< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, + java.lang.Integer> implClassName = com.google.protobuf.GeneratedMessage + .newFileScopedGeneratedExtension( + java.lang.Integer.class, + null); + public static final int INDEX_FIELD_NUMBER = 100; + /** + * extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... } + */ + public static final + com.google.protobuf.GeneratedMessage.GeneratedExtension< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, + java.lang.Integer> index = com.google.protobuf.GeneratedMessage + .newFileScopedGeneratedExtension( + java.lang.Integer.class, + null); + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n8core/serialization.java/src/java_descr" + + "iptors.debug.proto\022+org.jetbrains.jet.de" + + "scriptors.serialization\032;compiler/fronte" + + "nd/serialization/src/descriptors.debug.p" + + "roto\"\213\002\n\010JavaType\022[\n\016primitive_type\030\001 \001(" + + "\0162C.org.jetbrains.jet.descriptors.serial" + + "ization.JavaType.PrimitiveType\022\025\n\rclass_" + + "fq_name\030\002 \001(\005\022\032\n\017array_dimension\030\003 \001(\005:\001" + + "0\"o\n\rPrimitiveType\022\010\n\004VOID\020\000\022\013\n\007BOOLEAN\020" + + "\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020", + "\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007\022\n\n\006DOUBLE\020\010\"\276\001\n\023J" + + "avaMethodSignature\022\014\n\004name\030\001 \002(\005\022J\n\013retu" + + "rn_type\030\002 \002(\01325.org.jetbrains.jet.descri" + + "ptors.serialization.JavaType\022M\n\016paramete" + + "r_type\030\003 \003(\01325.org.jetbrains.jet.descrip" + + "tors.serialization.JavaType\"\212\001\n\022JavaFiel" + + "dSignature\022\014\n\004name\030\001 \002(\005\022C\n\004type\030\002 \002(\01325" + + ".org.jetbrains.jet.descriptors.serializa" + + "tion.JavaType\022!\n\022is_static_in_outer\030\003 \001(" + + "\010:\005false\"\347\002\n\025JavaPropertySignature\022N\n\005fi", + "eld\030\001 \001(\0132?.org.jetbrains.jet.descriptor" + + "s.serialization.JavaFieldSignature\022Z\n\020sy" + + "nthetic_method\030\002 \001(\0132@.org.jetbrains.jet" + + ".descriptors.serialization.JavaMethodSig" + + "nature\022P\n\006getter\030\003 \001(\0132@.org.jetbrains.j" + + "et.descriptors.serialization.JavaMethodS" + + "ignature\022P\n\006setter\030\004 \001(\0132@.org.jetbrains" + + ".jet.descriptors.serialization.JavaMetho" + + "dSignature:\221\001\n\020method_signature\0225.org.je" + + "tbrains.jet.descriptors.serialization.Ca", + "llable\030d \001(\0132@.org.jetbrains.jet.descrip" + + "tors.serialization.JavaMethodSignature:\225" + + "\001\n\022property_signature\0225.org.jetbrains.je" + + "t.descriptors.serialization.Callable\030e \001" + + "(\0132B.org.jetbrains.jet.descriptors.seria" + + "lization.JavaPropertySignature:N\n\017impl_c" + + "lass_name\0225.org.jetbrains.jet.descriptor" + + "s.serialization.Callable\030f \001(\005:S\n\005index\022" + + "D.org.jetbrains.jet.descriptors.serializ" + + "ation.Callable.ValueParameter\030d \001(\005B\023B\021D", + "ebugJavaProtoBuf" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor, + new java.lang.String[] { "PrimitiveType", "ClassFqName", "ArrayDimension", }); + internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor, + new java.lang.String[] { "Name", "ReturnType", "ParameterType", }); + internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor, + new java.lang.String[] { "Name", "Type", "IsStaticInOuter", }); + internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor, + new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", }); + methodSignature.internalInit(descriptor.getExtensions().get(0)); + propertySignature.internalInit(descriptor.getExtensions().get(1)); + implClassName.internalInit(descriptor.getExtensions().get(2)); + index.internalInit(descriptor.getExtensions().get(3)); + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor(), + }, assigner); + } + + // @@protoc_insertion_point(outer_class_scope) +} diff --git a/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java b/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java new file mode 100644 index 00000000000..a9eca1a0f22 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java @@ -0,0 +1,14006 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: compiler/frontend/serialization/src/descriptors.debug.proto + +package org.jetbrains.jet.descriptors.serialization; + +public final class DebugProtoBuf { + private DebugProtoBuf() {} + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + } + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Modality} + */ + public enum Modality + implements com.google.protobuf.ProtocolMessageEnum { + /** + * FINAL = 0; + * + * 
+     * 2 bits
+     *
+ */ + FINAL(0, 0), + /** + * OPEN = 1; + */ + OPEN(1, 1), + /** + * ABSTRACT = 2; + */ + ABSTRACT(2, 2), + ; + + /** + * FINAL = 0; + * + * 
+     * 2 bits
+     *
+ */ + public static final int FINAL_VALUE = 0; + /** + * OPEN = 1; + */ + public static final int OPEN_VALUE = 1; + /** + * ABSTRACT = 2; + */ + public static final int ABSTRACT_VALUE = 2; + + + public final int getNumber() { return value; } + + public static Modality valueOf(int value) { + switch (value) { + case 0: return FINAL; + case 1: return OPEN; + case 2: return ABSTRACT; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Modality findValueByNumber(int number) { + return Modality.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(0); + } + + private static final Modality[] VALUES = values(); + + public static Modality valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Modality(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Modality) + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Visibility} + */ + public enum Visibility + implements com.google.protobuf.ProtocolMessageEnum { + /** + * INTERNAL = 0; + * + * 
+     * 3 bits
+     *
+ */ + INTERNAL(0, 0), + /** + * PRIVATE = 1; + */ + PRIVATE(1, 1), + /** + * PROTECTED = 2; + */ + PROTECTED(2, 2), + /** + * PUBLIC = 3; + */ + PUBLIC(3, 3), + /** + * EXTRA = 4; + * + * 
+     * there's an extra field for the actual visibility
+     *
+ */ + EXTRA(4, 4), + ; + + /** + * INTERNAL = 0; + * + * 
+     * 3 bits
+     *
+ */ + public static final int INTERNAL_VALUE = 0; + /** + * PRIVATE = 1; + */ + public static final int PRIVATE_VALUE = 1; + /** + * PROTECTED = 2; + */ + public static final int PROTECTED_VALUE = 2; + /** + * PUBLIC = 3; + */ + public static final int PUBLIC_VALUE = 3; + /** + * EXTRA = 4; + * + * 
+     * there's an extra field for the actual visibility
+     *
+ */ + public static final int EXTRA_VALUE = 4; + + + public final int getNumber() { return value; } + + public static Visibility valueOf(int value) { + switch (value) { + case 0: return INTERNAL; + case 1: return PRIVATE; + case 2: return PROTECTED; + case 3: return PUBLIC; + case 4: return EXTRA; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Visibility findValueByNumber(int number) { + return Visibility.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(1); + } + + private static final Visibility[] VALUES = values(); + + public static Visibility valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Visibility(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Visibility) + } + + public interface SimpleNameTableOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // repeated string name = 1; + /** + * repeated string name = 1; + */ + java.util.List + getNameList(); + /** + * repeated string name = 1; + */ + int getNameCount(); + /** + * repeated string name = 1; + */ + java.lang.String getName(int index); + /** + * repeated string name = 1; + */ + com.google.protobuf.ByteString + getNameBytes(int index); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.SimpleNameTable} + */ + public static final class SimpleNameTable extends + com.google.protobuf.GeneratedMessage + implements SimpleNameTableOrBuilder { + // Use SimpleNameTable.newBuilder() to construct. + private SimpleNameTable(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private SimpleNameTable(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final SimpleNameTable defaultInstance; + public static SimpleNameTable getDefaultInstance() { + return defaultInstance; + } + + public SimpleNameTable getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private SimpleNameTable( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + name_ = new com.google.protobuf.LazyStringArrayList(); + mutable_bitField0_ |= 0x00000001; + } + name_.add(input.readBytes()); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + name_ = new com.google.protobuf.UnmodifiableLazyStringList(name_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public SimpleNameTable parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new SimpleNameTable(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + // repeated string name = 1; + public static final int NAME_FIELD_NUMBER = 1; + private com.google.protobuf.LazyStringList name_; + /** + * repeated string name = 1; + */ + public java.util.List + getNameList() { + return name_; + } + /** + * repeated string name = 1; + */ + public int getNameCount() { + return name_.size(); + } + /** + * repeated string name = 1; + */ + public java.lang.String getName(int index) { + return name_.get(index); + } + /** + * repeated string name = 1; + */ + public com.google.protobuf.ByteString + getNameBytes(int index) { + return name_.getByteString(index); + } + + private void initFields() { + name_ = com.google.protobuf.LazyStringArrayList.EMPTY; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + for (int i = 0; i < name_.size(); i++) { + output.writeBytes(1, name_.getByteString(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + { + int dataSize = 0; + for (int i = 0; i < name_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeBytesSizeNoTag(name_.getByteString(i)); + } + size += dataSize; + size += 1 * getNameList().size(); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.SimpleNameTable} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTableOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + name_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable(this); + int from_bitField0_ = bitField0_; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + name_ = new com.google.protobuf.UnmodifiableLazyStringList( + name_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.name_ = name_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.getDefaultInstance()) return this; + if (!other.name_.isEmpty()) { + if (name_.isEmpty()) { + name_ = other.name_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureNameIsMutable(); + name_.addAll(other.name_); + } + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // repeated string name = 1; + private com.google.protobuf.LazyStringList name_ = com.google.protobuf.LazyStringArrayList.EMPTY; + private void ensureNameIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + name_ = new com.google.protobuf.LazyStringArrayList(name_); + bitField0_ |= 0x00000001; + } + } + /** + * repeated string name = 1; + */ + public java.util.List + getNameList() { + return java.util.Collections.unmodifiableList(name_); + } + /** + * repeated string name = 1; + */ + public int getNameCount() { + return name_.size(); + } + /** + * repeated string name = 1; + */ + public java.lang.String getName(int index) { + return name_.get(index); + } + /** + * repeated string name = 1; + */ + public com.google.protobuf.ByteString + getNameBytes(int index) { + return name_.getByteString(index); + } + /** + * repeated string name = 1; + */ + public Builder setName( + int index, java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureNameIsMutable(); + name_.set(index, value); + onChanged(); + return this; + } + /** + * repeated string name = 1; + */ + public Builder addName( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + ensureNameIsMutable(); + name_.add(value); + onChanged(); + return this; + } + /** + * repeated string name = 1; + */ + public Builder addAllName( + java.lang.Iterable values) { + ensureNameIsMutable(); + super.addAll(values, name_); + onChanged(); + return this; + } + /** + * repeated string name = 1; + */ + public Builder clearName() { + name_ = com.google.protobuf.LazyStringArrayList.EMPTY; + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + return this; + } + /** + * repeated string name = 1; + */ + public Builder addNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + ensureNameIsMutable(); + name_.add(value); + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.SimpleNameTable) + } + + static { + defaultInstance = new SimpleNameTable(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.SimpleNameTable) + } + + public interface QualifiedNameTableOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + java.util.List + getQualifiedNameList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + int getQualifiedNameCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + java.util.List + getQualifiedNameOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + int index); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable} + */ + public static final class QualifiedNameTable extends + com.google.protobuf.GeneratedMessage + implements QualifiedNameTableOrBuilder { + // Use QualifiedNameTable.newBuilder() to construct. + private QualifiedNameTable(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private QualifiedNameTable(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final QualifiedNameTable defaultInstance; + public static QualifiedNameTable getDefaultInstance() { + return defaultInstance; + } + + public QualifiedNameTable getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private QualifiedNameTable( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + qualifiedName_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + qualifiedName_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + qualifiedName_ = java.util.Collections.unmodifiableList(qualifiedName_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public QualifiedNameTable parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new QualifiedNameTable(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public interface QualifiedNameOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 parent_qualified_name = 1 [default = -1]; + /** + * optional int32 parent_qualified_name = 1 [default = -1]; + */ + boolean hasParentQualifiedName(); + /** + * optional int32 parent_qualified_name = 1 [default = -1]; + */ + int getParentQualifiedName(); + + // required int32 short_name = 2; + /** + * required int32 short_name = 2; + */ + boolean hasShortName(); + /** + * required int32 short_name = 2; + */ + int getShortName(); + + // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + /** + * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + */ + boolean hasKind(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName} + */ + public static final class QualifiedName extends + com.google.protobuf.GeneratedMessage + implements QualifiedNameOrBuilder { + // Use QualifiedName.newBuilder() to construct. + private QualifiedName(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private QualifiedName(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final QualifiedName defaultInstance; + public static QualifiedName getDefaultInstance() { + return defaultInstance; + } + + public QualifiedName getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private QualifiedName( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + parentQualifiedName_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + shortName_ = input.readInt32(); + break; + } + case 24: { + int rawValue = input.readEnum(); + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(3, rawValue); + } else { + bitField0_ |= 0x00000004; + kind_ = value; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public QualifiedName parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new QualifiedName(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind} + */ + public enum Kind + implements com.google.protobuf.ProtocolMessageEnum { + /** + * CLASS = 0; + */ + CLASS(0, 0), + /** + * PACKAGE = 1; + */ + PACKAGE(1, 1), + ; + + /** + * CLASS = 0; + */ + public static final int CLASS_VALUE = 0; + /** + * PACKAGE = 1; + */ + public static final int PACKAGE_VALUE = 1; + + + public final int getNumber() { return value; } + + public static Kind valueOf(int value) { + switch (value) { + case 0: return CLASS; + case 1: return PACKAGE; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Kind findValueByNumber(int number) { + return Kind.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDescriptor().getEnumTypes().get(0); + } + + private static final Kind[] VALUES = values(); + + public static Kind valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Kind(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind) + } + + private int bitField0_; + // optional int32 parent_qualified_name = 1 [default = -1]; + public static final int PARENT_QUALIFIED_NAME_FIELD_NUMBER = 1; + private int parentQualifiedName_; + /** + * optional int32 parent_qualified_name = 1 [default = -1]; + */ + public boolean hasParentQualifiedName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 parent_qualified_name = 1 [default = -1]; + */ + public int getParentQualifiedName() { + return parentQualifiedName_; + } + + // required int32 short_name = 2; + public static final int SHORT_NAME_FIELD_NUMBER = 2; + private int shortName_; + /** + * required int32 short_name = 2; + */ + public boolean hasShortName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 short_name = 2; + */ + public int getShortName() { + return shortName_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + public static final int KIND_FIELD_NUMBER = 3; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + */ + public boolean hasKind() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { + return kind_; + } + + private void initFields() { + parentQualifiedName_ = -1; + shortName_ = 0; + kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasShortName()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, parentQualifiedName_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, shortName_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeEnum(3, kind_.getNumber()); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, parentQualifiedName_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, shortName_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(3, kind_.getNumber()); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + parentQualifiedName_ = -1; + bitField0_ = (bitField0_ & ~0x00000001); + shortName_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.parentQualifiedName_ = parentQualifiedName_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.shortName_ = shortName_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.kind_ = kind_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this; + if (other.hasParentQualifiedName()) { + setParentQualifiedName(other.getParentQualifiedName()); + } + if (other.hasShortName()) { + setShortName(other.getShortName()); + } + if (other.hasKind()) { + setKind(other.getKind()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasShortName()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 parent_qualified_name = 1 [default = -1]; + private int parentQualifiedName_ = -1; + /** + * optional int32 parent_qualified_name = 1 [default = -1]; + */ + public boolean hasParentQualifiedName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 parent_qualified_name = 1 [default = -1]; + */ + public int getParentQualifiedName() { + return parentQualifiedName_; + } + /** + * optional int32 parent_qualified_name = 1 [default = -1]; + */ + public Builder setParentQualifiedName(int value) { + bitField0_ |= 0x00000001; + parentQualifiedName_ = value; + onChanged(); + return this; + } + /** + * optional int32 parent_qualified_name = 1 [default = -1]; + */ + public Builder clearParentQualifiedName() { + bitField0_ = (bitField0_ & ~0x00000001); + parentQualifiedName_ = -1; + onChanged(); + return this; + } + + // required int32 short_name = 2; + private int shortName_ ; + /** + * required int32 short_name = 2; + */ + public boolean hasShortName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 short_name = 2; + */ + public int getShortName() { + return shortName_; + } + /** + * required int32 short_name = 2; + */ + public Builder setShortName(int value) { + bitField0_ |= 0x00000002; + shortName_ = value; + onChanged(); + return this; + } + /** + * required int32 short_name = 2; + */ + public Builder clearShortName() { + bitField0_ = (bitField0_ & ~0x00000002); + shortName_ = 0; + onChanged(); + return this; + } + + // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + /** + * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + */ + public boolean hasKind() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { + return kind_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + */ + public Builder setKind(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000004; + kind_ = value; + onChanged(); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; + */ + public Builder clearKind() { + bitField0_ = (bitField0_ & ~0x00000004); + kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName) + } + + static { + defaultInstance = new QualifiedName(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName) + } + + // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + public static final int QUALIFIED_NAME_FIELD_NUMBER = 1; + private java.util.List qualifiedName_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public java.util.List getQualifiedNameList() { + return qualifiedName_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public java.util.List + getQualifiedNameOrBuilderList() { + return qualifiedName_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public int getQualifiedNameCount() { + return qualifiedName_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { + return qualifiedName_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + int index) { + return qualifiedName_.get(index); + } + + private void initFields() { + qualifiedName_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + for (int i = 0; i < getQualifiedNameCount(); i++) { + if (!getQualifiedName(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + for (int i = 0; i < qualifiedName_.size(); i++) { + output.writeMessage(1, qualifiedName_.get(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < qualifiedName_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, qualifiedName_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getQualifiedNameFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (qualifiedNameBuilder_ == null) { + qualifiedName_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + qualifiedNameBuilder_.clear(); + } + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable(this); + int from_bitField0_ = bitField0_; + if (qualifiedNameBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + qualifiedName_ = java.util.Collections.unmodifiableList(qualifiedName_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.qualifiedName_ = qualifiedName_; + } else { + result.qualifiedName_ = qualifiedNameBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) return this; + if (qualifiedNameBuilder_ == null) { + if (!other.qualifiedName_.isEmpty()) { + if (qualifiedName_.isEmpty()) { + qualifiedName_ = other.qualifiedName_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureQualifiedNameIsMutable(); + qualifiedName_.addAll(other.qualifiedName_); + } + onChanged(); + } + } else { + if (!other.qualifiedName_.isEmpty()) { + if (qualifiedNameBuilder_.isEmpty()) { + qualifiedNameBuilder_.dispose(); + qualifiedNameBuilder_ = null; + qualifiedName_ = other.qualifiedName_; + bitField0_ = (bitField0_ & ~0x00000001); + qualifiedNameBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getQualifiedNameFieldBuilder() : null; + } else { + qualifiedNameBuilder_.addAllMessages(other.qualifiedName_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + for (int i = 0; i < getQualifiedNameCount(); i++) { + if (!getQualifiedName(i).isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + private java.util.List qualifiedName_ = + java.util.Collections.emptyList(); + private void ensureQualifiedNameIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + qualifiedName_ = new java.util.ArrayList(qualifiedName_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> qualifiedNameBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public java.util.List getQualifiedNameList() { + if (qualifiedNameBuilder_ == null) { + return java.util.Collections.unmodifiableList(qualifiedName_); + } else { + return qualifiedNameBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public int getQualifiedNameCount() { + if (qualifiedNameBuilder_ == null) { + return qualifiedName_.size(); + } else { + return qualifiedNameBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { + if (qualifiedNameBuilder_ == null) { + return qualifiedName_.get(index); + } else { + return qualifiedNameBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder setQualifiedName( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + if (qualifiedNameBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureQualifiedNameIsMutable(); + qualifiedName_.set(index, value); + onChanged(); + } else { + qualifiedNameBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder setQualifiedName( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + if (qualifiedNameBuilder_ == null) { + ensureQualifiedNameIsMutable(); + qualifiedName_.set(index, builderForValue.build()); + onChanged(); + } else { + qualifiedNameBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder addQualifiedName(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + if (qualifiedNameBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureQualifiedNameIsMutable(); + qualifiedName_.add(value); + onChanged(); + } else { + qualifiedNameBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder addQualifiedName( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { + if (qualifiedNameBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureQualifiedNameIsMutable(); + qualifiedName_.add(index, value); + onChanged(); + } else { + qualifiedNameBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder addQualifiedName( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + if (qualifiedNameBuilder_ == null) { + ensureQualifiedNameIsMutable(); + qualifiedName_.add(builderForValue.build()); + onChanged(); + } else { + qualifiedNameBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder addQualifiedName( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { + if (qualifiedNameBuilder_ == null) { + ensureQualifiedNameIsMutable(); + qualifiedName_.add(index, builderForValue.build()); + onChanged(); + } else { + qualifiedNameBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder addAllQualifiedName( + java.lang.Iterable values) { + if (qualifiedNameBuilder_ == null) { + ensureQualifiedNameIsMutable(); + super.addAll(values, qualifiedName_); + onChanged(); + } else { + qualifiedNameBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder clearQualifiedName() { + if (qualifiedNameBuilder_ == null) { + qualifiedName_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + qualifiedNameBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public Builder removeQualifiedName(int index) { + if (qualifiedNameBuilder_ == null) { + ensureQualifiedNameIsMutable(); + qualifiedName_.remove(index); + onChanged(); + } else { + qualifiedNameBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder getQualifiedNameBuilder( + int index) { + return getQualifiedNameFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( + int index) { + if (qualifiedNameBuilder_ == null) { + return qualifiedName_.get(index); } else { + return qualifiedNameBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public java.util.List + getQualifiedNameOrBuilderList() { + if (qualifiedNameBuilder_ != null) { + return qualifiedNameBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(qualifiedName_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder() { + return getQualifiedNameFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder( + int index) { + return getQualifiedNameFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; + */ + public java.util.List + getQualifiedNameBuilderList() { + return getQualifiedNameFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> + getQualifiedNameFieldBuilder() { + if (qualifiedNameBuilder_ == null) { + qualifiedNameBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder>( + qualifiedName_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + qualifiedName_ = null; + } + return qualifiedNameBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable) + } + + static { + defaultInstance = new QualifiedNameTable(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable) + } + + public interface TypeOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + boolean hasConstructor(); + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor(); + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder(); + + // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + java.util.List + getArgumentList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + int getArgumentCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + java.util.List + getArgumentOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder( + int index); + + // optional bool nullable = 3 [default = false]; + /** + * optional bool nullable = 3 [default = false]; + */ + boolean hasNullable(); + /** + * optional bool nullable = 3 [default = false]; + */ + boolean getNullable(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type} + */ + public static final class Type extends + com.google.protobuf.GeneratedMessage + implements TypeOrBuilder { + // Use Type.newBuilder() to construct. + private Type(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private Type(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final Type defaultInstance; + public static Type getDefaultInstance() { + return defaultInstance; + } + + public Type getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Type( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = constructor_.toBuilder(); + } + constructor_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(constructor_); + constructor_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + argument_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000002; + } + argument_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.PARSER, extensionRegistry)); + break; + } + case 24: { + bitField0_ |= 0x00000002; + nullable_ = input.readBool(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + argument_ = java.util.Collections.unmodifiableList(argument_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public Type parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Type(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + public interface ConstructorOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + */ + boolean hasKind(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind(); + + // required int32 id = 2; + /** + * required int32 id = 2; + * + * 
+       * CLASS - fqName id, TYPE_PARAMETER - type parameter id
+       *
+ */ + boolean hasId(); + /** + * required int32 id = 2; + * + * 
+       * CLASS - fqName id, TYPE_PARAMETER - type parameter id
+       *
+ */ + int getId(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor} + */ + public static final class Constructor extends + com.google.protobuf.GeneratedMessage + implements ConstructorOrBuilder { + // Use Constructor.newBuilder() to construct. + private Constructor(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private Constructor(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final Constructor defaultInstance; + public static Constructor getDefaultInstance() { + return defaultInstance; + } + + public Constructor getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Constructor( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + kind_ = value; + } + break; + } + case 16: { + bitField0_ |= 0x00000002; + id_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public Constructor parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Constructor(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind} + */ + public enum Kind + implements com.google.protobuf.ProtocolMessageEnum { + /** + * CLASS = 0; + */ + CLASS(0, 0), + /** + * TYPE_PARAMETER = 1; + */ + TYPE_PARAMETER(1, 1), + ; + + /** + * CLASS = 0; + */ + public static final int CLASS_VALUE = 0; + /** + * TYPE_PARAMETER = 1; + */ + public static final int TYPE_PARAMETER_VALUE = 1; + + + public final int getNumber() { return value; } + + public static Kind valueOf(int value) { + switch (value) { + case 0: return CLASS; + case 1: return TYPE_PARAMETER; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Kind findValueByNumber(int number) { + return Kind.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDescriptor().getEnumTypes().get(0); + } + + private static final Kind[] VALUES = values(); + + public static Kind valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Kind(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind) + } + + private int bitField0_; + // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + public static final int KIND_FIELD_NUMBER = 1; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind kind_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + */ + public boolean hasKind() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind() { + return kind_; + } + + // required int32 id = 2; + public static final int ID_FIELD_NUMBER = 2; + private int id_; + /** + * required int32 id = 2; + * + * 
+       * CLASS - fqName id, TYPE_PARAMETER - type parameter id
+       *
+ */ + public boolean hasId() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 id = 2; + * + * 
+       * CLASS - fqName id, TYPE_PARAMETER - type parameter id
+       *
+ */ + public int getId() { + return id_; + } + + private void initFields() { + kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS; + id_ = 0; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasId()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeEnum(1, kind_.getNumber()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, id_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, kind_.getNumber()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, id_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS; + bitField0_ = (bitField0_ & ~0x00000001); + id_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.kind_ = kind_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.id_ = id_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance()) return this; + if (other.hasKind()) { + setKind(other.getKind()); + } + if (other.hasId()) { + setId(other.getId()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasId()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + */ + public boolean hasKind() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind() { + return kind_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + */ + public Builder setKind(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + kind_ = value; + onChanged(); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; + */ + public Builder clearKind() { + bitField0_ = (bitField0_ & ~0x00000001); + kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS; + onChanged(); + return this; + } + + // required int32 id = 2; + private int id_ ; + /** + * required int32 id = 2; + * + * 
+         * CLASS - fqName id, TYPE_PARAMETER - type parameter id
+         *
+ */ + public boolean hasId() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 id = 2; + * + * 
+         * CLASS - fqName id, TYPE_PARAMETER - type parameter id
+         *
+ */ + public int getId() { + return id_; + } + /** + * required int32 id = 2; + * + * 
+         * CLASS - fqName id, TYPE_PARAMETER - type parameter id
+         *
+ */ + public Builder setId(int value) { + bitField0_ |= 0x00000002; + id_ = value; + onChanged(); + return this; + } + /** + * required int32 id = 2; + * + * 
+         * CLASS - fqName id, TYPE_PARAMETER - type parameter id
+         *
+ */ + public Builder clearId() { + bitField0_ = (bitField0_ & ~0x00000002); + id_ = 0; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor) + } + + static { + defaultInstance = new Constructor(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor) + } + + public interface ArgumentOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + */ + boolean hasProjection(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection(); + + // required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + boolean hasType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Argument} + */ + public static final class Argument extends + com.google.protobuf.GeneratedMessage + implements ArgumentOrBuilder { + // Use Argument.newBuilder() to construct. + private Argument(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private Argument(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final Argument defaultInstance; + public static Argument getDefaultInstance() { + return defaultInstance; + } + + public Argument getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Argument( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + int rawValue = input.readEnum(); + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(1, rawValue); + } else { + bitField0_ |= 0x00000001; + projection_ = value; + } + break; + } + case 18: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = type_.toBuilder(); + } + type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(type_); + type_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000002; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public Argument parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Argument(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection} + */ + public enum Projection + implements com.google.protobuf.ProtocolMessageEnum { + /** + * IN = 0; + */ + IN(0, 0), + /** + * OUT = 1; + */ + OUT(1, 1), + /** + * INV = 2; + */ + INV(2, 2), + ; + + /** + * IN = 0; + */ + public static final int IN_VALUE = 0; + /** + * OUT = 1; + */ + public static final int OUT_VALUE = 1; + /** + * INV = 2; + */ + public static final int INV_VALUE = 2; + + + public final int getNumber() { return value; } + + public static Projection valueOf(int value) { + switch (value) { + case 0: return IN; + case 1: return OUT; + case 2: return INV; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Projection findValueByNumber(int number) { + return Projection.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDescriptor().getEnumTypes().get(0); + } + + private static final Projection[] VALUES = values(); + + public static Projection valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Projection(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection) + } + + private int bitField0_; + // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + public static final int PROJECTION_FIELD_NUMBER = 1; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection projection_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + */ + public boolean hasProjection() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() { + return projection_; + } + + // required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + public static final int TYPE_FIELD_NUMBER = 2; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() { + return type_; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() { + return type_; + } + + private void initFields() { + projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV; + type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasType()) { + memoizedIsInitialized = 0; + return false; + } + if (!getType().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeEnum(1, projection_.getNumber()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeMessage(2, type_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(1, projection_.getNumber()); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, type_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Argument} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getTypeFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV; + bitField0_ = (bitField0_ & ~0x00000001); + if (typeBuilder_ == null) { + type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } else { + typeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.projection_ = projection_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + if (typeBuilder_ == null) { + result.type_ = type_; + } else { + result.type_ = typeBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()) return this; + if (other.hasProjection()) { + setProjection(other.getProjection()); + } + if (other.hasType()) { + mergeType(other.getType()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasType()) { + + return false; + } + if (!getType().isInitialized()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + */ + public boolean hasProjection() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() { + return projection_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + */ + public Builder setProjection(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000001; + projection_ = value; + onChanged(); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; + */ + public Builder clearProjection() { + bitField0_ = (bitField0_ & ~0x00000001); + projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV; + onChanged(); + return this; + } + + // required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() { + if (typeBuilder_ == null) { + return type_; + } else { + return typeBuilder_.getMessage(); + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (typeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + type_ = value; + onChanged(); + } else { + typeBuilder_.setMessage(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public Builder setType( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (typeBuilder_ == null) { + type_ = builderForValue.build(); + onChanged(); + } else { + typeBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (typeBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002) && + type_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { + type_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial(); + } else { + type_ = value; + } + onChanged(); + } else { + typeBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000002; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public Builder clearType() { + if (typeBuilder_ == null) { + type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + onChanged(); + } else { + typeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() { + bitField0_ |= 0x00000002; + onChanged(); + return getTypeFieldBuilder().getBuilder(); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() { + if (typeBuilder_ != null) { + return typeBuilder_.getMessageOrBuilder(); + } else { + return type_; + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> + getTypeFieldBuilder() { + if (typeBuilder_ == null) { + typeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( + type_, + getParentForChildren(), + isClean()); + type_ = null; + } + return typeBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument) + } + + static { + defaultInstance = new Argument(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument) + } + + private int bitField0_; + // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + public static final int CONSTRUCTOR_FIELD_NUMBER = 1; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor constructor_; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public boolean hasConstructor() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor() { + return constructor_; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder() { + return constructor_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + public static final int ARGUMENT_FIELD_NUMBER = 2; + private java.util.List argument_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public java.util.List getArgumentList() { + return argument_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public java.util.List + getArgumentOrBuilderList() { + return argument_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public int getArgumentCount() { + return argument_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index) { + return argument_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder( + int index) { + return argument_.get(index); + } + + // optional bool nullable = 3 [default = false]; + public static final int NULLABLE_FIELD_NUMBER = 3; + private boolean nullable_; + /** + * optional bool nullable = 3 [default = false]; + */ + public boolean hasNullable() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional bool nullable = 3 [default = false]; + */ + public boolean getNullable() { + return nullable_; + } + + private void initFields() { + constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); + argument_ = java.util.Collections.emptyList(); + nullable_ = false; + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasConstructor()) { + memoizedIsInitialized = 0; + return false; + } + if (!getConstructor().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + for (int i = 0; i < getArgumentCount(); i++) { + if (!getArgument(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, constructor_); + } + for (int i = 0; i < argument_.size(); i++) { + output.writeMessage(2, argument_.get(i)); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBool(3, nullable_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, constructor_); + } + for (int i = 0; i < argument_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, argument_.get(i)); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(3, nullable_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getConstructorFieldBuilder(); + getArgumentFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (constructorBuilder_ == null) { + constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); + } else { + constructorBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + if (argumentBuilder_ == null) { + argument_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + argumentBuilder_.clear(); + } + nullable_ = false; + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + if (constructorBuilder_ == null) { + result.constructor_ = constructor_; + } else { + result.constructor_ = constructorBuilder_.build(); + } + if (argumentBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + argument_ = java.util.Collections.unmodifiableList(argument_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.argument_ = argument_; + } else { + result.argument_ = argumentBuilder_.build(); + } + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000002; + } + result.nullable_ = nullable_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) return this; + if (other.hasConstructor()) { + mergeConstructor(other.getConstructor()); + } + if (argumentBuilder_ == null) { + if (!other.argument_.isEmpty()) { + if (argument_.isEmpty()) { + argument_ = other.argument_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureArgumentIsMutable(); + argument_.addAll(other.argument_); + } + onChanged(); + } + } else { + if (!other.argument_.isEmpty()) { + if (argumentBuilder_.isEmpty()) { + argumentBuilder_.dispose(); + argumentBuilder_ = null; + argument_ = other.argument_; + bitField0_ = (bitField0_ & ~0x00000002); + argumentBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getArgumentFieldBuilder() : null; + } else { + argumentBuilder_.addAllMessages(other.argument_); + } + } + } + if (other.hasNullable()) { + setNullable(other.getNullable()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasConstructor()) { + + return false; + } + if (!getConstructor().isInitialized()) { + + return false; + } + for (int i = 0; i < getArgumentCount(); i++) { + if (!getArgument(i).isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder> constructorBuilder_; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public boolean hasConstructor() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor() { + if (constructorBuilder_ == null) { + return constructor_; + } else { + return constructorBuilder_.getMessage(); + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public Builder setConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor value) { + if (constructorBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + constructor_ = value; + onChanged(); + } else { + constructorBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public Builder setConstructor( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder builderForValue) { + if (constructorBuilder_ == null) { + constructor_ = builderForValue.build(); + onChanged(); + } else { + constructorBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public Builder mergeConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor value) { + if (constructorBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + constructor_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance()) { + constructor_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.newBuilder(constructor_).mergeFrom(value).buildPartial(); + } else { + constructor_ = value; + } + onChanged(); + } else { + constructorBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public Builder clearConstructor() { + if (constructorBuilder_ == null) { + constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); + onChanged(); + } else { + constructorBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder getConstructorBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getConstructorFieldBuilder().getBuilder(); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder() { + if (constructorBuilder_ != null) { + return constructorBuilder_.getMessageOrBuilder(); + } else { + return constructor_; + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder> + getConstructorFieldBuilder() { + if (constructorBuilder_ == null) { + constructorBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder>( + constructor_, + getParentForChildren(), + isClean()); + constructor_ = null; + } + return constructorBuilder_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + private java.util.List argument_ = + java.util.Collections.emptyList(); + private void ensureArgumentIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + argument_ = new java.util.ArrayList(argument_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> argumentBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public java.util.List getArgumentList() { + if (argumentBuilder_ == null) { + return java.util.Collections.unmodifiableList(argument_); + } else { + return argumentBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public int getArgumentCount() { + if (argumentBuilder_ == null) { + return argument_.size(); + } else { + return argumentBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index) { + if (argumentBuilder_ == null) { + return argument_.get(index); + } else { + return argumentBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder setArgument( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) { + if (argumentBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureArgumentIsMutable(); + argument_.set(index, value); + onChanged(); + } else { + argumentBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder setArgument( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) { + if (argumentBuilder_ == null) { + ensureArgumentIsMutable(); + argument_.set(index, builderForValue.build()); + onChanged(); + } else { + argumentBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder addArgument(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) { + if (argumentBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureArgumentIsMutable(); + argument_.add(value); + onChanged(); + } else { + argumentBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder addArgument( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) { + if (argumentBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureArgumentIsMutable(); + argument_.add(index, value); + onChanged(); + } else { + argumentBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder addArgument( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) { + if (argumentBuilder_ == null) { + ensureArgumentIsMutable(); + argument_.add(builderForValue.build()); + onChanged(); + } else { + argumentBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder addArgument( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) { + if (argumentBuilder_ == null) { + ensureArgumentIsMutable(); + argument_.add(index, builderForValue.build()); + onChanged(); + } else { + argumentBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder addAllArgument( + java.lang.Iterable values) { + if (argumentBuilder_ == null) { + ensureArgumentIsMutable(); + super.addAll(values, argument_); + onChanged(); + } else { + argumentBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder clearArgument() { + if (argumentBuilder_ == null) { + argument_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + argumentBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public Builder removeArgument(int index) { + if (argumentBuilder_ == null) { + ensureArgumentIsMutable(); + argument_.remove(index); + onChanged(); + } else { + argumentBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder getArgumentBuilder( + int index) { + return getArgumentFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder( + int index) { + if (argumentBuilder_ == null) { + return argument_.get(index); } else { + return argumentBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public java.util.List + getArgumentOrBuilderList() { + if (argumentBuilder_ != null) { + return argumentBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(argument_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder() { + return getArgumentFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder( + int index) { + return getArgumentFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; + */ + public java.util.List + getArgumentBuilderList() { + return getArgumentFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> + getArgumentFieldBuilder() { + if (argumentBuilder_ == null) { + argumentBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder>( + argument_, + ((bitField0_ & 0x00000002) == 0x00000002), + getParentForChildren(), + isClean()); + argument_ = null; + } + return argumentBuilder_; + } + + // optional bool nullable = 3 [default = false]; + private boolean nullable_ ; + /** + * optional bool nullable = 3 [default = false]; + */ + public boolean hasNullable() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bool nullable = 3 [default = false]; + */ + public boolean getNullable() { + return nullable_; + } + /** + * optional bool nullable = 3 [default = false]; + */ + public Builder setNullable(boolean value) { + bitField0_ |= 0x00000004; + nullable_ = value; + onChanged(); + return this; + } + /** + * optional bool nullable = 3 [default = false]; + */ + public Builder clearNullable() { + bitField0_ = (bitField0_ & ~0x00000004); + nullable_ = false; + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type) + } + + static { + defaultInstance = new Type(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type) + } + + public interface TypeParameterOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // required int32 id = 1; + /** + * required int32 id = 1; + */ + boolean hasId(); + /** + * required int32 id = 1; + */ + int getId(); + + // required int32 name = 2; + /** + * required int32 name = 2; + */ + boolean hasName(); + /** + * required int32 name = 2; + */ + int getName(); + + // optional bool reified = 3 [default = false]; + /** + * optional bool reified = 3 [default = false]; + */ + boolean hasReified(); + /** + * optional bool reified = 3 [default = false]; + */ + boolean getReified(); + + // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + /** + * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + */ + boolean hasVariance(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance(); + + // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + java.util.List + getUpperBoundList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + int getUpperBoundCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + java.util.List + getUpperBoundOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder( + int index); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.TypeParameter} + */ + public static final class TypeParameter extends + com.google.protobuf.GeneratedMessage + implements TypeParameterOrBuilder { + // Use TypeParameter.newBuilder() to construct. + private TypeParameter(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private TypeParameter(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final TypeParameter defaultInstance; + public static TypeParameter getDefaultInstance() { + return defaultInstance; + } + + public TypeParameter getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private TypeParameter( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + id_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + name_ = input.readInt32(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + reified_ = input.readBool(); + break; + } + case 32: { + int rawValue = input.readEnum(); + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.valueOf(rawValue); + if (value == null) { + unknownFields.mergeVarintField(4, rawValue); + } else { + bitField0_ |= 0x00000008; + variance_ = value; + } + break; + } + case 42: { + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + upperBound_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000010; + } + upperBound_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + upperBound_ = java.util.Collections.unmodifiableList(upperBound_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public TypeParameter parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TypeParameter(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance} + */ + public enum Variance + implements com.google.protobuf.ProtocolMessageEnum { + /** + * IN = 0; + */ + IN(0, 0), + /** + * OUT = 1; + */ + OUT(1, 1), + /** + * INV = 2; + */ + INV(2, 2), + ; + + /** + * IN = 0; + */ + public static final int IN_VALUE = 0; + /** + * OUT = 1; + */ + public static final int OUT_VALUE = 1; + /** + * INV = 2; + */ + public static final int INV_VALUE = 2; + + + public final int getNumber() { return value; } + + public static Variance valueOf(int value) { + switch (value) { + case 0: return IN; + case 1: return OUT; + case 2: return INV; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Variance findValueByNumber(int number) { + return Variance.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDescriptor().getEnumTypes().get(0); + } + + private static final Variance[] VALUES = values(); + + public static Variance valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Variance(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance) + } + + private int bitField0_; + // required int32 id = 1; + public static final int ID_FIELD_NUMBER = 1; + private int id_; + /** + * required int32 id = 1; + */ + public boolean hasId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required int32 id = 1; + */ + public int getId() { + return id_; + } + + // required int32 name = 2; + public static final int NAME_FIELD_NUMBER = 2; + private int name_; + /** + * required int32 name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 name = 2; + */ + public int getName() { + return name_; + } + + // optional bool reified = 3 [default = false]; + public static final int REIFIED_FIELD_NUMBER = 3; + private boolean reified_; + /** + * optional bool reified = 3 [default = false]; + */ + public boolean hasReified() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bool reified = 3 [default = false]; + */ + public boolean getReified() { + return reified_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + public static final int VARIANCE_FIELD_NUMBER = 4; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance variance_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + */ + public boolean hasVariance() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() { + return variance_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + public static final int UPPER_BOUND_FIELD_NUMBER = 5; + private java.util.List upperBound_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public java.util.List getUpperBoundList() { + return upperBound_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public java.util.List + getUpperBoundOrBuilderList() { + return upperBound_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public int getUpperBoundCount() { + return upperBound_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index) { + return upperBound_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder( + int index) { + return upperBound_.get(index); + } + + private void initFields() { + id_ = 0; + name_ = 0; + reified_ = false; + variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV; + upperBound_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasId()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasName()) { + memoizedIsInitialized = 0; + return false; + } + for (int i = 0; i < getUpperBoundCount(); i++) { + if (!getUpperBound(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, id_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, name_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeBool(3, reified_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeEnum(4, variance_.getNumber()); + } + for (int i = 0; i < upperBound_.size(); i++) { + output.writeMessage(5, upperBound_.get(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, id_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, name_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeBoolSize(3, reified_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(4, variance_.getNumber()); + } + for (int i = 0; i < upperBound_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, upperBound_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.TypeParameter} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getUpperBoundFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + id_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + name_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + reified_ = false; + bitField0_ = (bitField0_ & ~0x00000004); + variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV; + bitField0_ = (bitField0_ & ~0x00000008); + if (upperBoundBuilder_ == null) { + upperBound_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + } else { + upperBoundBuilder_.clear(); + } + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.id_ = id_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.name_ = name_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.reified_ = reified_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.variance_ = variance_; + if (upperBoundBuilder_ == null) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { + upperBound_ = java.util.Collections.unmodifiableList(upperBound_); + bitField0_ = (bitField0_ & ~0x00000010); + } + result.upperBound_ = upperBound_; + } else { + result.upperBound_ = upperBoundBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()) return this; + if (other.hasId()) { + setId(other.getId()); + } + if (other.hasName()) { + setName(other.getName()); + } + if (other.hasReified()) { + setReified(other.getReified()); + } + if (other.hasVariance()) { + setVariance(other.getVariance()); + } + if (upperBoundBuilder_ == null) { + if (!other.upperBound_.isEmpty()) { + if (upperBound_.isEmpty()) { + upperBound_ = other.upperBound_; + bitField0_ = (bitField0_ & ~0x00000010); + } else { + ensureUpperBoundIsMutable(); + upperBound_.addAll(other.upperBound_); + } + onChanged(); + } + } else { + if (!other.upperBound_.isEmpty()) { + if (upperBoundBuilder_.isEmpty()) { + upperBoundBuilder_.dispose(); + upperBoundBuilder_ = null; + upperBound_ = other.upperBound_; + bitField0_ = (bitField0_ & ~0x00000010); + upperBoundBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getUpperBoundFieldBuilder() : null; + } else { + upperBoundBuilder_.addAllMessages(other.upperBound_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasId()) { + + return false; + } + if (!hasName()) { + + return false; + } + for (int i = 0; i < getUpperBoundCount(); i++) { + if (!getUpperBound(i).isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // required int32 id = 1; + private int id_ ; + /** + * required int32 id = 1; + */ + public boolean hasId() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * required int32 id = 1; + */ + public int getId() { + return id_; + } + /** + * required int32 id = 1; + */ + public Builder setId(int value) { + bitField0_ |= 0x00000001; + id_ = value; + onChanged(); + return this; + } + /** + * required int32 id = 1; + */ + public Builder clearId() { + bitField0_ = (bitField0_ & ~0x00000001); + id_ = 0; + onChanged(); + return this; + } + + // required int32 name = 2; + private int name_ ; + /** + * required int32 name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 name = 2; + */ + public int getName() { + return name_; + } + /** + * required int32 name = 2; + */ + public Builder setName(int value) { + bitField0_ |= 0x00000002; + name_ = value; + onChanged(); + return this; + } + /** + * required int32 name = 2; + */ + public Builder clearName() { + bitField0_ = (bitField0_ & ~0x00000002); + name_ = 0; + onChanged(); + return this; + } + + // optional bool reified = 3 [default = false]; + private boolean reified_ ; + /** + * optional bool reified = 3 [default = false]; + */ + public boolean hasReified() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional bool reified = 3 [default = false]; + */ + public boolean getReified() { + return reified_; + } + /** + * optional bool reified = 3 [default = false]; + */ + public Builder setReified(boolean value) { + bitField0_ |= 0x00000004; + reified_ = value; + onChanged(); + return this; + } + /** + * optional bool reified = 3 [default = false]; + */ + public Builder clearReified() { + bitField0_ = (bitField0_ & ~0x00000004); + reified_ = false; + onChanged(); + return this; + } + + // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV; + /** + * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + */ + public boolean hasVariance() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() { + return variance_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + */ + public Builder setVariance(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000008; + variance_ = value; + onChanged(); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; + */ + public Builder clearVariance() { + bitField0_ = (bitField0_ & ~0x00000008); + variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV; + onChanged(); + return this; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + private java.util.List upperBound_ = + java.util.Collections.emptyList(); + private void ensureUpperBoundIsMutable() { + if (!((bitField0_ & 0x00000010) == 0x00000010)) { + upperBound_ = new java.util.ArrayList(upperBound_); + bitField0_ |= 0x00000010; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> upperBoundBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public java.util.List getUpperBoundList() { + if (upperBoundBuilder_ == null) { + return java.util.Collections.unmodifiableList(upperBound_); + } else { + return upperBoundBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public int getUpperBoundCount() { + if (upperBoundBuilder_ == null) { + return upperBound_.size(); + } else { + return upperBoundBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index) { + if (upperBoundBuilder_ == null) { + return upperBound_.get(index); + } else { + return upperBoundBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder setUpperBound( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (upperBoundBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUpperBoundIsMutable(); + upperBound_.set(index, value); + onChanged(); + } else { + upperBoundBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder setUpperBound( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (upperBoundBuilder_ == null) { + ensureUpperBoundIsMutable(); + upperBound_.set(index, builderForValue.build()); + onChanged(); + } else { + upperBoundBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder addUpperBound(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (upperBoundBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUpperBoundIsMutable(); + upperBound_.add(value); + onChanged(); + } else { + upperBoundBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder addUpperBound( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (upperBoundBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureUpperBoundIsMutable(); + upperBound_.add(index, value); + onChanged(); + } else { + upperBoundBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder addUpperBound( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (upperBoundBuilder_ == null) { + ensureUpperBoundIsMutable(); + upperBound_.add(builderForValue.build()); + onChanged(); + } else { + upperBoundBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder addUpperBound( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (upperBoundBuilder_ == null) { + ensureUpperBoundIsMutable(); + upperBound_.add(index, builderForValue.build()); + onChanged(); + } else { + upperBoundBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder addAllUpperBound( + java.lang.Iterable values) { + if (upperBoundBuilder_ == null) { + ensureUpperBoundIsMutable(); + super.addAll(values, upperBound_); + onChanged(); + } else { + upperBoundBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder clearUpperBound() { + if (upperBoundBuilder_ == null) { + upperBound_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + } else { + upperBoundBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public Builder removeUpperBound(int index) { + if (upperBoundBuilder_ == null) { + ensureUpperBoundIsMutable(); + upperBound_.remove(index); + onChanged(); + } else { + upperBoundBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getUpperBoundBuilder( + int index) { + return getUpperBoundFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder( + int index) { + if (upperBoundBuilder_ == null) { + return upperBound_.get(index); } else { + return upperBoundBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public java.util.List + getUpperBoundOrBuilderList() { + if (upperBoundBuilder_ != null) { + return upperBoundBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(upperBound_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder() { + return getUpperBoundFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder( + int index) { + return getUpperBoundFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; + */ + public java.util.List + getUpperBoundBuilderList() { + return getUpperBoundFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> + getUpperBoundFieldBuilder() { + if (upperBoundBuilder_ == null) { + upperBoundBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( + upperBound_, + ((bitField0_ & 0x00000010) == 0x00000010), + getParentForChildren(), + isClean()); + upperBound_ = null; + } + return upperBoundBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter) + } + + static { + defaultInstance = new TypeParameter(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter) + } + + public interface ClassOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional int32 flags = 1 [default = 0]; + /** + * optional int32 flags = 1 [default = 0]; + * + * 
+     *
+     *Visibility
+     *Modality
+     *has_annotation
+     *ClassKind
+     *is_inner
+     *
+ */ + boolean hasFlags(); + /** + * optional int32 flags = 1 [default = 0]; + * + * 
+     *
+     *Visibility
+     *Modality
+     *has_annotation
+     *ClassKind
+     *is_inner
+     *
+ */ + int getFlags(); + + // optional string extra_visibility = 2; + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + boolean hasExtraVisibility(); + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + java.lang.String getExtraVisibility(); + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + com.google.protobuf.ByteString + getExtraVisibilityBytes(); + + // required int32 fq_name = 3; + /** + * required int32 fq_name = 3; + */ + boolean hasFqName(); + /** + * required int32 fq_name = 3; + */ + int getFqName(); + + // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+     *
+ */ + boolean hasClassObject(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder(); + + // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + java.util.List + getTypeParameterList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + int getTypeParameterCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + java.util.List + getTypeParameterOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( + int index); + + // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + java.util.List + getSupertypeList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + int getSupertypeCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + java.util.List + getSupertypeOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder( + int index); + + // repeated int32 nested_class_name = 7; + /** + * repeated int32 nested_class_name = 7; + * + * 
+     * we store only names, because the actual information must reside in the corresponding .class files,
+     * to be obtainable through reflection at runtime
+     *
+ */ + java.util.List getNestedClassNameList(); + /** + * repeated int32 nested_class_name = 7; + * + * 
+     * we store only names, because the actual information must reside in the corresponding .class files,
+     * to be obtainable through reflection at runtime
+     *
+ */ + int getNestedClassNameCount(); + /** + * repeated int32 nested_class_name = 7; + * + * 
+     * we store only names, because the actual information must reside in the corresponding .class files,
+     * to be obtainable through reflection at runtime
+     *
+ */ + int getNestedClassName(int index); + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + java.util.List + getMemberList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + int getMemberCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + java.util.List + getMemberOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( + int index); + + // repeated int32 enum_entry = 12; + /** + * repeated int32 enum_entry = 12; + */ + java.util.List getEnumEntryList(); + /** + * repeated int32 enum_entry = 12; + */ + int getEnumEntryCount(); + /** + * repeated int32 enum_entry = 12; + */ + int getEnumEntry(int index); + + // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+     * This field is present if and only if the class has a primary constructor
+     *
+ */ + boolean hasPrimaryConstructor(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+     * This field is present if and only if the class has a primary constructor
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+     * This field is present if and only if the class has a primary constructor
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class} + */ + public static final class Class extends + com.google.protobuf.GeneratedMessage + implements ClassOrBuilder { + // Use Class.newBuilder() to construct. + private Class(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private Class(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final Class defaultInstance; + public static Class getDefaultInstance() { + return defaultInstance; + } + + public Class getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Class( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + flags_ = input.readInt32(); + break; + } + case 18: { + bitField0_ |= 0x00000002; + extraVisibility_ = input.readBytes(); + break; + } + case 24: { + bitField0_ |= 0x00000004; + fqName_ = input.readInt32(); + break; + } + case 34: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder subBuilder = null; + if (((bitField0_ & 0x00000008) == 0x00000008)) { + subBuilder = classObject_.toBuilder(); + } + classObject_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(classObject_); + classObject_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000008; + break; + } + case 42: { + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + typeParameter_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000010; + } + typeParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry)); + break; + } + case 50: { + if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + supertype_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000020; + } + supertype_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry)); + break; + } + case 56: { + if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + nestedClassName_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000040; + } + nestedClassName_.add(input.readInt32()); + break; + } + case 58: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000040) == 0x00000040) && input.getBytesUntilLimit() > 0) { + nestedClassName_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000040; + } + while (input.getBytesUntilLimit() > 0) { + nestedClassName_.add(input.readInt32()); + } + input.popLimit(limit); + break; + } + case 90: { + if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + member_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000080; + } + member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry)); + break; + } + case 96: { + if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + enumEntry_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000100; + } + enumEntry_.add(input.readInt32()); + break; + } + case 98: { + int length = input.readRawVarint32(); + int limit = input.pushLimit(length); + if (!((mutable_bitField0_ & 0x00000100) == 0x00000100) && input.getBytesUntilLimit() > 0) { + enumEntry_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000100; + } + while (input.getBytesUntilLimit() > 0) { + enumEntry_.add(input.readInt32()); + } + input.popLimit(limit); + break; + } + case 106: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null; + if (((bitField0_ & 0x00000010) == 0x00000010)) { + subBuilder = primaryConstructor_.toBuilder(); + } + primaryConstructor_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(primaryConstructor_); + primaryConstructor_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000010; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); + } + if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + supertype_ = java.util.Collections.unmodifiableList(supertype_); + } + if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_); + } + if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + member_ = java.util.Collections.unmodifiableList(member_); + } + if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { + enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public Class parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Class(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Class.Kind} + */ + public enum Kind + implements com.google.protobuf.ProtocolMessageEnum { + /** + * CLASS = 0; + * + * 
+       * 3 bits
+       *
+ */ + CLASS(0, 0), + /** + * TRAIT = 1; + */ + TRAIT(1, 1), + /** + * ENUM_CLASS = 2; + */ + ENUM_CLASS(2, 2), + /** + * ENUM_ENTRY = 3; + */ + ENUM_ENTRY(3, 3), + /** + * ANNOTATION_CLASS = 4; + */ + ANNOTATION_CLASS(4, 4), + /** + * OBJECT = 5; + */ + OBJECT(5, 5), + /** + * CLASS_OBJECT = 6; + */ + CLASS_OBJECT(6, 6), + ; + + /** + * CLASS = 0; + * + * 
+       * 3 bits
+       *
+ */ + public static final int CLASS_VALUE = 0; + /** + * TRAIT = 1; + */ + public static final int TRAIT_VALUE = 1; + /** + * ENUM_CLASS = 2; + */ + public static final int ENUM_CLASS_VALUE = 2; + /** + * ENUM_ENTRY = 3; + */ + public static final int ENUM_ENTRY_VALUE = 3; + /** + * ANNOTATION_CLASS = 4; + */ + public static final int ANNOTATION_CLASS_VALUE = 4; + /** + * OBJECT = 5; + */ + public static final int OBJECT_VALUE = 5; + /** + * CLASS_OBJECT = 6; + */ + public static final int CLASS_OBJECT_VALUE = 6; + + + public final int getNumber() { return value; } + + public static Kind valueOf(int value) { + switch (value) { + case 0: return CLASS; + case 1: return TRAIT; + case 2: return ENUM_CLASS; + case 3: return ENUM_ENTRY; + case 4: return ANNOTATION_CLASS; + case 5: return OBJECT; + case 6: return CLASS_OBJECT; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Kind findValueByNumber(int number) { + return Kind.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDescriptor().getEnumTypes().get(0); + } + + private static final Kind[] VALUES = values(); + + public static Kind valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private Kind(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Class.Kind) + } + + public interface ClassObjectOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+       *
+ */ + boolean hasData(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+       *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+       *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.ClassObject} + */ + public static final class ClassObject extends + com.google.protobuf.GeneratedMessage + implements ClassObjectOrBuilder { + // Use ClassObject.newBuilder() to construct. + private ClassObject(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ClassObject(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ClassObject defaultInstance; + public static ClassObject getDefaultInstance() { + return defaultInstance; + } + + public ClassObject getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ClassObject( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = data_.toBuilder(); + } + data_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(data_); + data_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ClassObject parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ClassObject(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + public static final int DATA_FIELD_NUMBER = 1; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class data_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+       *
+ */ + public boolean hasData() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData() { + return data_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder() { + return data_; + } + + private void initFields() { + data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (hasData()) { + if (!getData().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, data_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, data_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.ClassObject} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getDataFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (dataBuilder_ == null) { + data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); + } else { + dataBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + if (dataBuilder_ == null) { + result.data_ = data_; + } else { + result.data_ = dataBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance()) return this; + if (other.hasData()) { + mergeData(other.getData()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (hasData()) { + if (!getData().isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder> dataBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + public boolean hasData() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData() { + if (dataBuilder_ == null) { + return data_; + } else { + return dataBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + public Builder setData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class value) { + if (dataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + data_ = value; + onChanged(); + } else { + dataBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + public Builder setData( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder builderForValue) { + if (dataBuilder_ == null) { + data_ = builderForValue.build(); + onChanged(); + } else { + dataBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + public Builder mergeData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class value) { + if (dataBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + data_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance()) { + data_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.newBuilder(data_).mergeFrom(value).buildPartial(); + } else { + data_ = value; + } + onChanged(); + } else { + dataBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + public Builder clearData() { + if (dataBuilder_ == null) { + data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); + onChanged(); + } else { + dataBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder getDataBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getDataFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder() { + if (dataBuilder_ != null) { + return dataBuilder_.getMessageOrBuilder(); + } else { + return data_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; + * + * 
+         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
+         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
+         *
+ */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder> + getDataFieldBuilder() { + if (dataBuilder_ == null) { + dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder>( + data_, + getParentForChildren(), + isClean()); + data_ = null; + } + return dataBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class.ClassObject) + } + + static { + defaultInstance = new ClassObject(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class.ClassObject) + } + + public interface PrimaryConstructorOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+       * If this field is present, it contains serialized data for the primary constructor.
+       * Otherwise it's default and can be created manually upon deserialization
+       *
+ */ + boolean hasData(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+       * If this field is present, it contains serialized data for the primary constructor.
+       * Otherwise it's default and can be created manually upon deserialization
+       *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+       * If this field is present, it contains serialized data for the primary constructor.
+       * Otherwise it's default and can be created manually upon deserialization
+       *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor} + */ + public static final class PrimaryConstructor extends + com.google.protobuf.GeneratedMessage + implements PrimaryConstructorOrBuilder { + // Use PrimaryConstructor.newBuilder() to construct. + private PrimaryConstructor(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private PrimaryConstructor(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final PrimaryConstructor defaultInstance; + public static PrimaryConstructor getDefaultInstance() { + return defaultInstance; + } + + public PrimaryConstructor getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private PrimaryConstructor( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = data_.toBuilder(); + } + data_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(data_); + data_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public PrimaryConstructor parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new PrimaryConstructor(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + public static final int DATA_FIELD_NUMBER = 1; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable data_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+       * If this field is present, it contains serialized data for the primary constructor.
+       * Otherwise it's default and can be created manually upon deserialization
+       *
+ */ + public boolean hasData() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+       * If this field is present, it contains serialized data for the primary constructor.
+       * Otherwise it's default and can be created manually upon deserialization
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData() { + return data_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+       * If this field is present, it contains serialized data for the primary constructor.
+       * Otherwise it's default and can be created manually upon deserialization
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() { + return data_; + } + + private void initFields() { + data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (hasData()) { + if (!getData().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, data_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, data_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getDataFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (dataBuilder_ == null) { + data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); + } else { + dataBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + if (dataBuilder_ == null) { + result.data_ = data_; + } else { + result.data_ = dataBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) return this; + if (other.hasData()) { + mergeData(other.getData()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (hasData()) { + if (!getData().isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> dataBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + public boolean hasData() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData() { + if (dataBuilder_ == null) { + return data_; + } else { + return dataBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + public Builder setData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { + if (dataBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + data_ = value; + onChanged(); + } else { + dataBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + public Builder setData( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (dataBuilder_ == null) { + data_ = builderForValue.build(); + onChanged(); + } else { + dataBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + public Builder mergeData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { + if (dataBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + data_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()) { + data_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.newBuilder(data_).mergeFrom(value).buildPartial(); + } else { + data_ = value; + } + onChanged(); + } else { + dataBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + public Builder clearData() { + if (dataBuilder_ == null) { + data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); + onChanged(); + } else { + dataBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getDataBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getDataFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() { + if (dataBuilder_ != null) { + return dataBuilder_.getMessageOrBuilder(); + } else { + return data_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; + * + * 
+         * If this field is present, it contains serialized data for the primary constructor.
+         * Otherwise it's default and can be created manually upon deserialization
+         *
+ */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> + getDataFieldBuilder() { + if (dataBuilder_ == null) { + dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>( + data_, + getParentForChildren(), + isClean()); + data_ = null; + } + return dataBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor) + } + + static { + defaultInstance = new PrimaryConstructor(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor) + } + + private int bitField0_; + // optional int32 flags = 1 [default = 0]; + public static final int FLAGS_FIELD_NUMBER = 1; + private int flags_; + /** + * optional int32 flags = 1 [default = 0]; + * + * 
+     *
+     *Visibility
+     *Modality
+     *has_annotation
+     *ClassKind
+     *is_inner
+     *
+ */ + public boolean hasFlags() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 flags = 1 [default = 0]; + * + * 
+     *
+     *Visibility
+     *Modality
+     *has_annotation
+     *ClassKind
+     *is_inner
+     *
+ */ + public int getFlags() { + return flags_; + } + + // optional string extra_visibility = 2; + public static final int EXTRA_VISIBILITY_FIELD_NUMBER = 2; + private java.lang.Object extraVisibility_; + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + public boolean hasExtraVisibility() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + public java.lang.String getExtraVisibility() { + java.lang.Object ref = extraVisibility_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + extraVisibility_ = s; + } + return s; + } + } + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + public com.google.protobuf.ByteString + getExtraVisibilityBytes() { + java.lang.Object ref = extraVisibility_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + extraVisibility_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // required int32 fq_name = 3; + public static final int FQ_NAME_FIELD_NUMBER = 3; + private int fqName_; + /** + * required int32 fq_name = 3; + */ + public boolean hasFqName() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * required int32 fq_name = 3; + */ + public int getFqName() { + return fqName_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + public static final int CLASS_OBJECT_FIELD_NUMBER = 4; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject classObject_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+     *
+ */ + public boolean hasClassObject() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject() { + return classObject_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder() { + return classObject_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + public static final int TYPE_PARAMETER_FIELD_NUMBER = 5; + private java.util.List typeParameter_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public java.util.List getTypeParameterList() { + return typeParameter_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public java.util.List + getTypeParameterOrBuilderList() { + return typeParameter_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public int getTypeParameterCount() { + return typeParameter_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) { + return typeParameter_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( + int index) { + return typeParameter_.get(index); + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + public static final int SUPERTYPE_FIELD_NUMBER = 6; + private java.util.List supertype_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public java.util.List getSupertypeList() { + return supertype_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public java.util.List + getSupertypeOrBuilderList() { + return supertype_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public int getSupertypeCount() { + return supertype_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index) { + return supertype_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder( + int index) { + return supertype_.get(index); + } + + // repeated int32 nested_class_name = 7; + public static final int NESTED_CLASS_NAME_FIELD_NUMBER = 7; + private java.util.List nestedClassName_; + /** + * repeated int32 nested_class_name = 7; + * + * 
+     * we store only names, because the actual information must reside in the corresponding .class files,
+     * to be obtainable through reflection at runtime
+     *
+ */ + public java.util.List + getNestedClassNameList() { + return nestedClassName_; + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+     * we store only names, because the actual information must reside in the corresponding .class files,
+     * to be obtainable through reflection at runtime
+     *
+ */ + public int getNestedClassNameCount() { + return nestedClassName_.size(); + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+     * we store only names, because the actual information must reside in the corresponding .class files,
+     * to be obtainable through reflection at runtime
+     *
+ */ + public int getNestedClassName(int index) { + return nestedClassName_.get(index); + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + public static final int MEMBER_FIELD_NUMBER = 11; + private java.util.List member_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public java.util.List getMemberList() { + return member_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public java.util.List + getMemberOrBuilderList() { + return member_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public int getMemberCount() { + return member_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) { + return member_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( + int index) { + return member_.get(index); + } + + // repeated int32 enum_entry = 12; + public static final int ENUM_ENTRY_FIELD_NUMBER = 12; + private java.util.List enumEntry_; + /** + * repeated int32 enum_entry = 12; + */ + public java.util.List + getEnumEntryList() { + return enumEntry_; + } + /** + * repeated int32 enum_entry = 12; + */ + public int getEnumEntryCount() { + return enumEntry_.size(); + } + /** + * repeated int32 enum_entry = 12; + */ + public int getEnumEntry(int index) { + return enumEntry_.get(index); + } + + // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + public static final int PRIMARY_CONSTRUCTOR_FIELD_NUMBER = 13; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+     * This field is present if and only if the class has a primary constructor
+     *
+ */ + public boolean hasPrimaryConstructor() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+     * This field is present if and only if the class has a primary constructor
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() { + return primaryConstructor_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+     * This field is present if and only if the class has a primary constructor
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() { + return primaryConstructor_; + } + + private void initFields() { + flags_ = 0; + extraVisibility_ = ""; + fqName_ = 0; + classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); + typeParameter_ = java.util.Collections.emptyList(); + supertype_ = java.util.Collections.emptyList(); + nestedClassName_ = java.util.Collections.emptyList(); + member_ = java.util.Collections.emptyList(); + enumEntry_ = java.util.Collections.emptyList(); + primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasFqName()) { + memoizedIsInitialized = 0; + return false; + } + if (hasClassObject()) { + if (!getClassObject().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + for (int i = 0; i < getTypeParameterCount(); i++) { + if (!getTypeParameter(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + for (int i = 0; i < getSupertypeCount(); i++) { + if (!getSupertype(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + for (int i = 0; i < getMemberCount(); i++) { + if (!getMember(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasPrimaryConstructor()) { + if (!getPrimaryConstructor().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, flags_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBytes(2, getExtraVisibilityBytes()); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(3, fqName_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeMessage(4, classObject_); + } + for (int i = 0; i < typeParameter_.size(); i++) { + output.writeMessage(5, typeParameter_.get(i)); + } + for (int i = 0; i < supertype_.size(); i++) { + output.writeMessage(6, supertype_.get(i)); + } + for (int i = 0; i < nestedClassName_.size(); i++) { + output.writeInt32(7, nestedClassName_.get(i)); + } + for (int i = 0; i < member_.size(); i++) { + output.writeMessage(11, member_.get(i)); + } + for (int i = 0; i < enumEntry_.size(); i++) { + output.writeInt32(12, enumEntry_.get(i)); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeMessage(13, primaryConstructor_); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, flags_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(2, getExtraVisibilityBytes()); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(3, fqName_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, classObject_); + } + for (int i = 0; i < typeParameter_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, typeParameter_.get(i)); + } + for (int i = 0; i < supertype_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(6, supertype_.get(i)); + } + { + int dataSize = 0; + for (int i = 0; i < nestedClassName_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(nestedClassName_.get(i)); + } + size += dataSize; + size += 1 * getNestedClassNameList().size(); + } + for (int i = 0; i < member_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(11, member_.get(i)); + } + { + int dataSize = 0; + for (int i = 0; i < enumEntry_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeInt32SizeNoTag(enumEntry_.get(i)); + } + size += dataSize; + size += 1 * getEnumEntryList().size(); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(13, primaryConstructor_); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getClassObjectFieldBuilder(); + getTypeParameterFieldBuilder(); + getSupertypeFieldBuilder(); + getMemberFieldBuilder(); + getPrimaryConstructorFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + flags_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + extraVisibility_ = ""; + bitField0_ = (bitField0_ & ~0x00000002); + fqName_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + if (classObjectBuilder_ == null) { + classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); + } else { + classObjectBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + if (typeParameterBuilder_ == null) { + typeParameter_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + } else { + typeParameterBuilder_.clear(); + } + if (supertypeBuilder_ == null) { + supertype_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000020); + } else { + supertypeBuilder_.clear(); + } + nestedClassName_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000040); + if (memberBuilder_ == null) { + member_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000080); + } else { + memberBuilder_.clear(); + } + enumEntry_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000100); + if (primaryConstructorBuilder_ == null) { + primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); + } else { + primaryConstructorBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000200); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.flags_ = flags_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.extraVisibility_ = extraVisibility_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.fqName_ = fqName_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + if (classObjectBuilder_ == null) { + result.classObject_ = classObject_; + } else { + result.classObject_ = classObjectBuilder_.build(); + } + if (typeParameterBuilder_ == null) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { + typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); + bitField0_ = (bitField0_ & ~0x00000010); + } + result.typeParameter_ = typeParameter_; + } else { + result.typeParameter_ = typeParameterBuilder_.build(); + } + if (supertypeBuilder_ == null) { + if (((bitField0_ & 0x00000020) == 0x00000020)) { + supertype_ = java.util.Collections.unmodifiableList(supertype_); + bitField0_ = (bitField0_ & ~0x00000020); + } + result.supertype_ = supertype_; + } else { + result.supertype_ = supertypeBuilder_.build(); + } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_); + bitField0_ = (bitField0_ & ~0x00000040); + } + result.nestedClassName_ = nestedClassName_; + if (memberBuilder_ == null) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { + member_ = java.util.Collections.unmodifiableList(member_); + bitField0_ = (bitField0_ & ~0x00000080); + } + result.member_ = member_; + } else { + result.member_ = memberBuilder_.build(); + } + if (((bitField0_ & 0x00000100) == 0x00000100)) { + enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_); + bitField0_ = (bitField0_ & ~0x00000100); + } + result.enumEntry_ = enumEntry_; + if (((from_bitField0_ & 0x00000200) == 0x00000200)) { + to_bitField0_ |= 0x00000010; + } + if (primaryConstructorBuilder_ == null) { + result.primaryConstructor_ = primaryConstructor_; + } else { + result.primaryConstructor_ = primaryConstructorBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance()) return this; + if (other.hasFlags()) { + setFlags(other.getFlags()); + } + if (other.hasExtraVisibility()) { + bitField0_ |= 0x00000002; + extraVisibility_ = other.extraVisibility_; + onChanged(); + } + if (other.hasFqName()) { + setFqName(other.getFqName()); + } + if (other.hasClassObject()) { + mergeClassObject(other.getClassObject()); + } + if (typeParameterBuilder_ == null) { + if (!other.typeParameter_.isEmpty()) { + if (typeParameter_.isEmpty()) { + typeParameter_ = other.typeParameter_; + bitField0_ = (bitField0_ & ~0x00000010); + } else { + ensureTypeParameterIsMutable(); + typeParameter_.addAll(other.typeParameter_); + } + onChanged(); + } + } else { + if (!other.typeParameter_.isEmpty()) { + if (typeParameterBuilder_.isEmpty()) { + typeParameterBuilder_.dispose(); + typeParameterBuilder_ = null; + typeParameter_ = other.typeParameter_; + bitField0_ = (bitField0_ & ~0x00000010); + typeParameterBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getTypeParameterFieldBuilder() : null; + } else { + typeParameterBuilder_.addAllMessages(other.typeParameter_); + } + } + } + if (supertypeBuilder_ == null) { + if (!other.supertype_.isEmpty()) { + if (supertype_.isEmpty()) { + supertype_ = other.supertype_; + bitField0_ = (bitField0_ & ~0x00000020); + } else { + ensureSupertypeIsMutable(); + supertype_.addAll(other.supertype_); + } + onChanged(); + } + } else { + if (!other.supertype_.isEmpty()) { + if (supertypeBuilder_.isEmpty()) { + supertypeBuilder_.dispose(); + supertypeBuilder_ = null; + supertype_ = other.supertype_; + bitField0_ = (bitField0_ & ~0x00000020); + supertypeBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getSupertypeFieldBuilder() : null; + } else { + supertypeBuilder_.addAllMessages(other.supertype_); + } + } + } + if (!other.nestedClassName_.isEmpty()) { + if (nestedClassName_.isEmpty()) { + nestedClassName_ = other.nestedClassName_; + bitField0_ = (bitField0_ & ~0x00000040); + } else { + ensureNestedClassNameIsMutable(); + nestedClassName_.addAll(other.nestedClassName_); + } + onChanged(); + } + if (memberBuilder_ == null) { + if (!other.member_.isEmpty()) { + if (member_.isEmpty()) { + member_ = other.member_; + bitField0_ = (bitField0_ & ~0x00000080); + } else { + ensureMemberIsMutable(); + member_.addAll(other.member_); + } + onChanged(); + } + } else { + if (!other.member_.isEmpty()) { + if (memberBuilder_.isEmpty()) { + memberBuilder_.dispose(); + memberBuilder_ = null; + member_ = other.member_; + bitField0_ = (bitField0_ & ~0x00000080); + memberBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getMemberFieldBuilder() : null; + } else { + memberBuilder_.addAllMessages(other.member_); + } + } + } + if (!other.enumEntry_.isEmpty()) { + if (enumEntry_.isEmpty()) { + enumEntry_ = other.enumEntry_; + bitField0_ = (bitField0_ & ~0x00000100); + } else { + ensureEnumEntryIsMutable(); + enumEntry_.addAll(other.enumEntry_); + } + onChanged(); + } + if (other.hasPrimaryConstructor()) { + mergePrimaryConstructor(other.getPrimaryConstructor()); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasFqName()) { + + return false; + } + if (hasClassObject()) { + if (!getClassObject().isInitialized()) { + + return false; + } + } + for (int i = 0; i < getTypeParameterCount(); i++) { + if (!getTypeParameter(i).isInitialized()) { + + return false; + } + } + for (int i = 0; i < getSupertypeCount(); i++) { + if (!getSupertype(i).isInitialized()) { + + return false; + } + } + for (int i = 0; i < getMemberCount(); i++) { + if (!getMember(i).isInitialized()) { + + return false; + } + } + if (hasPrimaryConstructor()) { + if (!getPrimaryConstructor().isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 flags = 1 [default = 0]; + private int flags_ ; + /** + * optional int32 flags = 1 [default = 0]; + * + * 
+       *
+       *Visibility
+       *Modality
+       *has_annotation
+       *ClassKind
+       *is_inner
+       *
+ */ + public boolean hasFlags() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 flags = 1 [default = 0]; + * + * 
+       *
+       *Visibility
+       *Modality
+       *has_annotation
+       *ClassKind
+       *is_inner
+       *
+ */ + public int getFlags() { + return flags_; + } + /** + * optional int32 flags = 1 [default = 0]; + * + * 
+       *
+       *Visibility
+       *Modality
+       *has_annotation
+       *ClassKind
+       *is_inner
+       *
+ */ + public Builder setFlags(int value) { + bitField0_ |= 0x00000001; + flags_ = value; + onChanged(); + return this; + } + /** + * optional int32 flags = 1 [default = 0]; + * + * 
+       *
+       *Visibility
+       *Modality
+       *has_annotation
+       *ClassKind
+       *is_inner
+       *
+ */ + public Builder clearFlags() { + bitField0_ = (bitField0_ & ~0x00000001); + flags_ = 0; + onChanged(); + return this; + } + + // optional string extra_visibility = 2; + private java.lang.Object extraVisibility_ = ""; + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public boolean hasExtraVisibility() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public java.lang.String getExtraVisibility() { + java.lang.Object ref = extraVisibility_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + extraVisibility_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public com.google.protobuf.ByteString + getExtraVisibilityBytes() { + java.lang.Object ref = extraVisibility_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + extraVisibility_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public Builder setExtraVisibility( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + extraVisibility_ = value; + onChanged(); + return this; + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public Builder clearExtraVisibility() { + bitField0_ = (bitField0_ & ~0x00000002); + extraVisibility_ = getDefaultInstance().getExtraVisibility(); + onChanged(); + return this; + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public Builder setExtraVisibilityBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + extraVisibility_ = value; + onChanged(); + return this; + } + + // required int32 fq_name = 3; + private int fqName_ ; + /** + * required int32 fq_name = 3; + */ + public boolean hasFqName() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * required int32 fq_name = 3; + */ + public int getFqName() { + return fqName_; + } + /** + * required int32 fq_name = 3; + */ + public Builder setFqName(int value) { + bitField0_ |= 0x00000004; + fqName_ = value; + onChanged(); + return this; + } + /** + * required int32 fq_name = 3; + */ + public Builder clearFqName() { + bitField0_ = (bitField0_ & ~0x00000004); + fqName_ = 0; + onChanged(); + return this; + } + + // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder> classObjectBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + public boolean hasClassObject() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject() { + if (classObjectBuilder_ == null) { + return classObject_; + } else { + return classObjectBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + public Builder setClassObject(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject value) { + if (classObjectBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + classObject_ = value; + onChanged(); + } else { + classObjectBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + public Builder setClassObject( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder builderForValue) { + if (classObjectBuilder_ == null) { + classObject_ = builderForValue.build(); + onChanged(); + } else { + classObjectBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + public Builder mergeClassObject(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject value) { + if (classObjectBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008) && + classObject_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance()) { + classObject_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.newBuilder(classObject_).mergeFrom(value).buildPartial(); + } else { + classObject_ = value; + } + onChanged(); + } else { + classObjectBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + public Builder clearClassObject() { + if (classObjectBuilder_ == null) { + classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); + onChanged(); + } else { + classObjectBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder getClassObjectBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getClassObjectFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder() { + if (classObjectBuilder_ != null) { + return classObjectBuilder_.getMessageOrBuilder(); + } else { + return classObject_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; + * + * 
+       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
+       *
+ */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder> + getClassObjectFieldBuilder() { + if (classObjectBuilder_ == null) { + classObjectBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder>( + classObject_, + getParentForChildren(), + isClean()); + classObject_ = null; + } + return classObjectBuilder_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + private java.util.List typeParameter_ = + java.util.Collections.emptyList(); + private void ensureTypeParameterIsMutable() { + if (!((bitField0_ & 0x00000010) == 0x00000010)) { + typeParameter_ = new java.util.ArrayList(typeParameter_); + bitField0_ |= 0x00000010; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public java.util.List getTypeParameterList() { + if (typeParameterBuilder_ == null) { + return java.util.Collections.unmodifiableList(typeParameter_); + } else { + return typeParameterBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public int getTypeParameterCount() { + if (typeParameterBuilder_ == null) { + return typeParameter_.size(); + } else { + return typeParameterBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) { + if (typeParameterBuilder_ == null) { + return typeParameter_.get(index); + } else { + return typeParameterBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder setTypeParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { + if (typeParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTypeParameterIsMutable(); + typeParameter_.set(index, value); + onChanged(); + } else { + typeParameterBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder setTypeParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + typeParameter_.set(index, builderForValue.build()); + onChanged(); + } else { + typeParameterBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder addTypeParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { + if (typeParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTypeParameterIsMutable(); + typeParameter_.add(value); + onChanged(); + } else { + typeParameterBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder addTypeParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { + if (typeParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTypeParameterIsMutable(); + typeParameter_.add(index, value); + onChanged(); + } else { + typeParameterBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder addTypeParameter( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + typeParameter_.add(builderForValue.build()); + onChanged(); + } else { + typeParameterBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder addTypeParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + typeParameter_.add(index, builderForValue.build()); + onChanged(); + } else { + typeParameterBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder addAllTypeParameter( + java.lang.Iterable values) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + super.addAll(values, typeParameter_); + onChanged(); + } else { + typeParameterBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder clearTypeParameter() { + if (typeParameterBuilder_ == null) { + typeParameter_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + } else { + typeParameterBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public Builder removeTypeParameter(int index) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + typeParameter_.remove(index); + onChanged(); + } else { + typeParameterBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder( + int index) { + return getTypeParameterFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( + int index) { + if (typeParameterBuilder_ == null) { + return typeParameter_.get(index); } else { + return typeParameterBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public java.util.List + getTypeParameterOrBuilderList() { + if (typeParameterBuilder_ != null) { + return typeParameterBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(typeParameter_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() { + return getTypeParameterFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder( + int index) { + return getTypeParameterFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; + */ + public java.util.List + getTypeParameterBuilderList() { + return getTypeParameterFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> + getTypeParameterFieldBuilder() { + if (typeParameterBuilder_ == null) { + typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder>( + typeParameter_, + ((bitField0_ & 0x00000010) == 0x00000010), + getParentForChildren(), + isClean()); + typeParameter_ = null; + } + return typeParameterBuilder_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + private java.util.List supertype_ = + java.util.Collections.emptyList(); + private void ensureSupertypeIsMutable() { + if (!((bitField0_ & 0x00000020) == 0x00000020)) { + supertype_ = new java.util.ArrayList(supertype_); + bitField0_ |= 0x00000020; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> supertypeBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public java.util.List getSupertypeList() { + if (supertypeBuilder_ == null) { + return java.util.Collections.unmodifiableList(supertype_); + } else { + return supertypeBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public int getSupertypeCount() { + if (supertypeBuilder_ == null) { + return supertype_.size(); + } else { + return supertypeBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index) { + if (supertypeBuilder_ == null) { + return supertype_.get(index); + } else { + return supertypeBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder setSupertype( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (supertypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSupertypeIsMutable(); + supertype_.set(index, value); + onChanged(); + } else { + supertypeBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder setSupertype( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (supertypeBuilder_ == null) { + ensureSupertypeIsMutable(); + supertype_.set(index, builderForValue.build()); + onChanged(); + } else { + supertypeBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder addSupertype(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (supertypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSupertypeIsMutable(); + supertype_.add(value); + onChanged(); + } else { + supertypeBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder addSupertype( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (supertypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureSupertypeIsMutable(); + supertype_.add(index, value); + onChanged(); + } else { + supertypeBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder addSupertype( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (supertypeBuilder_ == null) { + ensureSupertypeIsMutable(); + supertype_.add(builderForValue.build()); + onChanged(); + } else { + supertypeBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder addSupertype( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (supertypeBuilder_ == null) { + ensureSupertypeIsMutable(); + supertype_.add(index, builderForValue.build()); + onChanged(); + } else { + supertypeBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder addAllSupertype( + java.lang.Iterable values) { + if (supertypeBuilder_ == null) { + ensureSupertypeIsMutable(); + super.addAll(values, supertype_); + onChanged(); + } else { + supertypeBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder clearSupertype() { + if (supertypeBuilder_ == null) { + supertype_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000020); + onChanged(); + } else { + supertypeBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public Builder removeSupertype(int index) { + if (supertypeBuilder_ == null) { + ensureSupertypeIsMutable(); + supertype_.remove(index); + onChanged(); + } else { + supertypeBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getSupertypeBuilder( + int index) { + return getSupertypeFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder( + int index) { + if (supertypeBuilder_ == null) { + return supertype_.get(index); } else { + return supertypeBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public java.util.List + getSupertypeOrBuilderList() { + if (supertypeBuilder_ != null) { + return supertypeBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(supertype_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder() { + return getSupertypeFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder( + int index) { + return getSupertypeFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; + */ + public java.util.List + getSupertypeBuilderList() { + return getSupertypeFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> + getSupertypeFieldBuilder() { + if (supertypeBuilder_ == null) { + supertypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( + supertype_, + ((bitField0_ & 0x00000020) == 0x00000020), + getParentForChildren(), + isClean()); + supertype_ = null; + } + return supertypeBuilder_; + } + + // repeated int32 nested_class_name = 7; + private java.util.List nestedClassName_ = java.util.Collections.emptyList(); + private void ensureNestedClassNameIsMutable() { + if (!((bitField0_ & 0x00000040) == 0x00000040)) { + nestedClassName_ = new java.util.ArrayList(nestedClassName_); + bitField0_ |= 0x00000040; + } + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+       * we store only names, because the actual information must reside in the corresponding .class files,
+       * to be obtainable through reflection at runtime
+       *
+ */ + public java.util.List + getNestedClassNameList() { + return java.util.Collections.unmodifiableList(nestedClassName_); + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+       * we store only names, because the actual information must reside in the corresponding .class files,
+       * to be obtainable through reflection at runtime
+       *
+ */ + public int getNestedClassNameCount() { + return nestedClassName_.size(); + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+       * we store only names, because the actual information must reside in the corresponding .class files,
+       * to be obtainable through reflection at runtime
+       *
+ */ + public int getNestedClassName(int index) { + return nestedClassName_.get(index); + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+       * we store only names, because the actual information must reside in the corresponding .class files,
+       * to be obtainable through reflection at runtime
+       *
+ */ + public Builder setNestedClassName( + int index, int value) { + ensureNestedClassNameIsMutable(); + nestedClassName_.set(index, value); + onChanged(); + return this; + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+       * we store only names, because the actual information must reside in the corresponding .class files,
+       * to be obtainable through reflection at runtime
+       *
+ */ + public Builder addNestedClassName(int value) { + ensureNestedClassNameIsMutable(); + nestedClassName_.add(value); + onChanged(); + return this; + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+       * we store only names, because the actual information must reside in the corresponding .class files,
+       * to be obtainable through reflection at runtime
+       *
+ */ + public Builder addAllNestedClassName( + java.lang.Iterable values) { + ensureNestedClassNameIsMutable(); + super.addAll(values, nestedClassName_); + onChanged(); + return this; + } + /** + * repeated int32 nested_class_name = 7; + * + * 
+       * we store only names, because the actual information must reside in the corresponding .class files,
+       * to be obtainable through reflection at runtime
+       *
+ */ + public Builder clearNestedClassName() { + nestedClassName_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000040); + onChanged(); + return this; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + private java.util.List member_ = + java.util.Collections.emptyList(); + private void ensureMemberIsMutable() { + if (!((bitField0_ & 0x00000080) == 0x00000080)) { + member_ = new java.util.ArrayList(member_); + bitField0_ |= 0x00000080; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public java.util.List getMemberList() { + if (memberBuilder_ == null) { + return java.util.Collections.unmodifiableList(member_); + } else { + return memberBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public int getMemberCount() { + if (memberBuilder_ == null) { + return member_.size(); + } else { + return memberBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) { + if (memberBuilder_ == null) { + return member_.get(index); + } else { + return memberBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder setMember( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { + if (memberBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMemberIsMutable(); + member_.set(index, value); + onChanged(); + } else { + memberBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder setMember( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + member_.set(index, builderForValue.build()); + onChanged(); + } else { + memberBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder addMember(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { + if (memberBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMemberIsMutable(); + member_.add(value); + onChanged(); + } else { + memberBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder addMember( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { + if (memberBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMemberIsMutable(); + member_.add(index, value); + onChanged(); + } else { + memberBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder addMember( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + member_.add(builderForValue.build()); + onChanged(); + } else { + memberBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder addMember( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + member_.add(index, builderForValue.build()); + onChanged(); + } else { + memberBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder addAllMember( + java.lang.Iterable values) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + super.addAll(values, member_); + onChanged(); + } else { + memberBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder clearMember() { + if (memberBuilder_ == null) { + member_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000080); + onChanged(); + } else { + memberBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public Builder removeMember(int index) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + member_.remove(index); + onChanged(); + } else { + memberBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder( + int index) { + return getMemberFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( + int index) { + if (memberBuilder_ == null) { + return member_.get(index); } else { + return memberBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public java.util.List + getMemberOrBuilderList() { + if (memberBuilder_ != null) { + return memberBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(member_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() { + return getMemberFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder( + int index) { + return getMemberFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; + */ + public java.util.List + getMemberBuilderList() { + return getMemberFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> + getMemberFieldBuilder() { + if (memberBuilder_ == null) { + memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>( + member_, + ((bitField0_ & 0x00000080) == 0x00000080), + getParentForChildren(), + isClean()); + member_ = null; + } + return memberBuilder_; + } + + // repeated int32 enum_entry = 12; + private java.util.List enumEntry_ = java.util.Collections.emptyList(); + private void ensureEnumEntryIsMutable() { + if (!((bitField0_ & 0x00000100) == 0x00000100)) { + enumEntry_ = new java.util.ArrayList(enumEntry_); + bitField0_ |= 0x00000100; + } + } + /** + * repeated int32 enum_entry = 12; + */ + public java.util.List + getEnumEntryList() { + return java.util.Collections.unmodifiableList(enumEntry_); + } + /** + * repeated int32 enum_entry = 12; + */ + public int getEnumEntryCount() { + return enumEntry_.size(); + } + /** + * repeated int32 enum_entry = 12; + */ + public int getEnumEntry(int index) { + return enumEntry_.get(index); + } + /** + * repeated int32 enum_entry = 12; + */ + public Builder setEnumEntry( + int index, int value) { + ensureEnumEntryIsMutable(); + enumEntry_.set(index, value); + onChanged(); + return this; + } + /** + * repeated int32 enum_entry = 12; + */ + public Builder addEnumEntry(int value) { + ensureEnumEntryIsMutable(); + enumEntry_.add(value); + onChanged(); + return this; + } + /** + * repeated int32 enum_entry = 12; + */ + public Builder addAllEnumEntry( + java.lang.Iterable values) { + ensureEnumEntryIsMutable(); + super.addAll(values, enumEntry_); + onChanged(); + return this; + } + /** + * repeated int32 enum_entry = 12; + */ + public Builder clearEnumEntry() { + enumEntry_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000100); + onChanged(); + return this; + } + + // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> primaryConstructorBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + public boolean hasPrimaryConstructor() { + return ((bitField0_ & 0x00000200) == 0x00000200); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() { + if (primaryConstructorBuilder_ == null) { + return primaryConstructor_; + } else { + return primaryConstructorBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + public Builder setPrimaryConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor value) { + if (primaryConstructorBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + primaryConstructor_ = value; + onChanged(); + } else { + primaryConstructorBuilder_.setMessage(value); + } + bitField0_ |= 0x00000200; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + public Builder setPrimaryConstructor( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder builderForValue) { + if (primaryConstructorBuilder_ == null) { + primaryConstructor_ = builderForValue.build(); + onChanged(); + } else { + primaryConstructorBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000200; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + public Builder mergePrimaryConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor value) { + if (primaryConstructorBuilder_ == null) { + if (((bitField0_ & 0x00000200) == 0x00000200) && + primaryConstructor_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) { + primaryConstructor_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial(); + } else { + primaryConstructor_ = value; + } + onChanged(); + } else { + primaryConstructorBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000200; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + public Builder clearPrimaryConstructor() { + if (primaryConstructorBuilder_ == null) { + primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); + onChanged(); + } else { + primaryConstructorBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000200); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder getPrimaryConstructorBuilder() { + bitField0_ |= 0x00000200; + onChanged(); + return getPrimaryConstructorFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() { + if (primaryConstructorBuilder_ != null) { + return primaryConstructorBuilder_.getMessageOrBuilder(); + } else { + return primaryConstructor_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; + * + * 
+       * This field is present if and only if the class has a primary constructor
+       *
+ */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> + getPrimaryConstructorFieldBuilder() { + if (primaryConstructorBuilder_ == null) { + primaryConstructorBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder>( + primaryConstructor_, + getParentForChildren(), + isClean()); + primaryConstructor_ = null; + } + return primaryConstructorBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class) + } + + static { + defaultInstance = new Class(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class) + } + + public interface PackageOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + java.util.List + getMemberList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + int getMemberCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + java.util.List + getMemberOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( + int index); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Package} + */ + public static final class Package extends + com.google.protobuf.GeneratedMessage + implements PackageOrBuilder { + // Use Package.newBuilder() to construct. + private Package(com.google.protobuf.GeneratedMessage.Builder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private Package(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final Package defaultInstance; + public static Package getDefaultInstance() { + return defaultInstance; + } + + public Package getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Package( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + member_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000001; + } + member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + member_ = java.util.Collections.unmodifiableList(member_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public Package parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Package(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + public static final int MEMBER_FIELD_NUMBER = 1; + private java.util.List member_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public java.util.List getMemberList() { + return member_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public java.util.List + getMemberOrBuilderList() { + return member_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public int getMemberCount() { + return member_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) { + return member_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( + int index) { + return member_.get(index); + } + + private void initFields() { + member_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + for (int i = 0; i < getMemberCount(); i++) { + if (!getMember(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + for (int i = 0; i < member_.size(); i++) { + output.writeMessage(1, member_.get(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < member_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, member_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Package} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder + implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.PackageOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getMemberFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (memberBuilder_ == null) { + member_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + memberBuilder_.clear(); + } + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package(this); + int from_bitField0_ = bitField0_; + if (memberBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + member_ = java.util.Collections.unmodifiableList(member_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.member_ = member_; + } else { + result.member_ = memberBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.getDefaultInstance()) return this; + if (memberBuilder_ == null) { + if (!other.member_.isEmpty()) { + if (member_.isEmpty()) { + member_ = other.member_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureMemberIsMutable(); + member_.addAll(other.member_); + } + onChanged(); + } + } else { + if (!other.member_.isEmpty()) { + if (memberBuilder_.isEmpty()) { + memberBuilder_.dispose(); + memberBuilder_ = null; + member_ = other.member_; + bitField0_ = (bitField0_ & ~0x00000001); + memberBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getMemberFieldBuilder() : null; + } else { + memberBuilder_.addAllMessages(other.member_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + for (int i = 0; i < getMemberCount(); i++) { + if (!getMember(i).isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + private java.util.List member_ = + java.util.Collections.emptyList(); + private void ensureMemberIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + member_ = new java.util.ArrayList(member_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public java.util.List getMemberList() { + if (memberBuilder_ == null) { + return java.util.Collections.unmodifiableList(member_); + } else { + return memberBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public int getMemberCount() { + if (memberBuilder_ == null) { + return member_.size(); + } else { + return memberBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) { + if (memberBuilder_ == null) { + return member_.get(index); + } else { + return memberBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder setMember( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { + if (memberBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMemberIsMutable(); + member_.set(index, value); + onChanged(); + } else { + memberBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder setMember( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + member_.set(index, builderForValue.build()); + onChanged(); + } else { + memberBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder addMember(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { + if (memberBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMemberIsMutable(); + member_.add(value); + onChanged(); + } else { + memberBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder addMember( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { + if (memberBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureMemberIsMutable(); + member_.add(index, value); + onChanged(); + } else { + memberBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder addMember( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + member_.add(builderForValue.build()); + onChanged(); + } else { + memberBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder addMember( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + member_.add(index, builderForValue.build()); + onChanged(); + } else { + memberBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder addAllMember( + java.lang.Iterable values) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + super.addAll(values, member_); + onChanged(); + } else { + memberBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder clearMember() { + if (memberBuilder_ == null) { + member_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + memberBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public Builder removeMember(int index) { + if (memberBuilder_ == null) { + ensureMemberIsMutable(); + member_.remove(index); + onChanged(); + } else { + memberBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder( + int index) { + return getMemberFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( + int index) { + if (memberBuilder_ == null) { + return member_.get(index); } else { + return memberBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public java.util.List + getMemberOrBuilderList() { + if (memberBuilder_ != null) { + return memberBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(member_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() { + return getMemberFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder( + int index) { + return getMemberFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; + */ + public java.util.List + getMemberBuilderList() { + return getMemberFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> + getMemberFieldBuilder() { + if (memberBuilder_ == null) { + memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>( + member_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + member_ = null; + } + return memberBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Package) + } + + static { + defaultInstance = new Package(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Package) + } + + public interface CallableOrBuilder extends + com.google.protobuf.GeneratedMessage. + ExtendableMessageOrBuilder { + + // optional int32 flags = 1; + /** + * optional int32 flags = 1; + * + * 
+     *
+     *Visibility
+     *Modality
+     *has_annotations
+     *CallableKind
+     *MemberKind
+     *hasGetter
+     *hasSetter
+     *
+ */ + boolean hasFlags(); + /** + * optional int32 flags = 1; + * + * 
+     *
+     *Visibility
+     *Modality
+     *has_annotations
+     *CallableKind
+     *MemberKind
+     *hasGetter
+     *hasSetter
+     *
+ */ + int getFlags(); + + // optional string extra_visibility = 2; + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + boolean hasExtraVisibility(); + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + java.lang.String getExtraVisibility(); + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + com.google.protobuf.ByteString + getExtraVisibilityBytes(); + + // optional int32 getter_flags = 9; + /** + * optional int32 getter_flags = 9; + * + * 
+     *
+     *isNotDefault
+     *Visibility
+     *Modality
+     *has_annotations
+     *
+ */ + boolean hasGetterFlags(); + /** + * optional int32 getter_flags = 9; + * + * 
+     *
+     *isNotDefault
+     *Visibility
+     *Modality
+     *has_annotations
+     *
+ */ + int getGetterFlags(); + + // optional int32 setter_flags = 10; + /** + * optional int32 setter_flags = 10; + */ + boolean hasSetterFlags(); + /** + * optional int32 setter_flags = 10; + */ + int getSetterFlags(); + + // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + java.util.List + getTypeParameterList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + int getTypeParameterCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + java.util.List + getTypeParameterOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( + int index); + + // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + boolean hasReceiverType(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder(); + + // required int32 name = 6; + /** + * required int32 name = 6; + */ + boolean hasName(); + /** + * required int32 name = 6; + */ + int getName(); + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + java.util.List + getValueParameterList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + int getValueParameterCount(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + java.util.List + getValueParameterOrBuilderList(); + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder( + int index); + + // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + boolean hasReturnType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable} + */ + public static final class Callable extends + com.google.protobuf.GeneratedMessage.ExtendableMessage< + Callable> implements CallableOrBuilder { + // Use Callable.newBuilder() to construct. + private Callable(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private Callable(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final Callable defaultInstance; + public static Callable getDefaultInstance() { + return defaultInstance; + } + + public Callable getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private Callable( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + flags_ = input.readInt32(); + break; + } + case 18: { + bitField0_ |= 0x00000002; + extraVisibility_ = input.readBytes(); + break; + } + case 34: { + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + typeParameter_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000010; + } + typeParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry)); + break; + } + case 42: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; + if (((bitField0_ & 0x00000010) == 0x00000010)) { + subBuilder = receiverType_.toBuilder(); + } + receiverType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(receiverType_); + receiverType_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000010; + break; + } + case 48: { + bitField0_ |= 0x00000020; + name_ = input.readInt32(); + break; + } + case 58: { + if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + valueParameter_ = new java.util.ArrayList(); + mutable_bitField0_ |= 0x00000080; + } + valueParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry)); + break; + } + case 66: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; + if (((bitField0_ & 0x00000040) == 0x00000040)) { + subBuilder = returnType_.toBuilder(); + } + returnType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(returnType_); + returnType_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000040; + break; + } + case 72: { + bitField0_ |= 0x00000004; + getterFlags_ = input.readInt32(); + break; + } + case 80: { + bitField0_ |= 0x00000008; + setterFlags_ = input.readInt32(); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); + } + if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public Callable parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new Callable(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Callable.MemberKind} + */ + public enum MemberKind + implements com.google.protobuf.ProtocolMessageEnum { + /** + * DECLARATION = 0; + * + * 
+       * 2 bits
+       *
+ */ + DECLARATION(0, 0), + /** + * FAKE_OVERRIDE = 1; + */ + FAKE_OVERRIDE(1, 1), + /** + * DELEGATION = 2; + */ + DELEGATION(2, 2), + /** + * SYNTHESIZED = 3; + */ + SYNTHESIZED(3, 3), + ; + + /** + * DECLARATION = 0; + * + * 
+       * 2 bits
+       *
+ */ + public static final int DECLARATION_VALUE = 0; + /** + * FAKE_OVERRIDE = 1; + */ + public static final int FAKE_OVERRIDE_VALUE = 1; + /** + * DELEGATION = 2; + */ + public static final int DELEGATION_VALUE = 2; + /** + * SYNTHESIZED = 3; + */ + public static final int SYNTHESIZED_VALUE = 3; + + + public final int getNumber() { return value; } + + public static MemberKind valueOf(int value) { + switch (value) { + case 0: return DECLARATION; + case 1: return FAKE_OVERRIDE; + case 2: return DELEGATION; + case 3: return SYNTHESIZED; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public MemberKind findValueByNumber(int number) { + return MemberKind.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDescriptor().getEnumTypes().get(0); + } + + private static final MemberKind[] VALUES = values(); + + public static MemberKind valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private MemberKind(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Callable.MemberKind) + } + + /** + * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Callable.CallableKind} + */ + public enum CallableKind + implements com.google.protobuf.ProtocolMessageEnum { + /** + * FUN = 0; + * + * 
+       * 2 bits
+       *
+ */ + FUN(0, 0), + /** + * VAL = 1; + */ + VAL(1, 1), + /** + * VAR = 2; + */ + VAR(2, 2), + /** + * CONSTRUCTOR = 3; + */ + CONSTRUCTOR(3, 3), + ; + + /** + * FUN = 0; + * + * 
+       * 2 bits
+       *
+ */ + public static final int FUN_VALUE = 0; + /** + * VAL = 1; + */ + public static final int VAL_VALUE = 1; + /** + * VAR = 2; + */ + public static final int VAR_VALUE = 2; + /** + * CONSTRUCTOR = 3; + */ + public static final int CONSTRUCTOR_VALUE = 3; + + + public final int getNumber() { return value; } + + public static CallableKind valueOf(int value) { + switch (value) { + case 0: return FUN; + case 1: return VAL; + case 2: return VAR; + case 3: return CONSTRUCTOR; + default: return null; + } + } + + public static com.google.protobuf.Internal.EnumLiteMap + internalGetValueMap() { + return internalValueMap; + } + private static com.google.protobuf.Internal.EnumLiteMap + internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public CallableKind findValueByNumber(int number) { + return CallableKind.valueOf(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor + getValueDescriptor() { + return getDescriptor().getValues().get(index); + } + public final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptorForType() { + return getDescriptor(); + } + public static final com.google.protobuf.Descriptors.EnumDescriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDescriptor().getEnumTypes().get(1); + } + + private static final CallableKind[] VALUES = values(); + + public static CallableKind valueOf( + com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + if (desc.getType() != getDescriptor()) { + throw new java.lang.IllegalArgumentException( + "EnumValueDescriptor is not for this type."); + } + return VALUES[desc.getIndex()]; + } + + private final int index; + private final int value; + + private CallableKind(int index, int value) { + this.index = index; + this.value = value; + } + + // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Callable.CallableKind) + } + + public interface ValueParameterOrBuilder extends + com.google.protobuf.GeneratedMessage. + ExtendableMessageOrBuilder { + + // optional int32 flags = 1; + /** + * optional int32 flags = 1; + * + * 
+       *
+       *declaresDefault
+       *has_annotations
+       *
+ */ + boolean hasFlags(); + /** + * optional int32 flags = 1; + * + * 
+       *
+       *declaresDefault
+       *has_annotations
+       *
+ */ + int getFlags(); + + // required int32 name = 2; + /** + * required int32 name = 2; + */ + boolean hasName(); + /** + * required int32 name = 2; + */ + int getName(); + + // required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + boolean hasType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType(); + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(); + + // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + boolean hasVarargElementType(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType(); + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder(); + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter} + */ + public static final class ValueParameter extends + com.google.protobuf.GeneratedMessage.ExtendableMessage< + ValueParameter> implements ValueParameterOrBuilder { + // Use ValueParameter.newBuilder() to construct. + private ValueParameter(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private ValueParameter(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final ValueParameter defaultInstance; + public static ValueParameter getDefaultInstance() { + return defaultInstance; + } + + public ValueParameter getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private ValueParameter( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 8: { + bitField0_ |= 0x00000001; + flags_ = input.readInt32(); + break; + } + case 16: { + bitField0_ |= 0x00000002; + name_ = input.readInt32(); + break; + } + case 26: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; + if (((bitField0_ & 0x00000004) == 0x00000004)) { + subBuilder = type_.toBuilder(); + } + type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(type_); + type_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000004; + break; + } + case 34: { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; + if (((bitField0_ & 0x00000008) == 0x00000008)) { + subBuilder = varargElementType_.toBuilder(); + } + varargElementType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(varargElementType_); + varargElementType_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000008; + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder.class); + } + + public static com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + public ValueParameter parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new ValueParameter(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional int32 flags = 1; + public static final int FLAGS_FIELD_NUMBER = 1; + private int flags_; + /** + * optional int32 flags = 1; + * + * 
+       *
+       *declaresDefault
+       *has_annotations
+       *
+ */ + public boolean hasFlags() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 flags = 1; + * + * 
+       *
+       *declaresDefault
+       *has_annotations
+       *
+ */ + public int getFlags() { + return flags_; + } + + // required int32 name = 2; + public static final int NAME_FIELD_NUMBER = 2; + private int name_; + /** + * required int32 name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 name = 2; + */ + public int getName() { + return name_; + } + + // required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + public static final int TYPE_FIELD_NUMBER = 3; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() { + return type_; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() { + return type_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type varargElementType_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public boolean hasVarargElementType() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType() { + return varargElementType_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() { + return varargElementType_; + } + + private void initFields() { + flags_ = 0; + name_ = 0; + type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasName()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasType()) { + memoizedIsInitialized = 0; + return false; + } + if (!getType().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + if (hasVarargElementType()) { + if (!getVarargElementType().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (!extensionsAreInitialized()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + com.google.protobuf.GeneratedMessage + .ExtendableMessage.ExtensionWriter extensionWriter = + newExtensionWriter(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, flags_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeInt32(2, name_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeMessage(3, type_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeMessage(4, varargElementType_); + } + extensionWriter.writeUntil(200, output); + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, flags_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(2, name_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, type_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, varargElementType_); + } + size += extensionsSerializedSize(); + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.ExtendableBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, Builder> implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getTypeFieldBuilder(); + getVarargElementTypeFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + flags_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + name_ = 0; + bitField0_ = (bitField0_ & ~0x00000002); + if (typeBuilder_ == null) { + type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } else { + typeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + if (varargElementTypeBuilder_ == null) { + varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } else { + varargElementTypeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.flags_ = flags_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.name_ = name_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + if (typeBuilder_ == null) { + result.type_ = type_; + } else { + result.type_ = typeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + if (varargElementTypeBuilder_ == null) { + result.varargElementType_ = varargElementType_; + } else { + result.varargElementType_ = varargElementTypeBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance()) return this; + if (other.hasFlags()) { + setFlags(other.getFlags()); + } + if (other.hasName()) { + setName(other.getName()); + } + if (other.hasType()) { + mergeType(other.getType()); + } + if (other.hasVarargElementType()) { + mergeVarargElementType(other.getVarargElementType()); + } + this.mergeExtensionFields(other); + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasName()) { + + return false; + } + if (!hasType()) { + + return false; + } + if (!getType().isInitialized()) { + + return false; + } + if (hasVarargElementType()) { + if (!getVarargElementType().isInitialized()) { + + return false; + } + } + if (!extensionsAreInitialized()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 flags = 1; + private int flags_ ; + /** + * optional int32 flags = 1; + * + * 
+         *
+         *declaresDefault
+         *has_annotations
+         *
+ */ + public boolean hasFlags() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 flags = 1; + * + * 
+         *
+         *declaresDefault
+         *has_annotations
+         *
+ */ + public int getFlags() { + return flags_; + } + /** + * optional int32 flags = 1; + * + * 
+         *
+         *declaresDefault
+         *has_annotations
+         *
+ */ + public Builder setFlags(int value) { + bitField0_ |= 0x00000001; + flags_ = value; + onChanged(); + return this; + } + /** + * optional int32 flags = 1; + * + * 
+         *
+         *declaresDefault
+         *has_annotations
+         *
+ */ + public Builder clearFlags() { + bitField0_ = (bitField0_ & ~0x00000001); + flags_ = 0; + onChanged(); + return this; + } + + // required int32 name = 2; + private int name_ ; + /** + * required int32 name = 2; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * required int32 name = 2; + */ + public int getName() { + return name_; + } + /** + * required int32 name = 2; + */ + public Builder setName(int value) { + bitField0_ |= 0x00000002; + name_ = value; + onChanged(); + return this; + } + /** + * required int32 name = 2; + */ + public Builder clearName() { + bitField0_ = (bitField0_ & ~0x00000002); + name_ = 0; + onChanged(); + return this; + } + + // required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public boolean hasType() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() { + if (typeBuilder_ == null) { + return type_; + } else { + return typeBuilder_.getMessage(); + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (typeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + type_ = value; + onChanged(); + } else { + typeBuilder_.setMessage(value); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public Builder setType( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (typeBuilder_ == null) { + type_ = builderForValue.build(); + onChanged(); + } else { + typeBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (typeBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004) && + type_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { + type_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial(); + } else { + type_ = value; + } + onChanged(); + } else { + typeBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public Builder clearType() { + if (typeBuilder_ == null) { + type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + onChanged(); + } else { + typeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() { + bitField0_ |= 0x00000004; + onChanged(); + return getTypeFieldBuilder().getBuilder(); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() { + if (typeBuilder_ != null) { + return typeBuilder_.getMessageOrBuilder(); + } else { + return type_; + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> + getTypeFieldBuilder() { + if (typeBuilder_ == null) { + typeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( + type_, + getParentForChildren(), + isClean()); + type_ = null; + } + return typeBuilder_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> varargElementTypeBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public boolean hasVarargElementType() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType() { + if (varargElementTypeBuilder_ == null) { + return varargElementType_; + } else { + return varargElementTypeBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public Builder setVarargElementType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (varargElementTypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + varargElementType_ = value; + onChanged(); + } else { + varargElementTypeBuilder_.setMessage(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public Builder setVarargElementType( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (varargElementTypeBuilder_ == null) { + varargElementType_ = builderForValue.build(); + onChanged(); + } else { + varargElementTypeBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public Builder mergeVarargElementType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (varargElementTypeBuilder_ == null) { + if (((bitField0_ & 0x00000008) == 0x00000008) && + varargElementType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { + varargElementType_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial(); + } else { + varargElementType_ = value; + } + onChanged(); + } else { + varargElementTypeBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000008; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public Builder clearVarargElementType() { + if (varargElementTypeBuilder_ == null) { + varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + onChanged(); + } else { + varargElementTypeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000008); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getVarargElementTypeBuilder() { + bitField0_ |= 0x00000008; + onChanged(); + return getVarargElementTypeFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() { + if (varargElementTypeBuilder_ != null) { + return varargElementTypeBuilder_.getMessageOrBuilder(); + } else { + return varargElementType_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> + getVarargElementTypeFieldBuilder() { + if (varargElementTypeBuilder_ == null) { + varargElementTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( + varargElementType_, + getParentForChildren(), + isClean()); + varargElementType_ = null; + } + return varargElementTypeBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter) + } + + static { + defaultInstance = new ValueParameter(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter) + } + + private int bitField0_; + // optional int32 flags = 1; + public static final int FLAGS_FIELD_NUMBER = 1; + private int flags_; + /** + * optional int32 flags = 1; + * + * 
+     *
+     *Visibility
+     *Modality
+     *has_annotations
+     *CallableKind
+     *MemberKind
+     *hasGetter
+     *hasSetter
+     *
+ */ + public boolean hasFlags() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 flags = 1; + * + * 
+     *
+     *Visibility
+     *Modality
+     *has_annotations
+     *CallableKind
+     *MemberKind
+     *hasGetter
+     *hasSetter
+     *
+ */ + public int getFlags() { + return flags_; + } + + // optional string extra_visibility = 2; + public static final int EXTRA_VISIBILITY_FIELD_NUMBER = 2; + private java.lang.Object extraVisibility_; + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + public boolean hasExtraVisibility() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + public java.lang.String getExtraVisibility() { + java.lang.Object ref = extraVisibility_; + if (ref instanceof java.lang.String) { + return (java.lang.String) ref; + } else { + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + extraVisibility_ = s; + } + return s; + } + } + /** + * optional string extra_visibility = 2; + * + * 
+     * for things like java-specific visibilities
+     *
+ */ + public com.google.protobuf.ByteString + getExtraVisibilityBytes() { + java.lang.Object ref = extraVisibility_; + if (ref instanceof java.lang.String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + extraVisibility_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + + // optional int32 getter_flags = 9; + public static final int GETTER_FLAGS_FIELD_NUMBER = 9; + private int getterFlags_; + /** + * optional int32 getter_flags = 9; + * + * 
+     *
+     *isNotDefault
+     *Visibility
+     *Modality
+     *has_annotations
+     *
+ */ + public boolean hasGetterFlags() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 getter_flags = 9; + * + * 
+     *
+     *isNotDefault
+     *Visibility
+     *Modality
+     *has_annotations
+     *
+ */ + public int getGetterFlags() { + return getterFlags_; + } + + // optional int32 setter_flags = 10; + public static final int SETTER_FLAGS_FIELD_NUMBER = 10; + private int setterFlags_; + /** + * optional int32 setter_flags = 10; + */ + public boolean hasSetterFlags() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 setter_flags = 10; + */ + public int getSetterFlags() { + return setterFlags_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + public static final int TYPE_PARAMETER_FIELD_NUMBER = 4; + private java.util.List typeParameter_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public java.util.List getTypeParameterList() { + return typeParameter_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public java.util.List + getTypeParameterOrBuilderList() { + return typeParameter_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public int getTypeParameterCount() { + return typeParameter_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) { + return typeParameter_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( + int index) { + return typeParameter_.get(index); + } + + // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + public static final int RECEIVER_TYPE_FIELD_NUMBER = 5; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type receiverType_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public boolean hasReceiverType() { + return ((bitField0_ & 0x00000010) == 0x00000010); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType() { + return receiverType_; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() { + return receiverType_; + } + + // required int32 name = 6; + public static final int NAME_FIELD_NUMBER = 6; + private int name_; + /** + * required int32 name = 6; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + * required int32 name = 6; + */ + public int getName() { + return name_; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + public static final int VALUE_PARAMETER_FIELD_NUMBER = 7; + private java.util.List valueParameter_; + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + public java.util.List getValueParameterList() { + return valueParameter_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + public java.util.List + getValueParameterOrBuilderList() { + return valueParameter_; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + public int getValueParameterCount() { + return valueParameter_.size(); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) { + return valueParameter_.get(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+     * Value parameters for functions and constructors, or setter value parameter for properties
+     *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder( + int index) { + return valueParameter_.get(index); + } + + // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + public static final int RETURN_TYPE_FIELD_NUMBER = 8; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type returnType_; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public boolean hasReturnType() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType() { + return returnType_; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() { + return returnType_; + } + + private void initFields() { + flags_ = 0; + extraVisibility_ = ""; + getterFlags_ = 0; + setterFlags_ = 0; + typeParameter_ = java.util.Collections.emptyList(); + receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + name_ = 0; + valueParameter_ = java.util.Collections.emptyList(); + returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (!hasName()) { + memoizedIsInitialized = 0; + return false; + } + if (!hasReturnType()) { + memoizedIsInitialized = 0; + return false; + } + for (int i = 0; i < getTypeParameterCount(); i++) { + if (!getTypeParameter(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (hasReceiverType()) { + if (!getReceiverType().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + for (int i = 0; i < getValueParameterCount(); i++) { + if (!getValueParameter(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + if (!getReturnType().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + if (!extensionsAreInitialized()) { + memoizedIsInitialized = 0; + return false; + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + com.google.protobuf.GeneratedMessage + .ExtendableMessage.ExtensionWriter extensionWriter = + newExtensionWriter(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeInt32(1, flags_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeBytes(2, getExtraVisibilityBytes()); + } + for (int i = 0; i < typeParameter_.size(); i++) { + output.writeMessage(4, typeParameter_.get(i)); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + output.writeMessage(5, receiverType_); + } + if (((bitField0_ & 0x00000020) == 0x00000020)) { + output.writeInt32(6, name_); + } + for (int i = 0; i < valueParameter_.size(); i++) { + output.writeMessage(7, valueParameter_.get(i)); + } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + output.writeMessage(8, returnType_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + output.writeInt32(9, getterFlags_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + output.writeInt32(10, setterFlags_); + } + extensionWriter.writeUntil(200, output); + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(1, flags_); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeBytesSize(2, getExtraVisibilityBytes()); + } + for (int i = 0; i < typeParameter_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, typeParameter_.get(i)); + } + if (((bitField0_ & 0x00000010) == 0x00000010)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, receiverType_); + } + if (((bitField0_ & 0x00000020) == 0x00000020)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(6, name_); + } + for (int i = 0; i < valueParameter_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(7, valueParameter_.get(i)); + } + if (((bitField0_ & 0x00000040) == 0x00000040)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(8, returnType_); + } + if (((bitField0_ & 0x00000004) == 0x00000004)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(9, getterFlags_); + } + if (((bitField0_ & 0x00000008) == 0x00000008)) { + size += com.google.protobuf.CodedOutputStream + .computeInt32Size(10, setterFlags_); + } + size += extensionsSerializedSize(); + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = size; + return size; + } + + private static final long serialVersionUID = 0L; + @java.lang.Override + protected java.lang.Object writeReplace() + throws java.io.ObjectStreamException { + return super.writeReplace(); + } + + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.ExtendableBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, Builder> implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder.class); + } + + // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getTypeParameterFieldBuilder(); + getReceiverTypeFieldBuilder(); + getValueParameterFieldBuilder(); + getReturnTypeFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + flags_ = 0; + bitField0_ = (bitField0_ & ~0x00000001); + extraVisibility_ = ""; + bitField0_ = (bitField0_ & ~0x00000002); + getterFlags_ = 0; + bitField0_ = (bitField0_ & ~0x00000004); + setterFlags_ = 0; + bitField0_ = (bitField0_ & ~0x00000008); + if (typeParameterBuilder_ == null) { + typeParameter_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + } else { + typeParameterBuilder_.clear(); + } + if (receiverTypeBuilder_ == null) { + receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } else { + receiverTypeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000020); + name_ = 0; + bitField0_ = (bitField0_ & ~0x00000040); + if (valueParameterBuilder_ == null) { + valueParameter_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000080); + } else { + valueParameterBuilder_.clear(); + } + if (returnTypeBuilder_ == null) { + returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + } else { + returnTypeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000100); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getDefaultInstanceForType() { + return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable build() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable buildPartial() { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + result.flags_ = flags_; + if (((from_bitField0_ & 0x00000002) == 0x00000002)) { + to_bitField0_ |= 0x00000002; + } + result.extraVisibility_ = extraVisibility_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000004; + } + result.getterFlags_ = getterFlags_; + if (((from_bitField0_ & 0x00000008) == 0x00000008)) { + to_bitField0_ |= 0x00000008; + } + result.setterFlags_ = setterFlags_; + if (typeParameterBuilder_ == null) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { + typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); + bitField0_ = (bitField0_ & ~0x00000010); + } + result.typeParameter_ = typeParameter_; + } else { + result.typeParameter_ = typeParameterBuilder_.build(); + } + if (((from_bitField0_ & 0x00000020) == 0x00000020)) { + to_bitField0_ |= 0x00000010; + } + if (receiverTypeBuilder_ == null) { + result.receiverType_ = receiverType_; + } else { + result.receiverType_ = receiverTypeBuilder_.build(); + } + if (((from_bitField0_ & 0x00000040) == 0x00000040)) { + to_bitField0_ |= 0x00000020; + } + result.name_ = name_; + if (valueParameterBuilder_ == null) { + if (((bitField0_ & 0x00000080) == 0x00000080)) { + valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); + bitField0_ = (bitField0_ & ~0x00000080); + } + result.valueParameter_ = valueParameter_; + } else { + result.valueParameter_ = valueParameterBuilder_.build(); + } + if (((from_bitField0_ & 0x00000100) == 0x00000100)) { + to_bitField0_ |= 0x00000040; + } + if (returnTypeBuilder_ == null) { + result.returnType_ = returnType_; + } else { + result.returnType_ = returnTypeBuilder_.build(); + } + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable) { + return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable other) { + if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()) return this; + if (other.hasFlags()) { + setFlags(other.getFlags()); + } + if (other.hasExtraVisibility()) { + bitField0_ |= 0x00000002; + extraVisibility_ = other.extraVisibility_; + onChanged(); + } + if (other.hasGetterFlags()) { + setGetterFlags(other.getGetterFlags()); + } + if (other.hasSetterFlags()) { + setSetterFlags(other.getSetterFlags()); + } + if (typeParameterBuilder_ == null) { + if (!other.typeParameter_.isEmpty()) { + if (typeParameter_.isEmpty()) { + typeParameter_ = other.typeParameter_; + bitField0_ = (bitField0_ & ~0x00000010); + } else { + ensureTypeParameterIsMutable(); + typeParameter_.addAll(other.typeParameter_); + } + onChanged(); + } + } else { + if (!other.typeParameter_.isEmpty()) { + if (typeParameterBuilder_.isEmpty()) { + typeParameterBuilder_.dispose(); + typeParameterBuilder_ = null; + typeParameter_ = other.typeParameter_; + bitField0_ = (bitField0_ & ~0x00000010); + typeParameterBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getTypeParameterFieldBuilder() : null; + } else { + typeParameterBuilder_.addAllMessages(other.typeParameter_); + } + } + } + if (other.hasReceiverType()) { + mergeReceiverType(other.getReceiverType()); + } + if (other.hasName()) { + setName(other.getName()); + } + if (valueParameterBuilder_ == null) { + if (!other.valueParameter_.isEmpty()) { + if (valueParameter_.isEmpty()) { + valueParameter_ = other.valueParameter_; + bitField0_ = (bitField0_ & ~0x00000080); + } else { + ensureValueParameterIsMutable(); + valueParameter_.addAll(other.valueParameter_); + } + onChanged(); + } + } else { + if (!other.valueParameter_.isEmpty()) { + if (valueParameterBuilder_.isEmpty()) { + valueParameterBuilder_.dispose(); + valueParameterBuilder_ = null; + valueParameter_ = other.valueParameter_; + bitField0_ = (bitField0_ & ~0x00000080); + valueParameterBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getValueParameterFieldBuilder() : null; + } else { + valueParameterBuilder_.addAllMessages(other.valueParameter_); + } + } + } + if (other.hasReturnType()) { + mergeReturnType(other.getReturnType()); + } + this.mergeExtensionFields(other); + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (!hasName()) { + + return false; + } + if (!hasReturnType()) { + + return false; + } + for (int i = 0; i < getTypeParameterCount(); i++) { + if (!getTypeParameter(i).isInitialized()) { + + return false; + } + } + if (hasReceiverType()) { + if (!getReceiverType().isInitialized()) { + + return false; + } + } + for (int i = 0; i < getValueParameterCount(); i++) { + if (!getValueParameter(i).isInitialized()) { + + return false; + } + } + if (!getReturnType().isInitialized()) { + + return false; + } + if (!extensionsAreInitialized()) { + + return false; + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional int32 flags = 1; + private int flags_ ; + /** + * optional int32 flags = 1; + * + * 
+       *
+       *Visibility
+       *Modality
+       *has_annotations
+       *CallableKind
+       *MemberKind
+       *hasGetter
+       *hasSetter
+       *
+ */ + public boolean hasFlags() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * optional int32 flags = 1; + * + * 
+       *
+       *Visibility
+       *Modality
+       *has_annotations
+       *CallableKind
+       *MemberKind
+       *hasGetter
+       *hasSetter
+       *
+ */ + public int getFlags() { + return flags_; + } + /** + * optional int32 flags = 1; + * + * 
+       *
+       *Visibility
+       *Modality
+       *has_annotations
+       *CallableKind
+       *MemberKind
+       *hasGetter
+       *hasSetter
+       *
+ */ + public Builder setFlags(int value) { + bitField0_ |= 0x00000001; + flags_ = value; + onChanged(); + return this; + } + /** + * optional int32 flags = 1; + * + * 
+       *
+       *Visibility
+       *Modality
+       *has_annotations
+       *CallableKind
+       *MemberKind
+       *hasGetter
+       *hasSetter
+       *
+ */ + public Builder clearFlags() { + bitField0_ = (bitField0_ & ~0x00000001); + flags_ = 0; + onChanged(); + return this; + } + + // optional string extra_visibility = 2; + private java.lang.Object extraVisibility_ = ""; + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public boolean hasExtraVisibility() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public java.lang.String getExtraVisibility() { + java.lang.Object ref = extraVisibility_; + if (!(ref instanceof java.lang.String)) { + java.lang.String s = ((com.google.protobuf.ByteString) ref) + .toStringUtf8(); + extraVisibility_ = s; + return s; + } else { + return (java.lang.String) ref; + } + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public com.google.protobuf.ByteString + getExtraVisibilityBytes() { + java.lang.Object ref = extraVisibility_; + if (ref instanceof String) { + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); + extraVisibility_ = b; + return b; + } else { + return (com.google.protobuf.ByteString) ref; + } + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public Builder setExtraVisibility( + java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + extraVisibility_ = value; + onChanged(); + return this; + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public Builder clearExtraVisibility() { + bitField0_ = (bitField0_ & ~0x00000002); + extraVisibility_ = getDefaultInstance().getExtraVisibility(); + onChanged(); + return this; + } + /** + * optional string extra_visibility = 2; + * + * 
+       * for things like java-specific visibilities
+       *
+ */ + public Builder setExtraVisibilityBytes( + com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + bitField0_ |= 0x00000002; + extraVisibility_ = value; + onChanged(); + return this; + } + + // optional int32 getter_flags = 9; + private int getterFlags_ ; + /** + * optional int32 getter_flags = 9; + * + * 
+       *
+       *isNotDefault
+       *Visibility
+       *Modality
+       *has_annotations
+       *
+ */ + public boolean hasGetterFlags() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * optional int32 getter_flags = 9; + * + * 
+       *
+       *isNotDefault
+       *Visibility
+       *Modality
+       *has_annotations
+       *
+ */ + public int getGetterFlags() { + return getterFlags_; + } + /** + * optional int32 getter_flags = 9; + * + * 
+       *
+       *isNotDefault
+       *Visibility
+       *Modality
+       *has_annotations
+       *
+ */ + public Builder setGetterFlags(int value) { + bitField0_ |= 0x00000004; + getterFlags_ = value; + onChanged(); + return this; + } + /** + * optional int32 getter_flags = 9; + * + * 
+       *
+       *isNotDefault
+       *Visibility
+       *Modality
+       *has_annotations
+       *
+ */ + public Builder clearGetterFlags() { + bitField0_ = (bitField0_ & ~0x00000004); + getterFlags_ = 0; + onChanged(); + return this; + } + + // optional int32 setter_flags = 10; + private int setterFlags_ ; + /** + * optional int32 setter_flags = 10; + */ + public boolean hasSetterFlags() { + return ((bitField0_ & 0x00000008) == 0x00000008); + } + /** + * optional int32 setter_flags = 10; + */ + public int getSetterFlags() { + return setterFlags_; + } + /** + * optional int32 setter_flags = 10; + */ + public Builder setSetterFlags(int value) { + bitField0_ |= 0x00000008; + setterFlags_ = value; + onChanged(); + return this; + } + /** + * optional int32 setter_flags = 10; + */ + public Builder clearSetterFlags() { + bitField0_ = (bitField0_ & ~0x00000008); + setterFlags_ = 0; + onChanged(); + return this; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + private java.util.List typeParameter_ = + java.util.Collections.emptyList(); + private void ensureTypeParameterIsMutable() { + if (!((bitField0_ & 0x00000010) == 0x00000010)) { + typeParameter_ = new java.util.ArrayList(typeParameter_); + bitField0_ |= 0x00000010; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public java.util.List getTypeParameterList() { + if (typeParameterBuilder_ == null) { + return java.util.Collections.unmodifiableList(typeParameter_); + } else { + return typeParameterBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public int getTypeParameterCount() { + if (typeParameterBuilder_ == null) { + return typeParameter_.size(); + } else { + return typeParameterBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) { + if (typeParameterBuilder_ == null) { + return typeParameter_.get(index); + } else { + return typeParameterBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder setTypeParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { + if (typeParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTypeParameterIsMutable(); + typeParameter_.set(index, value); + onChanged(); + } else { + typeParameterBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder setTypeParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + typeParameter_.set(index, builderForValue.build()); + onChanged(); + } else { + typeParameterBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder addTypeParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { + if (typeParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTypeParameterIsMutable(); + typeParameter_.add(value); + onChanged(); + } else { + typeParameterBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder addTypeParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { + if (typeParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTypeParameterIsMutable(); + typeParameter_.add(index, value); + onChanged(); + } else { + typeParameterBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder addTypeParameter( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + typeParameter_.add(builderForValue.build()); + onChanged(); + } else { + typeParameterBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder addTypeParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + typeParameter_.add(index, builderForValue.build()); + onChanged(); + } else { + typeParameterBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder addAllTypeParameter( + java.lang.Iterable values) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + super.addAll(values, typeParameter_); + onChanged(); + } else { + typeParameterBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder clearTypeParameter() { + if (typeParameterBuilder_ == null) { + typeParameter_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + } else { + typeParameterBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public Builder removeTypeParameter(int index) { + if (typeParameterBuilder_ == null) { + ensureTypeParameterIsMutable(); + typeParameter_.remove(index); + onChanged(); + } else { + typeParameterBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder( + int index) { + return getTypeParameterFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( + int index) { + if (typeParameterBuilder_ == null) { + return typeParameter_.get(index); } else { + return typeParameterBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public java.util.List + getTypeParameterOrBuilderList() { + if (typeParameterBuilder_ != null) { + return typeParameterBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(typeParameter_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() { + return getTypeParameterFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder( + int index) { + return getTypeParameterFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; + */ + public java.util.List + getTypeParameterBuilderList() { + return getTypeParameterFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> + getTypeParameterFieldBuilder() { + if (typeParameterBuilder_ == null) { + typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder>( + typeParameter_, + ((bitField0_ & 0x00000010) == 0x00000010), + getParentForChildren(), + isClean()); + typeParameter_ = null; + } + return typeParameterBuilder_; + } + + // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_; + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public boolean hasReceiverType() { + return ((bitField0_ & 0x00000020) == 0x00000020); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType() { + if (receiverTypeBuilder_ == null) { + return receiverType_; + } else { + return receiverTypeBuilder_.getMessage(); + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public Builder setReceiverType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (receiverTypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + receiverType_ = value; + onChanged(); + } else { + receiverTypeBuilder_.setMessage(value); + } + bitField0_ |= 0x00000020; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public Builder setReceiverType( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (receiverTypeBuilder_ == null) { + receiverType_ = builderForValue.build(); + onChanged(); + } else { + receiverTypeBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000020; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public Builder mergeReceiverType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (receiverTypeBuilder_ == null) { + if (((bitField0_ & 0x00000020) == 0x00000020) && + receiverType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { + receiverType_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial(); + } else { + receiverType_ = value; + } + onChanged(); + } else { + receiverTypeBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000020; + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public Builder clearReceiverType() { + if (receiverTypeBuilder_ == null) { + receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + onChanged(); + } else { + receiverTypeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000020); + return this; + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() { + bitField0_ |= 0x00000020; + onChanged(); + return getReceiverTypeFieldBuilder().getBuilder(); + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() { + if (receiverTypeBuilder_ != null) { + return receiverTypeBuilder_.getMessageOrBuilder(); + } else { + return receiverType_; + } + } + /** + * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> + getReceiverTypeFieldBuilder() { + if (receiverTypeBuilder_ == null) { + receiverTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( + receiverType_, + getParentForChildren(), + isClean()); + receiverType_ = null; + } + return receiverTypeBuilder_; + } + + // required int32 name = 6; + private int name_ ; + /** + * required int32 name = 6; + */ + public boolean hasName() { + return ((bitField0_ & 0x00000040) == 0x00000040); + } + /** + * required int32 name = 6; + */ + public int getName() { + return name_; + } + /** + * required int32 name = 6; + */ + public Builder setName(int value) { + bitField0_ |= 0x00000040; + name_ = value; + onChanged(); + return this; + } + /** + * required int32 name = 6; + */ + public Builder clearName() { + bitField0_ = (bitField0_ & ~0x00000040); + name_ = 0; + onChanged(); + return this; + } + + // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + private java.util.List valueParameter_ = + java.util.Collections.emptyList(); + private void ensureValueParameterIsMutable() { + if (!((bitField0_ & 0x00000080) == 0x00000080)) { + valueParameter_ = new java.util.ArrayList(valueParameter_); + bitField0_ |= 0x00000080; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder> valueParameterBuilder_; + + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public java.util.List getValueParameterList() { + if (valueParameterBuilder_ == null) { + return java.util.Collections.unmodifiableList(valueParameter_); + } else { + return valueParameterBuilder_.getMessageList(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public int getValueParameterCount() { + if (valueParameterBuilder_ == null) { + return valueParameter_.size(); + } else { + return valueParameterBuilder_.getCount(); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) { + if (valueParameterBuilder_ == null) { + return valueParameter_.get(index); + } else { + return valueParameterBuilder_.getMessage(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder setValueParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) { + if (valueParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureValueParameterIsMutable(); + valueParameter_.set(index, value); + onChanged(); + } else { + valueParameterBuilder_.setMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder setValueParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) { + if (valueParameterBuilder_ == null) { + ensureValueParameterIsMutable(); + valueParameter_.set(index, builderForValue.build()); + onChanged(); + } else { + valueParameterBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder addValueParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) { + if (valueParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureValueParameterIsMutable(); + valueParameter_.add(value); + onChanged(); + } else { + valueParameterBuilder_.addMessage(value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder addValueParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) { + if (valueParameterBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureValueParameterIsMutable(); + valueParameter_.add(index, value); + onChanged(); + } else { + valueParameterBuilder_.addMessage(index, value); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder addValueParameter( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) { + if (valueParameterBuilder_ == null) { + ensureValueParameterIsMutable(); + valueParameter_.add(builderForValue.build()); + onChanged(); + } else { + valueParameterBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder addValueParameter( + int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) { + if (valueParameterBuilder_ == null) { + ensureValueParameterIsMutable(); + valueParameter_.add(index, builderForValue.build()); + onChanged(); + } else { + valueParameterBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder addAllValueParameter( + java.lang.Iterable values) { + if (valueParameterBuilder_ == null) { + ensureValueParameterIsMutable(); + super.addAll(values, valueParameter_); + onChanged(); + } else { + valueParameterBuilder_.addAllMessages(values); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder clearValueParameter() { + if (valueParameterBuilder_ == null) { + valueParameter_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000080); + onChanged(); + } else { + valueParameterBuilder_.clear(); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public Builder removeValueParameter(int index) { + if (valueParameterBuilder_ == null) { + ensureValueParameterIsMutable(); + valueParameter_.remove(index); + onChanged(); + } else { + valueParameterBuilder_.remove(index); + } + return this; + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder getValueParameterBuilder( + int index) { + return getValueParameterFieldBuilder().getBuilder(index); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder( + int index) { + if (valueParameterBuilder_ == null) { + return valueParameter_.get(index); } else { + return valueParameterBuilder_.getMessageOrBuilder(index); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public java.util.List + getValueParameterOrBuilderList() { + if (valueParameterBuilder_ != null) { + return valueParameterBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(valueParameter_); + } + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder() { + return getValueParameterFieldBuilder().addBuilder( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder( + int index) { + return getValueParameterFieldBuilder().addBuilder( + index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance()); + } + /** + * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; + * + * 
+       * Value parameters for functions and constructors, or setter value parameter for properties
+       *
+ */ + public java.util.List + getValueParameterBuilderList() { + return getValueParameterFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder> + getValueParameterFieldBuilder() { + if (valueParameterBuilder_ == null) { + valueParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder>( + valueParameter_, + ((bitField0_ & 0x00000080) == 0x00000080), + getParentForChildren(), + isClean()); + valueParameter_ = null; + } + return valueParameterBuilder_; + } + + // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_; + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public boolean hasReturnType() { + return ((bitField0_ & 0x00000100) == 0x00000100); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType() { + if (returnTypeBuilder_ == null) { + return returnType_; + } else { + return returnTypeBuilder_.getMessage(); + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public Builder setReturnType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (returnTypeBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + returnType_ = value; + onChanged(); + } else { + returnTypeBuilder_.setMessage(value); + } + bitField0_ |= 0x00000100; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public Builder setReturnType( + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { + if (returnTypeBuilder_ == null) { + returnType_ = builderForValue.build(); + onChanged(); + } else { + returnTypeBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000100; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public Builder mergeReturnType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { + if (returnTypeBuilder_ == null) { + if (((bitField0_ & 0x00000100) == 0x00000100) && + returnType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { + returnType_ = + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial(); + } else { + returnType_ = value; + } + onChanged(); + } else { + returnTypeBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000100; + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public Builder clearReturnType() { + if (returnTypeBuilder_ == null) { + returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); + onChanged(); + } else { + returnTypeBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000100); + return this; + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() { + bitField0_ |= 0x00000100; + onChanged(); + return getReturnTypeFieldBuilder().getBuilder(); + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() { + if (returnTypeBuilder_ != null) { + return returnTypeBuilder_.getMessageOrBuilder(); + } else { + return returnType_; + } + } + /** + * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; + */ + private com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> + getReturnTypeFieldBuilder() { + if (returnTypeBuilder_ == null) { + returnTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( + returnType_, + getParentForChildren(), + isClean()); + returnType_ = null; + } + return returnTypeBuilder_; + } + + // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Callable) + } + + static { + defaultInstance = new Callable(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Callable) + } + + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable; + + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { + return descriptor; + } + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; + static { + java.lang.String[] descriptorData = { + "\n;compiler/frontend/serialization/src/de" + + "scriptors.debug.proto\022+org.jetbrains.jet" + + ".descriptors.serialization\"\037\n\017SimpleName" + + "Table\022\014\n\004name\030\001 \003(\t\"\317\002\n\022QualifiedNameTab" + + "le\022e\n\016qualified_name\030\001 \003(\0132M.org.jetbrai" + + "ns.jet.descriptors.serialization.Qualifi" + + "edNameTable.QualifiedName\032\321\001\n\rQualifiedN" + + "ame\022!\n\025parent_qualified_name\030\001 \001(\005:\002-1\022\022" + + "\n\nshort_name\030\002 \002(\005\022i\n\004kind\030\003 \001(\0162R.org.j" + + "etbrains.jet.descriptors.serialization.Q", + "ualifiedNameTable.QualifiedName.Kind:\007PA" + + "CKAGE\"\036\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\"\263\004" + + "\n\004Type\022R\n\013constructor\030\001 \002(\0132=.org.jetbra" + + "ins.jet.descriptors.serialization.Type.C" + + "onstructor\022L\n\010argument\030\002 \003(\0132:.org.jetbr" + + "ains.jet.descriptors.serialization.Type." + + "Argument\022\027\n\010nullable\030\003 \001(\010:\005false\032\231\001\n\013Co" + + "nstructor\022W\n\004kind\030\001 \001(\0162B.org.jetbrains." + + "jet.descriptors.serialization.Type.Const" + + "ructor.Kind:\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t", + "\n\005CLASS\020\000\022\022\n\016TYPE_PARAMETER\020\001\032\323\001\n\010Argume" + + "nt\022^\n\nprojection\030\001 \001(\0162E.org.jetbrains.j" + + "et.descriptors.serialization.Type.Argume" + + "nt.Projection:\003INV\022?\n\004type\030\002 \002(\01321.org.j" + + "etbrains.jet.descriptors.serialization.T" + + "ype\"&\n\nProjection\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003IN" + + "V\020\002\"\213\002\n\rTypeParameter\022\n\n\002id\030\001 \002(\005\022\014\n\004nam" + + "e\030\002 \002(\005\022\026\n\007reified\030\003 \001(\010:\005false\022Z\n\010varia" + + "nce\030\004 \001(\0162C.org.jetbrains.jet.descriptor" + + "s.serialization.TypeParameter.Variance:\003", + "INV\022F\n\013upper_bound\030\005 \003(\01321.org.jetbrains" + + ".jet.descriptors.serialization.Type\"$\n\010V" + + "ariance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\254\006\n\005Cl" + + "ass\022\020\n\005flags\030\001 \001(\005:\0010\022\030\n\020extra_visibilit" + + "y\030\002 \001(\t\022\017\n\007fq_name\030\003 \002(\005\022T\n\014class_object" + + "\030\004 \001(\0132>.org.jetbrains.jet.descriptors.s" + + "erialization.Class.ClassObject\022R\n\016type_p" + + "arameter\030\005 \003(\0132:.org.jetbrains.jet.descr" + + "iptors.serialization.TypeParameter\022D\n\tsu" + + "pertype\030\006 \003(\01321.org.jetbrains.jet.descri", + "ptors.serialization.Type\022\031\n\021nested_class" + + "_name\030\007 \003(\005\022E\n\006member\030\013 \003(\01325.org.jetbra" + + "ins.jet.descriptors.serialization.Callab" + + "le\022\022\n\nenum_entry\030\014 \003(\005\022b\n\023primary_constr" + + "uctor\030\r \001(\0132E.org.jetbrains.jet.descript" + + "ors.serialization.Class.PrimaryConstruct" + + "or\032O\n\013ClassObject\022@\n\004data\030\001 \001(\01322.org.je" + + "tbrains.jet.descriptors.serialization.Cl" + + "ass\032Y\n\022PrimaryConstructor\022C\n\004data\030\001 \001(\0132" + + "5.org.jetbrains.jet.descriptors.serializ", + "ation.Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRA" + + "IT\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020" + + "ANNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_" + + "OBJECT\020\006\"P\n\007Package\022E\n\006member\030\001 \003(\01325.or" + + "g.jetbrains.jet.descriptors.serializatio" + + "n.Callable\"\220\006\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\030" + + "\n\020extra_visibility\030\002 \001(\t\022\024\n\014getter_flags" + + "\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022R\n\016type_par" + + "ameter\030\004 \003(\0132:.org.jetbrains.jet.descrip" + + "tors.serialization.TypeParameter\022H\n\rrece", + "iver_type\030\005 \001(\01321.org.jetbrains.jet.desc" + + "riptors.serialization.Type\022\014\n\004name\030\006 \002(\005" + + "\022]\n\017value_parameter\030\007 \003(\0132D.org.jetbrain" + + "s.jet.descriptors.serialization.Callable" + + ".ValueParameter\022F\n\013return_type\030\010 \002(\01321.o" + + "rg.jetbrains.jet.descriptors.serializati" + + "on.Type\032\305\001\n\016ValueParameter\022\r\n\005flags\030\001 \001(" + + "\005\022\014\n\004name\030\002 \002(\005\022?\n\004type\030\003 \002(\01321.org.jetb" + + "rains.jet.descriptors.serialization.Type" + + "\022N\n\023vararg_element_type\030\004 \001(\01321.org.jetb", + "rains.jet.descriptors.serialization.Type" + + "*\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021" + + "\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYN" + + "THESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003V" + + "AL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n" + + "\010Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRA" + + "CT\020\002*M\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIV" + + "ATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\t\n\005EXTR" + + "A\020\004B\022B\rDebugProtoBuf\210\001\000" + }; + com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = + new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor, + new java.lang.String[] { "Name", }); + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor = + getDescriptor().getMessageTypes().get(1); + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor, + new java.lang.String[] { "QualifiedName", }); + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor = + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor.getNestedTypes().get(0); + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor, + new java.lang.String[] { "ParentQualifiedName", "ShortName", "Kind", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor = + getDescriptor().getMessageTypes().get(2); + internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor, + new java.lang.String[] { "Constructor", "Argument", "Nullable", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor = + internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor.getNestedTypes().get(0); + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor, + new java.lang.String[] { "Kind", "Id", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor = + internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor.getNestedTypes().get(1); + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor, + new java.lang.String[] { "Projection", "Type", }); + internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor = + getDescriptor().getMessageTypes().get(3); + internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor, + new java.lang.String[] { "Id", "Name", "Reified", "Variance", "UpperBound", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor = + getDescriptor().getMessageTypes().get(4); + internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor, + new java.lang.String[] { "Flags", "ExtraVisibility", "FqName", "ClassObject", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor = + internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor.getNestedTypes().get(0); + internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor, + new java.lang.String[] { "Data", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor = + internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor.getNestedTypes().get(1); + internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor, + new java.lang.String[] { "Data", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor = + getDescriptor().getMessageTypes().get(5); + internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor, + new java.lang.String[] { "Member", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor = + getDescriptor().getMessageTypes().get(6); + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor, + new java.lang.String[] { "Flags", "ExtraVisibility", "GetterFlags", "SetterFlags", "TypeParameter", "ReceiverType", "Name", "ValueParameter", "ReturnType", }); + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor = + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor.getNestedTypes().get(0); + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor, + new java.lang.String[] { "Flags", "Name", "Type", "VarargElementType", }); + return null; + } + }; + com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }, assigner); + } + + // @@protoc_insertion_point(outer_class_scope) +} From d17092b6e428c82dad979bf280fbd1d41c11f8ee Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 5 Mar 2014 20:09:48 +0400 Subject: [PATCH 0061/1557] Move DebugProtoBuf to module "compiler-tests" To help debug serialization-related code in compiler tests Original commit: 64ac2238952e73c9cbf72ec8a3254c8ef2e45990 --- jps/jps-plugin/jps-plugin.iml | 1 + .../serialization/DebugJavaProtoBuf.java | 3883 ----- .../serialization/DebugProtoBuf.java | 14006 ---------------- 3 files changed, 1 insertion(+), 17889 deletions(-) delete mode 100644 jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java delete mode 100644 jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 4f321f16eb3..37590a836e4 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -16,6 +16,7 @@ + diff --git a/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java b/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java deleted file mode 100644 index 69e40086b29..00000000000 --- a/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugJavaProtoBuf.java +++ /dev/null @@ -1,3883 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: core/serialization.java/src/java_descriptors.debug.proto - -package org.jetbrains.jet.descriptors.serialization; - -public final class DebugJavaProtoBuf { - private DebugJavaProtoBuf() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.methodSignature); - registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.propertySignature); - registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.implClassName); - registry.add(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.index); - } - public interface JavaTypeOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - * - * 
-     * One of these should be present
-     *
- */ - boolean hasPrimitiveType(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - * - * 
-     * One of these should be present
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType(); - - // optional int32 class_fq_name = 2; - /** - * optional int32 class_fq_name = 2; - */ - boolean hasClassFqName(); - /** - * optional int32 class_fq_name = 2; - */ - int getClassFqName(); - - // optional int32 array_dimension = 3 [default = 0]; - /** - * optional int32 array_dimension = 3 [default = 0]; - */ - boolean hasArrayDimension(); - /** - * optional int32 array_dimension = 3 [default = 0]; - */ - int getArrayDimension(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaType} - */ - public static final class JavaType extends - com.google.protobuf.GeneratedMessage - implements JavaTypeOrBuilder { - // Use JavaType.newBuilder() to construct. - private JavaType(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private JavaType(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final JavaType defaultInstance; - public static JavaType getDefaultInstance() { - return defaultInstance; - } - - public JavaType getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private JavaType( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType value = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - primitiveType_ = value; - } - break; - } - case 16: { - bitField0_ |= 0x00000002; - classFqName_ = input.readInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - arrayDimension_ = input.readInt32(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public JavaType parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new JavaType(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType} - */ - public enum PrimitiveType - implements com.google.protobuf.ProtocolMessageEnum { - /** - * VOID = 0; - * - * 
-       * These values correspond to ASM Type sorts
-       *
- */ - VOID(0, 0), - /** - * BOOLEAN = 1; - */ - BOOLEAN(1, 1), - /** - * CHAR = 2; - */ - CHAR(2, 2), - /** - * BYTE = 3; - */ - BYTE(3, 3), - /** - * SHORT = 4; - */ - SHORT(4, 4), - /** - * INT = 5; - */ - INT(5, 5), - /** - * FLOAT = 6; - */ - FLOAT(6, 6), - /** - * LONG = 7; - */ - LONG(7, 7), - /** - * DOUBLE = 8; - */ - DOUBLE(8, 8), - ; - - /** - * VOID = 0; - * - * 
-       * These values correspond to ASM Type sorts
-       *
- */ - public static final int VOID_VALUE = 0; - /** - * BOOLEAN = 1; - */ - public static final int BOOLEAN_VALUE = 1; - /** - * CHAR = 2; - */ - public static final int CHAR_VALUE = 2; - /** - * BYTE = 3; - */ - public static final int BYTE_VALUE = 3; - /** - * SHORT = 4; - */ - public static final int SHORT_VALUE = 4; - /** - * INT = 5; - */ - public static final int INT_VALUE = 5; - /** - * FLOAT = 6; - */ - public static final int FLOAT_VALUE = 6; - /** - * LONG = 7; - */ - public static final int LONG_VALUE = 7; - /** - * DOUBLE = 8; - */ - public static final int DOUBLE_VALUE = 8; - - - public final int getNumber() { return value; } - - public static PrimitiveType valueOf(int value) { - switch (value) { - case 0: return VOID; - case 1: return BOOLEAN; - case 2: return CHAR; - case 3: return BYTE; - case 4: return SHORT; - case 5: return INT; - case 6: return FLOAT; - case 7: return LONG; - case 8: return DOUBLE; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public PrimitiveType findValueByNumber(int number) { - return PrimitiveType.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDescriptor().getEnumTypes().get(0); - } - - private static final PrimitiveType[] VALUES = values(); - - public static PrimitiveType valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private PrimitiveType(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType) - } - - private int bitField0_; - // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - public static final int PRIMITIVE_TYPE_FIELD_NUMBER = 1; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType primitiveType_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - * - * 
-     * One of these should be present
-     *
- */ - public boolean hasPrimitiveType() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - * - * 
-     * One of these should be present
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType() { - return primitiveType_; - } - - // optional int32 class_fq_name = 2; - public static final int CLASS_FQ_NAME_FIELD_NUMBER = 2; - private int classFqName_; - /** - * optional int32 class_fq_name = 2; - */ - public boolean hasClassFqName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional int32 class_fq_name = 2; - */ - public int getClassFqName() { - return classFqName_; - } - - // optional int32 array_dimension = 3 [default = 0]; - public static final int ARRAY_DIMENSION_FIELD_NUMBER = 3; - private int arrayDimension_; - /** - * optional int32 array_dimension = 3 [default = 0]; - */ - public boolean hasArrayDimension() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional int32 array_dimension = 3 [default = 0]; - */ - public int getArrayDimension() { - return arrayDimension_; - } - - private void initFields() { - primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID; - classFqName_ = 0; - arrayDimension_ = 0; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeEnum(1, primitiveType_.getNumber()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeInt32(2, classFqName_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeInt32(3, arrayDimension_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(1, primitiveType_.getNumber()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, classFqName_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, arrayDimension_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaType} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID; - bitField0_ = (bitField0_ & ~0x00000001); - classFqName_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); - arrayDimension_ = 0; - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType build() { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.primitiveType_ = primitiveType_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.classFqName_ = classFqName_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.arrayDimension_ = arrayDimension_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) return this; - if (other.hasPrimitiveType()) { - setPrimitiveType(other.getPrimitiveType()); - } - if (other.hasClassFqName()) { - setClassFqName(other.getClassFqName()); - } - if (other.hasArrayDimension()) { - setArrayDimension(other.getArrayDimension()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - * - * 
-       * One of these should be present
-       *
- */ - public boolean hasPrimitiveType() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - * - * 
-       * One of these should be present
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType getPrimitiveType() { - return primitiveType_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - * - * 
-       * One of these should be present
-       *
- */ - public Builder setPrimitiveType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - primitiveType_ = value; - onChanged(); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaType.PrimitiveType primitive_type = 1; - * - * 
-       * One of these should be present
-       *
- */ - public Builder clearPrimitiveType() { - bitField0_ = (bitField0_ & ~0x00000001); - primitiveType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PrimitiveType.VOID; - onChanged(); - return this; - } - - // optional int32 class_fq_name = 2; - private int classFqName_ ; - /** - * optional int32 class_fq_name = 2; - */ - public boolean hasClassFqName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional int32 class_fq_name = 2; - */ - public int getClassFqName() { - return classFqName_; - } - /** - * optional int32 class_fq_name = 2; - */ - public Builder setClassFqName(int value) { - bitField0_ |= 0x00000002; - classFqName_ = value; - onChanged(); - return this; - } - /** - * optional int32 class_fq_name = 2; - */ - public Builder clearClassFqName() { - bitField0_ = (bitField0_ & ~0x00000002); - classFqName_ = 0; - onChanged(); - return this; - } - - // optional int32 array_dimension = 3 [default = 0]; - private int arrayDimension_ ; - /** - * optional int32 array_dimension = 3 [default = 0]; - */ - public boolean hasArrayDimension() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional int32 array_dimension = 3 [default = 0]; - */ - public int getArrayDimension() { - return arrayDimension_; - } - /** - * optional int32 array_dimension = 3 [default = 0]; - */ - public Builder setArrayDimension(int value) { - bitField0_ |= 0x00000004; - arrayDimension_ = value; - onChanged(); - return this; - } - /** - * optional int32 array_dimension = 3 [default = 0]; - */ - public Builder clearArrayDimension() { - bitField0_ = (bitField0_ & ~0x00000004); - arrayDimension_ = 0; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaType) - } - - static { - defaultInstance = new JavaType(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaType) - } - - public interface JavaMethodSignatureOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // required int32 name = 1; - /** - * required int32 name = 1; - */ - boolean hasName(); - /** - * required int32 name = 1; - */ - int getName(); - - // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - boolean hasReturnType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder(); - - // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - java.util.List - getParameterTypeList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - int getParameterTypeCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - java.util.List - getParameterTypeOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder( - int index); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaMethodSignature} - */ - public static final class JavaMethodSignature extends - com.google.protobuf.GeneratedMessage - implements JavaMethodSignatureOrBuilder { - // Use JavaMethodSignature.newBuilder() to construct. - private JavaMethodSignature(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private JavaMethodSignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final JavaMethodSignature defaultInstance; - public static JavaMethodSignature getDefaultInstance() { - return defaultInstance; - } - - public JavaMethodSignature getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private JavaMethodSignature( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - name_ = input.readInt32(); - break; - } - case 18: { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = returnType_.toBuilder(); - } - returnType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(returnType_); - returnType_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - parameterType_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000004; - } - parameterType_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry)); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - parameterType_ = java.util.Collections.unmodifiableList(parameterType_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public JavaMethodSignature parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new JavaMethodSignature(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // required int32 name = 1; - public static final int NAME_FIELD_NUMBER = 1; - private int name_; - /** - * required int32 name = 1; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required int32 name = 1; - */ - public int getName() { - return name_; - } - - // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - public static final int RETURN_TYPE_FIELD_NUMBER = 2; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType returnType_; - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public boolean hasReturnType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType() { - return returnType_; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder() { - return returnType_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - public static final int PARAMETER_TYPE_FIELD_NUMBER = 3; - private java.util.List parameterType_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public java.util.List getParameterTypeList() { - return parameterType_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public java.util.List - getParameterTypeOrBuilderList() { - return parameterType_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public int getParameterTypeCount() { - return parameterType_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index) { - return parameterType_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder( - int index) { - return parameterType_.get(index); - } - - private void initFields() { - name_ = 0; - returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - parameterType_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasName()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasReturnType()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, name_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, returnType_); - } - for (int i = 0; i < parameterType_.size(); i++) { - output.writeMessage(3, parameterType_.get(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, name_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, returnType_); - } - for (int i = 0; i < parameterType_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, parameterType_.get(i)); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaMethodSignature} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getReturnTypeFieldBuilder(); - getParameterTypeFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - name_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); - if (returnTypeBuilder_ == null) { - returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - } else { - returnTypeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - if (parameterTypeBuilder_ == null) { - parameterType_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); - } else { - parameterTypeBuilder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature build() { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.name_ = name_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - if (returnTypeBuilder_ == null) { - result.returnType_ = returnType_; - } else { - result.returnType_ = returnTypeBuilder_.build(); - } - if (parameterTypeBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { - parameterType_ = java.util.Collections.unmodifiableList(parameterType_); - bitField0_ = (bitField0_ & ~0x00000004); - } - result.parameterType_ = parameterType_; - } else { - result.parameterType_ = parameterTypeBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) return this; - if (other.hasName()) { - setName(other.getName()); - } - if (other.hasReturnType()) { - mergeReturnType(other.getReturnType()); - } - if (parameterTypeBuilder_ == null) { - if (!other.parameterType_.isEmpty()) { - if (parameterType_.isEmpty()) { - parameterType_ = other.parameterType_; - bitField0_ = (bitField0_ & ~0x00000004); - } else { - ensureParameterTypeIsMutable(); - parameterType_.addAll(other.parameterType_); - } - onChanged(); - } - } else { - if (!other.parameterType_.isEmpty()) { - if (parameterTypeBuilder_.isEmpty()) { - parameterTypeBuilder_.dispose(); - parameterTypeBuilder_ = null; - parameterType_ = other.parameterType_; - bitField0_ = (bitField0_ & ~0x00000004); - parameterTypeBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getParameterTypeFieldBuilder() : null; - } else { - parameterTypeBuilder_.addAllMessages(other.parameterType_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasName()) { - - return false; - } - if (!hasReturnType()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // required int32 name = 1; - private int name_ ; - /** - * required int32 name = 1; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required int32 name = 1; - */ - public int getName() { - return name_; - } - /** - * required int32 name = 1; - */ - public Builder setName(int value) { - bitField0_ |= 0x00000001; - name_ = value; - onChanged(); - return this; - } - /** - * required int32 name = 1; - */ - public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; - onChanged(); - return this; - } - - // required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> returnTypeBuilder_; - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public boolean hasReturnType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getReturnType() { - if (returnTypeBuilder_ == null) { - return returnType_; - } else { - return returnTypeBuilder_.getMessage(); - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public Builder setReturnType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { - if (returnTypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - returnType_ = value; - onChanged(); - } else { - returnTypeBuilder_.setMessage(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public Builder setReturnType( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { - if (returnTypeBuilder_ == null) { - returnType_ = builderForValue.build(); - onChanged(); - } else { - returnTypeBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public Builder mergeReturnType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { - if (returnTypeBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - returnType_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) { - returnType_ = - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder(returnType_).mergeFrom(value).buildPartial(); - } else { - returnType_ = value; - } - onChanged(); - } else { - returnTypeBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public Builder clearReturnType() { - if (returnTypeBuilder_ == null) { - returnType_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - onChanged(); - } else { - returnTypeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getReturnTypeBuilder() { - bitField0_ |= 0x00000002; - onChanged(); - return getReturnTypeFieldBuilder().getBuilder(); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getReturnTypeOrBuilder() { - if (returnTypeBuilder_ != null) { - return returnTypeBuilder_.getMessageOrBuilder(); - } else { - return returnType_; - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType return_type = 2; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> - getReturnTypeFieldBuilder() { - if (returnTypeBuilder_ == null) { - returnTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>( - returnType_, - getParentForChildren(), - isClean()); - returnType_ = null; - } - return returnTypeBuilder_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - private java.util.List parameterType_ = - java.util.Collections.emptyList(); - private void ensureParameterTypeIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { - parameterType_ = new java.util.ArrayList(parameterType_); - bitField0_ |= 0x00000004; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> parameterTypeBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public java.util.List getParameterTypeList() { - if (parameterTypeBuilder_ == null) { - return java.util.Collections.unmodifiableList(parameterType_); - } else { - return parameterTypeBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public int getParameterTypeCount() { - if (parameterTypeBuilder_ == null) { - return parameterType_.size(); - } else { - return parameterTypeBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getParameterType(int index) { - if (parameterTypeBuilder_ == null) { - return parameterType_.get(index); - } else { - return parameterTypeBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder setParameterType( - int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { - if (parameterTypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureParameterTypeIsMutable(); - parameterType_.set(index, value); - onChanged(); - } else { - parameterTypeBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder setParameterType( - int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { - if (parameterTypeBuilder_ == null) { - ensureParameterTypeIsMutable(); - parameterType_.set(index, builderForValue.build()); - onChanged(); - } else { - parameterTypeBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder addParameterType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { - if (parameterTypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureParameterTypeIsMutable(); - parameterType_.add(value); - onChanged(); - } else { - parameterTypeBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder addParameterType( - int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { - if (parameterTypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureParameterTypeIsMutable(); - parameterType_.add(index, value); - onChanged(); - } else { - parameterTypeBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder addParameterType( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { - if (parameterTypeBuilder_ == null) { - ensureParameterTypeIsMutable(); - parameterType_.add(builderForValue.build()); - onChanged(); - } else { - parameterTypeBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder addParameterType( - int index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { - if (parameterTypeBuilder_ == null) { - ensureParameterTypeIsMutable(); - parameterType_.add(index, builderForValue.build()); - onChanged(); - } else { - parameterTypeBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder addAllParameterType( - java.lang.Iterable values) { - if (parameterTypeBuilder_ == null) { - ensureParameterTypeIsMutable(); - super.addAll(values, parameterType_); - onChanged(); - } else { - parameterTypeBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder clearParameterType() { - if (parameterTypeBuilder_ == null) { - parameterType_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000004); - onChanged(); - } else { - parameterTypeBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public Builder removeParameterType(int index) { - if (parameterTypeBuilder_ == null) { - ensureParameterTypeIsMutable(); - parameterType_.remove(index); - onChanged(); - } else { - parameterTypeBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getParameterTypeBuilder( - int index) { - return getParameterTypeFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getParameterTypeOrBuilder( - int index) { - if (parameterTypeBuilder_ == null) { - return parameterType_.get(index); } else { - return parameterTypeBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public java.util.List - getParameterTypeOrBuilderList() { - if (parameterTypeBuilder_ != null) { - return parameterTypeBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(parameterType_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder addParameterTypeBuilder() { - return getParameterTypeFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder addParameterTypeBuilder( - int index) { - return getParameterTypeFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.JavaType parameter_type = 3; - */ - public java.util.List - getParameterTypeBuilderList() { - return getParameterTypeFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> - getParameterTypeFieldBuilder() { - if (parameterTypeBuilder_ == null) { - parameterTypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>( - parameterType_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); - parameterType_ = null; - } - return parameterTypeBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaMethodSignature) - } - - static { - defaultInstance = new JavaMethodSignature(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaMethodSignature) - } - - public interface JavaFieldSignatureOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // required int32 name = 1; - /** - * required int32 name = 1; - */ - boolean hasName(); - /** - * required int32 name = 1; - */ - int getName(); - - // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - boolean hasType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder(); - - // optional bool is_static_in_outer = 3 [default = false]; - /** - * optional bool is_static_in_outer = 3 [default = false]; - * - * 
-     * True iff this field is a backing field for a class object and is really present as a static
-     * field in the outer class, not as an instance field here
-     *
- */ - boolean hasIsStaticInOuter(); - /** - * optional bool is_static_in_outer = 3 [default = false]; - * - * 
-     * True iff this field is a backing field for a class object and is really present as a static
-     * field in the outer class, not as an instance field here
-     *
- */ - boolean getIsStaticInOuter(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaFieldSignature} - */ - public static final class JavaFieldSignature extends - com.google.protobuf.GeneratedMessage - implements JavaFieldSignatureOrBuilder { - // Use JavaFieldSignature.newBuilder() to construct. - private JavaFieldSignature(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private JavaFieldSignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final JavaFieldSignature defaultInstance; - public static JavaFieldSignature getDefaultInstance() { - return defaultInstance; - } - - public JavaFieldSignature getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private JavaFieldSignature( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - name_ = input.readInt32(); - break; - } - case 18: { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = type_.toBuilder(); - } - type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(type_); - type_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 24: { - bitField0_ |= 0x00000004; - isStaticInOuter_ = input.readBool(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public JavaFieldSignature parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new JavaFieldSignature(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // required int32 name = 1; - public static final int NAME_FIELD_NUMBER = 1; - private int name_; - /** - * required int32 name = 1; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required int32 name = 1; - */ - public int getName() { - return name_; - } - - // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - public static final int TYPE_FIELD_NUMBER = 2; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType type_; - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType() { - return type_; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder() { - return type_; - } - - // optional bool is_static_in_outer = 3 [default = false]; - public static final int IS_STATIC_IN_OUTER_FIELD_NUMBER = 3; - private boolean isStaticInOuter_; - /** - * optional bool is_static_in_outer = 3 [default = false]; - * - * 
-     * True iff this field is a backing field for a class object and is really present as a static
-     * field in the outer class, not as an instance field here
-     *
- */ - public boolean hasIsStaticInOuter() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional bool is_static_in_outer = 3 [default = false]; - * - * 
-     * True iff this field is a backing field for a class object and is really present as a static
-     * field in the outer class, not as an instance field here
-     *
- */ - public boolean getIsStaticInOuter() { - return isStaticInOuter_; - } - - private void initFields() { - name_ = 0; - type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - isStaticInOuter_ = false; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasName()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasType()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, name_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, type_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, isStaticInOuter_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, name_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, type_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, isStaticInOuter_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaFieldSignature} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getTypeFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - name_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); - if (typeBuilder_ == null) { - type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - } else { - typeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - isStaticInOuter_ = false; - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature build() { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.name_ = name_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - if (typeBuilder_ == null) { - result.type_ = type_; - } else { - result.type_ = typeBuilder_.build(); - } - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.isStaticInOuter_ = isStaticInOuter_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance()) return this; - if (other.hasName()) { - setName(other.getName()); - } - if (other.hasType()) { - mergeType(other.getType()); - } - if (other.hasIsStaticInOuter()) { - setIsStaticInOuter(other.getIsStaticInOuter()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasName()) { - - return false; - } - if (!hasType()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // required int32 name = 1; - private int name_ ; - /** - * required int32 name = 1; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required int32 name = 1; - */ - public int getName() { - return name_; - } - /** - * required int32 name = 1; - */ - public Builder setName(int value) { - bitField0_ |= 0x00000001; - name_ = value; - onChanged(); - return this; - } - /** - * required int32 name = 1; - */ - public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; - onChanged(); - return this; - } - - // required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> typeBuilder_; - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType getType() { - if (typeBuilder_ == null) { - return type_; - } else { - return typeBuilder_.getMessage(); - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { - if (typeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - type_ = value; - onChanged(); - } else { - typeBuilder_.setMessage(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public Builder setType( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder builderForValue) { - if (typeBuilder_ == null) { - type_ = builderForValue.build(); - onChanged(); - } else { - typeBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType value) { - if (typeBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - type_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance()) { - type_ = - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.newBuilder(type_).mergeFrom(value).buildPartial(); - } else { - type_ = value; - } - onChanged(); - } else { - typeBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public Builder clearType() { - if (typeBuilder_ == null) { - type_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.getDefaultInstance(); - onChanged(); - } else { - typeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder getTypeBuilder() { - bitField0_ |= 0x00000002; - onChanged(); - return getTypeFieldBuilder().getBuilder(); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder getTypeOrBuilder() { - if (typeBuilder_ != null) { - return typeBuilder_.getMessageOrBuilder(); - } else { - return type_; - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.JavaType type = 2; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder> - getTypeFieldBuilder() { - if (typeBuilder_ == null) { - typeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaType.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaTypeOrBuilder>( - type_, - getParentForChildren(), - isClean()); - type_ = null; - } - return typeBuilder_; - } - - // optional bool is_static_in_outer = 3 [default = false]; - private boolean isStaticInOuter_ ; - /** - * optional bool is_static_in_outer = 3 [default = false]; - * - * 
-       * True iff this field is a backing field for a class object and is really present as a static
-       * field in the outer class, not as an instance field here
-       *
- */ - public boolean hasIsStaticInOuter() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional bool is_static_in_outer = 3 [default = false]; - * - * 
-       * True iff this field is a backing field for a class object and is really present as a static
-       * field in the outer class, not as an instance field here
-       *
- */ - public boolean getIsStaticInOuter() { - return isStaticInOuter_; - } - /** - * optional bool is_static_in_outer = 3 [default = false]; - * - * 
-       * True iff this field is a backing field for a class object and is really present as a static
-       * field in the outer class, not as an instance field here
-       *
- */ - public Builder setIsStaticInOuter(boolean value) { - bitField0_ |= 0x00000004; - isStaticInOuter_ = value; - onChanged(); - return this; - } - /** - * optional bool is_static_in_outer = 3 [default = false]; - * - * 
-       * True iff this field is a backing field for a class object and is really present as a static
-       * field in the outer class, not as an instance field here
-       *
- */ - public Builder clearIsStaticInOuter() { - bitField0_ = (bitField0_ & ~0x00000004); - isStaticInOuter_ = false; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaFieldSignature) - } - - static { - defaultInstance = new JavaFieldSignature(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaFieldSignature) - } - - public interface JavaPropertySignatureOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-     * A property itself is identified either by the field, or by the synthetic method.
-     * If the property is annotated, then either field or synthetic_method should be present
-     *
- */ - boolean hasField(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-     * A property itself is identified either by the field, or by the synthetic method.
-     * If the property is annotated, then either field or synthetic_method should be present
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-     * A property itself is identified either by the field, or by the synthetic method.
-     * If the property is annotated, then either field or synthetic_method should be present
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder(); - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-     * Annotations on properties without backing fields are written on a synthetic method with this signature
-     *
- */ - boolean hasSyntheticMethod(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-     * Annotations on properties without backing fields are written on a synthetic method with this signature
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-     * Annotations on properties without backing fields are written on a synthetic method with this signature
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder(); - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - boolean hasGetter(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder(); - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - boolean hasSetter(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaPropertySignature} - */ - public static final class JavaPropertySignature extends - com.google.protobuf.GeneratedMessage - implements JavaPropertySignatureOrBuilder { - // Use JavaPropertySignature.newBuilder() to construct. - private JavaPropertySignature(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private JavaPropertySignature(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final JavaPropertySignature defaultInstance; - public static JavaPropertySignature getDefaultInstance() { - return defaultInstance; - } - - public JavaPropertySignature getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private JavaPropertySignature( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = field_.toBuilder(); - } - field_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(field_); - field_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = syntheticMethod_.toBuilder(); - } - syntheticMethod_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(syntheticMethod_); - syntheticMethod_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - case 26: { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = getter_.toBuilder(); - } - getter_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(getter_); - getter_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = setter_.toBuilder(); - } - setter_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(setter_); - setter_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public JavaPropertySignature parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new JavaPropertySignature(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - public static final int FIELD_FIELD_NUMBER = 1; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature field_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-     * A property itself is identified either by the field, or by the synthetic method.
-     * If the property is annotated, then either field or synthetic_method should be present
-     *
- */ - public boolean hasField() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-     * A property itself is identified either by the field, or by the synthetic method.
-     * If the property is annotated, then either field or synthetic_method should be present
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField() { - return field_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-     * A property itself is identified either by the field, or by the synthetic method.
-     * If the property is annotated, then either field or synthetic_method should be present
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder() { - return field_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - public static final int SYNTHETIC_METHOD_FIELD_NUMBER = 2; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature syntheticMethod_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-     * Annotations on properties without backing fields are written on a synthetic method with this signature
-     *
- */ - public boolean hasSyntheticMethod() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-     * Annotations on properties without backing fields are written on a synthetic method with this signature
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod() { - return syntheticMethod_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-     * Annotations on properties without backing fields are written on a synthetic method with this signature
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder() { - return syntheticMethod_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - public static final int GETTER_FIELD_NUMBER = 3; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getter_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public boolean hasGetter() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter() { - return getter_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder() { - return getter_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - public static final int SETTER_FIELD_NUMBER = 4; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature setter_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public boolean hasSetter() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter() { - return setter_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder() { - return setter_; - } - - private void initFields() { - field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); - syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (hasField()) { - if (!getField().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasSyntheticMethod()) { - if (!getSyntheticMethod().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasGetter()) { - if (!getGetter().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasSetter()) { - if (!getSetter().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, field_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, syntheticMethod_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, getter_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, setter_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, field_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, syntheticMethod_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, getter_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, setter_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.JavaPropertySignature} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignatureOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getFieldFieldBuilder(); - getSyntheticMethodFieldBuilder(); - getGetterFieldBuilder(); - getSetterFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (fieldBuilder_ == null) { - field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); - } else { - fieldBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - if (syntheticMethodBuilder_ == null) { - syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - } else { - syntheticMethodBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - if (getterBuilder_ == null) { - getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - } else { - getterBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000004); - if (setterBuilder_ == null) { - setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - } else { - setterBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature build() { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature result = new org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - if (fieldBuilder_ == null) { - result.field_ = field_; - } else { - result.field_ = fieldBuilder_.build(); - } - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - if (syntheticMethodBuilder_ == null) { - result.syntheticMethod_ = syntheticMethod_; - } else { - result.syntheticMethod_ = syntheticMethodBuilder_.build(); - } - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - if (getterBuilder_ == null) { - result.getter_ = getter_; - } else { - result.getter_ = getterBuilder_.build(); - } - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } - if (setterBuilder_ == null) { - result.setter_ = setter_; - } else { - result.setter_ = setterBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance()) return this; - if (other.hasField()) { - mergeField(other.getField()); - } - if (other.hasSyntheticMethod()) { - mergeSyntheticMethod(other.getSyntheticMethod()); - } - if (other.hasGetter()) { - mergeGetter(other.getGetter()); - } - if (other.hasSetter()) { - mergeSetter(other.getSetter()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (hasField()) { - if (!getField().isInitialized()) { - - return false; - } - } - if (hasSyntheticMethod()) { - if (!getSyntheticMethod().isInitialized()) { - - return false; - } - } - if (hasGetter()) { - if (!getGetter().isInitialized()) { - - return false; - } - } - if (hasSetter()) { - if (!getSetter().isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder> fieldBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - public boolean hasField() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature getField() { - if (fieldBuilder_ == null) { - return field_; - } else { - return fieldBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - public Builder setField(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature value) { - if (fieldBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - field_ = value; - onChanged(); - } else { - fieldBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - public Builder setField( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder builderForValue) { - if (fieldBuilder_ == null) { - field_ = builderForValue.build(); - onChanged(); - } else { - fieldBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - public Builder mergeField(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature value) { - if (fieldBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - field_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance()) { - field_ = - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.newBuilder(field_).mergeFrom(value).buildPartial(); - } else { - field_ = value; - } - onChanged(); - } else { - fieldBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - public Builder clearField() { - if (fieldBuilder_ == null) { - field_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.getDefaultInstance(); - onChanged(); - } else { - fieldBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder getFieldBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getFieldFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder getFieldOrBuilder() { - if (fieldBuilder_ != null) { - return fieldBuilder_.getMessageOrBuilder(); - } else { - return field_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaFieldSignature field = 1; - * - * 
-       * A property itself is identified either by the field, or by the synthetic method.
-       * If the property is annotated, then either field or synthetic_method should be present
-       *
- */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder> - getFieldFieldBuilder() { - if (fieldBuilder_ == null) { - fieldBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaFieldSignatureOrBuilder>( - field_, - getParentForChildren(), - isClean()); - field_ = null; - } - return fieldBuilder_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> syntheticMethodBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - public boolean hasSyntheticMethod() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSyntheticMethod() { - if (syntheticMethodBuilder_ == null) { - return syntheticMethod_; - } else { - return syntheticMethodBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - public Builder setSyntheticMethod(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { - if (syntheticMethodBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - syntheticMethod_ = value; - onChanged(); - } else { - syntheticMethodBuilder_.setMessage(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - public Builder setSyntheticMethod( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) { - if (syntheticMethodBuilder_ == null) { - syntheticMethod_ = builderForValue.build(); - onChanged(); - } else { - syntheticMethodBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - public Builder mergeSyntheticMethod(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { - if (syntheticMethodBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - syntheticMethod_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) { - syntheticMethod_ = - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(syntheticMethod_).mergeFrom(value).buildPartial(); - } else { - syntheticMethod_ = value; - } - onChanged(); - } else { - syntheticMethodBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - public Builder clearSyntheticMethod() { - if (syntheticMethodBuilder_ == null) { - syntheticMethod_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - onChanged(); - } else { - syntheticMethodBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getSyntheticMethodBuilder() { - bitField0_ |= 0x00000002; - onChanged(); - return getSyntheticMethodFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSyntheticMethodOrBuilder() { - if (syntheticMethodBuilder_ != null) { - return syntheticMethodBuilder_.getMessageOrBuilder(); - } else { - return syntheticMethod_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature synthetic_method = 2; - * - * 
-       * Annotations on properties without backing fields are written on a synthetic method with this signature
-       *
- */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> - getSyntheticMethodFieldBuilder() { - if (syntheticMethodBuilder_ == null) { - syntheticMethodBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>( - syntheticMethod_, - getParentForChildren(), - isClean()); - syntheticMethod_ = null; - } - return syntheticMethodBuilder_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> getterBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public boolean hasGetter() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getGetter() { - if (getterBuilder_ == null) { - return getter_; - } else { - return getterBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public Builder setGetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { - if (getterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - getter_ = value; - onChanged(); - } else { - getterBuilder_.setMessage(value); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public Builder setGetter( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) { - if (getterBuilder_ == null) { - getter_ = builderForValue.build(); - onChanged(); - } else { - getterBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public Builder mergeGetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { - if (getterBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - getter_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) { - getter_ = - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(getter_).mergeFrom(value).buildPartial(); - } else { - getter_ = value; - } - onChanged(); - } else { - getterBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public Builder clearGetter() { - if (getterBuilder_ == null) { - getter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - onChanged(); - } else { - getterBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getGetterBuilder() { - bitField0_ |= 0x00000004; - onChanged(); - return getGetterFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getGetterOrBuilder() { - if (getterBuilder_ != null) { - return getterBuilder_.getMessageOrBuilder(); - } else { - return getter_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature getter = 3; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> - getGetterFieldBuilder() { - if (getterBuilder_ == null) { - getterBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>( - getter_, - getParentForChildren(), - isClean()); - getter_ = null; - } - return getterBuilder_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - private org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> setterBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public boolean hasSetter() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature getSetter() { - if (setterBuilder_ == null) { - return setter_; - } else { - return setterBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public Builder setSetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { - if (setterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - setter_ = value; - onChanged(); - } else { - setterBuilder_.setMessage(value); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public Builder setSetter( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder builderForValue) { - if (setterBuilder_ == null) { - setter_ = builderForValue.build(); - onChanged(); - } else { - setterBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public Builder mergeSetter(org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature value) { - if (setterBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008) && - setter_ != org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()) { - setter_ = - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.newBuilder(setter_).mergeFrom(value).buildPartial(); - } else { - setter_ = value; - } - onChanged(); - } else { - setterBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public Builder clearSetter() { - if (setterBuilder_ == null) { - setter_ = org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance(); - onChanged(); - } else { - setterBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder getSetterBuilder() { - bitField0_ |= 0x00000008; - onChanged(); - return getSetterFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder getSetterOrBuilder() { - if (setterBuilder_ != null) { - return setterBuilder_.getMessageOrBuilder(); - } else { - return setter_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.JavaMethodSignature setter = 4; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder> - getSetterFieldBuilder() { - if (setterBuilder_ == null) { - setterBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.Builder, org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignatureOrBuilder>( - setter_, - getParentForChildren(), - isClean()); - setter_ = null; - } - return setterBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.JavaPropertySignature) - } - - static { - defaultInstance = new JavaPropertySignature(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.JavaPropertySignature) - } - - public static final int METHOD_SIGNATURE_FIELD_NUMBER = 100; - /** - * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... } - */ - public static final - com.google.protobuf.GeneratedMessage.GeneratedExtension< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature> methodSignature = com.google.protobuf.GeneratedMessage - .newFileScopedGeneratedExtension( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.class, - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaMethodSignature.getDefaultInstance()); - public static final int PROPERTY_SIGNATURE_FIELD_NUMBER = 101; - /** - * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... } - */ - public static final - com.google.protobuf.GeneratedMessage.GeneratedExtension< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature> propertySignature = com.google.protobuf.GeneratedMessage - .newFileScopedGeneratedExtension( - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.class, - org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf.JavaPropertySignature.getDefaultInstance()); - public static final int IMPL_CLASS_NAME_FIELD_NUMBER = 102; - /** - * extend .org.jetbrains.jet.descriptors.serialization.Callable { ... } - */ - public static final - com.google.protobuf.GeneratedMessage.GeneratedExtension< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, - java.lang.Integer> implClassName = com.google.protobuf.GeneratedMessage - .newFileScopedGeneratedExtension( - java.lang.Integer.class, - null); - public static final int INDEX_FIELD_NUMBER = 100; - /** - * extend .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter { ... } - */ - public static final - com.google.protobuf.GeneratedMessage.GeneratedExtension< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, - java.lang.Integer> index = com.google.protobuf.GeneratedMessage - .newFileScopedGeneratedExtension( - java.lang.Integer.class, - null); - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; - static { - java.lang.String[] descriptorData = { - "\n8core/serialization.java/src/java_descr" + - "iptors.debug.proto\022+org.jetbrains.jet.de" + - "scriptors.serialization\032;compiler/fronte" + - "nd/serialization/src/descriptors.debug.p" + - "roto\"\213\002\n\010JavaType\022[\n\016primitive_type\030\001 \001(" + - "\0162C.org.jetbrains.jet.descriptors.serial" + - "ization.JavaType.PrimitiveType\022\025\n\rclass_" + - "fq_name\030\002 \001(\005\022\032\n\017array_dimension\030\003 \001(\005:\001" + - "0\"o\n\rPrimitiveType\022\010\n\004VOID\020\000\022\013\n\007BOOLEAN\020" + - "\001\022\010\n\004CHAR\020\002\022\010\n\004BYTE\020\003\022\t\n\005SHORT\020\004\022\007\n\003INT\020", - "\005\022\t\n\005FLOAT\020\006\022\010\n\004LONG\020\007\022\n\n\006DOUBLE\020\010\"\276\001\n\023J" + - "avaMethodSignature\022\014\n\004name\030\001 \002(\005\022J\n\013retu" + - "rn_type\030\002 \002(\01325.org.jetbrains.jet.descri" + - "ptors.serialization.JavaType\022M\n\016paramete" + - "r_type\030\003 \003(\01325.org.jetbrains.jet.descrip" + - "tors.serialization.JavaType\"\212\001\n\022JavaFiel" + - "dSignature\022\014\n\004name\030\001 \002(\005\022C\n\004type\030\002 \002(\01325" + - ".org.jetbrains.jet.descriptors.serializa" + - "tion.JavaType\022!\n\022is_static_in_outer\030\003 \001(" + - "\010:\005false\"\347\002\n\025JavaPropertySignature\022N\n\005fi", - "eld\030\001 \001(\0132?.org.jetbrains.jet.descriptor" + - "s.serialization.JavaFieldSignature\022Z\n\020sy" + - "nthetic_method\030\002 \001(\0132@.org.jetbrains.jet" + - ".descriptors.serialization.JavaMethodSig" + - "nature\022P\n\006getter\030\003 \001(\0132@.org.jetbrains.j" + - "et.descriptors.serialization.JavaMethodS" + - "ignature\022P\n\006setter\030\004 \001(\0132@.org.jetbrains" + - ".jet.descriptors.serialization.JavaMetho" + - "dSignature:\221\001\n\020method_signature\0225.org.je" + - "tbrains.jet.descriptors.serialization.Ca", - "llable\030d \001(\0132@.org.jetbrains.jet.descrip" + - "tors.serialization.JavaMethodSignature:\225" + - "\001\n\022property_signature\0225.org.jetbrains.je" + - "t.descriptors.serialization.Callable\030e \001" + - "(\0132B.org.jetbrains.jet.descriptors.seria" + - "lization.JavaPropertySignature:N\n\017impl_c" + - "lass_name\0225.org.jetbrains.jet.descriptor" + - "s.serialization.Callable\030f \001(\005:S\n\005index\022" + - "D.org.jetbrains.jet.descriptors.serializ" + - "ation.Callable.ValueParameter\030d \001(\005B\023B\021D", - "ebugJavaProtoBuf" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_JavaType_descriptor, - new java.lang.String[] { "PrimitiveType", "ClassFqName", "ArrayDimension", }); - internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_JavaMethodSignature_descriptor, - new java.lang.String[] { "Name", "ReturnType", "ParameterType", }); - internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_JavaFieldSignature_descriptor, - new java.lang.String[] { "Name", "Type", "IsStaticInOuter", }); - internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor = - getDescriptor().getMessageTypes().get(3); - internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_JavaPropertySignature_descriptor, - new java.lang.String[] { "Field", "SyntheticMethod", "Getter", "Setter", }); - methodSignature.internalInit(descriptor.getExtensions().get(0)); - propertySignature.internalInit(descriptor.getExtensions().get(1)); - implClassName.internalInit(descriptor.getExtensions().get(2)); - index.internalInit(descriptor.getExtensions().get(3)); - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor(), - }, assigner); - } - - // @@protoc_insertion_point(outer_class_scope) -} diff --git a/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java b/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java deleted file mode 100644 index a9eca1a0f22..00000000000 --- a/jps/jps-plugin/test/org/jetbrains/jet/descriptors/serialization/DebugProtoBuf.java +++ /dev/null @@ -1,14006 +0,0 @@ -// Generated by the protocol buffer compiler. DO NOT EDIT! -// source: compiler/frontend/serialization/src/descriptors.debug.proto - -package org.jetbrains.jet.descriptors.serialization; - -public final class DebugProtoBuf { - private DebugProtoBuf() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - } - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Modality} - */ - public enum Modality - implements com.google.protobuf.ProtocolMessageEnum { - /** - * FINAL = 0; - * - * 
-     * 2 bits
-     *
- */ - FINAL(0, 0), - /** - * OPEN = 1; - */ - OPEN(1, 1), - /** - * ABSTRACT = 2; - */ - ABSTRACT(2, 2), - ; - - /** - * FINAL = 0; - * - * 
-     * 2 bits
-     *
- */ - public static final int FINAL_VALUE = 0; - /** - * OPEN = 1; - */ - public static final int OPEN_VALUE = 1; - /** - * ABSTRACT = 2; - */ - public static final int ABSTRACT_VALUE = 2; - - - public final int getNumber() { return value; } - - public static Modality valueOf(int value) { - switch (value) { - case 0: return FINAL; - case 1: return OPEN; - case 2: return ABSTRACT; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public Modality findValueByNumber(int number) { - return Modality.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(0); - } - - private static final Modality[] VALUES = values(); - - public static Modality valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private Modality(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Modality) - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Visibility} - */ - public enum Visibility - implements com.google.protobuf.ProtocolMessageEnum { - /** - * INTERNAL = 0; - * - * 
-     * 3 bits
-     *
- */ - INTERNAL(0, 0), - /** - * PRIVATE = 1; - */ - PRIVATE(1, 1), - /** - * PROTECTED = 2; - */ - PROTECTED(2, 2), - /** - * PUBLIC = 3; - */ - PUBLIC(3, 3), - /** - * EXTRA = 4; - * - * 
-     * there's an extra field for the actual visibility
-     *
- */ - EXTRA(4, 4), - ; - - /** - * INTERNAL = 0; - * - * 
-     * 3 bits
-     *
- */ - public static final int INTERNAL_VALUE = 0; - /** - * PRIVATE = 1; - */ - public static final int PRIVATE_VALUE = 1; - /** - * PROTECTED = 2; - */ - public static final int PROTECTED_VALUE = 2; - /** - * PUBLIC = 3; - */ - public static final int PUBLIC_VALUE = 3; - /** - * EXTRA = 4; - * - * 
-     * there's an extra field for the actual visibility
-     *
- */ - public static final int EXTRA_VALUE = 4; - - - public final int getNumber() { return value; } - - public static Visibility valueOf(int value) { - switch (value) { - case 0: return INTERNAL; - case 1: return PRIVATE; - case 2: return PROTECTED; - case 3: return PUBLIC; - case 4: return EXTRA; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public Visibility findValueByNumber(int number) { - return Visibility.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.getDescriptor().getEnumTypes().get(1); - } - - private static final Visibility[] VALUES = values(); - - public static Visibility valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private Visibility(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Visibility) - } - - public interface SimpleNameTableOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // repeated string name = 1; - /** - * repeated string name = 1; - */ - java.util.List - getNameList(); - /** - * repeated string name = 1; - */ - int getNameCount(); - /** - * repeated string name = 1; - */ - java.lang.String getName(int index); - /** - * repeated string name = 1; - */ - com.google.protobuf.ByteString - getNameBytes(int index); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.SimpleNameTable} - */ - public static final class SimpleNameTable extends - com.google.protobuf.GeneratedMessage - implements SimpleNameTableOrBuilder { - // Use SimpleNameTable.newBuilder() to construct. - private SimpleNameTable(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private SimpleNameTable(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final SimpleNameTable defaultInstance; - public static SimpleNameTable getDefaultInstance() { - return defaultInstance; - } - - public SimpleNameTable getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private SimpleNameTable( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - name_ = new com.google.protobuf.LazyStringArrayList(); - mutable_bitField0_ |= 0x00000001; - } - name_.add(input.readBytes()); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - name_ = new com.google.protobuf.UnmodifiableLazyStringList(name_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public SimpleNameTable parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new SimpleNameTable(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - // repeated string name = 1; - public static final int NAME_FIELD_NUMBER = 1; - private com.google.protobuf.LazyStringList name_; - /** - * repeated string name = 1; - */ - public java.util.List - getNameList() { - return name_; - } - /** - * repeated string name = 1; - */ - public int getNameCount() { - return name_.size(); - } - /** - * repeated string name = 1; - */ - public java.lang.String getName(int index) { - return name_.get(index); - } - /** - * repeated string name = 1; - */ - public com.google.protobuf.ByteString - getNameBytes(int index) { - return name_.getByteString(index); - } - - private void initFields() { - name_ = com.google.protobuf.LazyStringArrayList.EMPTY; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - for (int i = 0; i < name_.size(); i++) { - output.writeBytes(1, name_.getByteString(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - { - int dataSize = 0; - for (int i = 0; i < name_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeBytesSizeNoTag(name_.getByteString(i)); - } - size += dataSize; - size += 1 * getNameList().size(); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.SimpleNameTable} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTableOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - name_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable(this); - int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - name_ = new com.google.protobuf.UnmodifiableLazyStringList( - name_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.name_ = name_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable.getDefaultInstance()) return this; - if (!other.name_.isEmpty()) { - if (name_.isEmpty()) { - name_ = other.name_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureNameIsMutable(); - name_.addAll(other.name_); - } - onChanged(); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.SimpleNameTable) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // repeated string name = 1; - private com.google.protobuf.LazyStringList name_ = com.google.protobuf.LazyStringArrayList.EMPTY; - private void ensureNameIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - name_ = new com.google.protobuf.LazyStringArrayList(name_); - bitField0_ |= 0x00000001; - } - } - /** - * repeated string name = 1; - */ - public java.util.List - getNameList() { - return java.util.Collections.unmodifiableList(name_); - } - /** - * repeated string name = 1; - */ - public int getNameCount() { - return name_.size(); - } - /** - * repeated string name = 1; - */ - public java.lang.String getName(int index) { - return name_.get(index); - } - /** - * repeated string name = 1; - */ - public com.google.protobuf.ByteString - getNameBytes(int index) { - return name_.getByteString(index); - } - /** - * repeated string name = 1; - */ - public Builder setName( - int index, java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureNameIsMutable(); - name_.set(index, value); - onChanged(); - return this; - } - /** - * repeated string name = 1; - */ - public Builder addName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - ensureNameIsMutable(); - name_.add(value); - onChanged(); - return this; - } - /** - * repeated string name = 1; - */ - public Builder addAllName( - java.lang.Iterable values) { - ensureNameIsMutable(); - super.addAll(values, name_); - onChanged(); - return this; - } - /** - * repeated string name = 1; - */ - public Builder clearName() { - name_ = com.google.protobuf.LazyStringArrayList.EMPTY; - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - return this; - } - /** - * repeated string name = 1; - */ - public Builder addNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - ensureNameIsMutable(); - name_.add(value); - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.SimpleNameTable) - } - - static { - defaultInstance = new SimpleNameTable(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.SimpleNameTable) - } - - public interface QualifiedNameTableOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - java.util.List - getQualifiedNameList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - int getQualifiedNameCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - java.util.List - getQualifiedNameOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( - int index); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable} - */ - public static final class QualifiedNameTable extends - com.google.protobuf.GeneratedMessage - implements QualifiedNameTableOrBuilder { - // Use QualifiedNameTable.newBuilder() to construct. - private QualifiedNameTable(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private QualifiedNameTable(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final QualifiedNameTable defaultInstance; - public static QualifiedNameTable getDefaultInstance() { - return defaultInstance; - } - - public QualifiedNameTable getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private QualifiedNameTable( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - qualifiedName_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - qualifiedName_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.PARSER, extensionRegistry)); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - qualifiedName_ = java.util.Collections.unmodifiableList(qualifiedName_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public QualifiedNameTable parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new QualifiedNameTable(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - public interface QualifiedNameOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional int32 parent_qualified_name = 1 [default = -1]; - /** - * optional int32 parent_qualified_name = 1 [default = -1]; - */ - boolean hasParentQualifiedName(); - /** - * optional int32 parent_qualified_name = 1 [default = -1]; - */ - int getParentQualifiedName(); - - // required int32 short_name = 2; - /** - * required int32 short_name = 2; - */ - boolean hasShortName(); - /** - * required int32 short_name = 2; - */ - int getShortName(); - - // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - */ - boolean hasKind(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName} - */ - public static final class QualifiedName extends - com.google.protobuf.GeneratedMessage - implements QualifiedNameOrBuilder { - // Use QualifiedName.newBuilder() to construct. - private QualifiedName(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private QualifiedName(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final QualifiedName defaultInstance; - public static QualifiedName getDefaultInstance() { - return defaultInstance; - } - - public QualifiedName getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private QualifiedName( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - parentQualifiedName_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - shortName_ = input.readInt32(); - break; - } - case 24: { - int rawValue = input.readEnum(); - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(3, rawValue); - } else { - bitField0_ |= 0x00000004; - kind_ = value; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public QualifiedName parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new QualifiedName(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind} - */ - public enum Kind - implements com.google.protobuf.ProtocolMessageEnum { - /** - * CLASS = 0; - */ - CLASS(0, 0), - /** - * PACKAGE = 1; - */ - PACKAGE(1, 1), - ; - - /** - * CLASS = 0; - */ - public static final int CLASS_VALUE = 0; - /** - * PACKAGE = 1; - */ - public static final int PACKAGE_VALUE = 1; - - - public final int getNumber() { return value; } - - public static Kind valueOf(int value) { - switch (value) { - case 0: return CLASS; - case 1: return PACKAGE; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public Kind findValueByNumber(int number) { - return Kind.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDescriptor().getEnumTypes().get(0); - } - - private static final Kind[] VALUES = values(); - - public static Kind valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private Kind(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind) - } - - private int bitField0_; - // optional int32 parent_qualified_name = 1 [default = -1]; - public static final int PARENT_QUALIFIED_NAME_FIELD_NUMBER = 1; - private int parentQualifiedName_; - /** - * optional int32 parent_qualified_name = 1 [default = -1]; - */ - public boolean hasParentQualifiedName() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional int32 parent_qualified_name = 1 [default = -1]; - */ - public int getParentQualifiedName() { - return parentQualifiedName_; - } - - // required int32 short_name = 2; - public static final int SHORT_NAME_FIELD_NUMBER = 2; - private int shortName_; - /** - * required int32 short_name = 2; - */ - public boolean hasShortName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required int32 short_name = 2; - */ - public int getShortName() { - return shortName_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - public static final int KIND_FIELD_NUMBER = 3; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - */ - public boolean hasKind() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { - return kind_; - } - - private void initFields() { - parentQualifiedName_ = -1; - shortName_ = 0; - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasShortName()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, parentQualifiedName_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeInt32(2, shortName_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeEnum(3, kind_.getNumber()); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, parentQualifiedName_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, shortName_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(3, kind_.getNumber()); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - parentQualifiedName_ = -1; - bitField0_ = (bitField0_ & ~0x00000001); - shortName_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.parentQualifiedName_ = parentQualifiedName_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.shortName_ = shortName_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.kind_ = kind_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()) return this; - if (other.hasParentQualifiedName()) { - setParentQualifiedName(other.getParentQualifiedName()); - } - if (other.hasShortName()) { - setShortName(other.getShortName()); - } - if (other.hasKind()) { - setKind(other.getKind()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasShortName()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional int32 parent_qualified_name = 1 [default = -1]; - private int parentQualifiedName_ = -1; - /** - * optional int32 parent_qualified_name = 1 [default = -1]; - */ - public boolean hasParentQualifiedName() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional int32 parent_qualified_name = 1 [default = -1]; - */ - public int getParentQualifiedName() { - return parentQualifiedName_; - } - /** - * optional int32 parent_qualified_name = 1 [default = -1]; - */ - public Builder setParentQualifiedName(int value) { - bitField0_ |= 0x00000001; - parentQualifiedName_ = value; - onChanged(); - return this; - } - /** - * optional int32 parent_qualified_name = 1 [default = -1]; - */ - public Builder clearParentQualifiedName() { - bitField0_ = (bitField0_ & ~0x00000001); - parentQualifiedName_ = -1; - onChanged(); - return this; - } - - // required int32 short_name = 2; - private int shortName_ ; - /** - * required int32 short_name = 2; - */ - public boolean hasShortName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required int32 short_name = 2; - */ - public int getShortName() { - return shortName_; - } - /** - * required int32 short_name = 2; - */ - public Builder setShortName(int value) { - bitField0_ |= 0x00000002; - shortName_ = value; - onChanged(); - return this; - } - /** - * required int32 short_name = 2; - */ - public Builder clearShortName() { - bitField0_ = (bitField0_ & ~0x00000002); - shortName_ = 0; - onChanged(); - return this; - } - - // optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; - /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - */ - public boolean hasKind() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind getKind() { - return kind_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - */ - public Builder setKind(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - kind_ = value; - onChanged(); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName.Kind kind = 3 [default = PACKAGE]; - */ - public Builder clearKind() { - bitField0_ = (bitField0_ & ~0x00000004); - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Kind.PACKAGE; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName) - } - - static { - defaultInstance = new QualifiedName(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName) - } - - // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - public static final int QUALIFIED_NAME_FIELD_NUMBER = 1; - private java.util.List qualifiedName_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public java.util.List getQualifiedNameList() { - return qualifiedName_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public java.util.List - getQualifiedNameOrBuilderList() { - return qualifiedName_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public int getQualifiedNameCount() { - return qualifiedName_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { - return qualifiedName_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( - int index) { - return qualifiedName_.get(index); - } - - private void initFields() { - qualifiedName_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - for (int i = 0; i < getQualifiedNameCount(); i++) { - if (!getQualifiedName(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - for (int i = 0; i < qualifiedName_.size(); i++) { - output.writeMessage(1, qualifiedName_.get(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - for (int i = 0; i < qualifiedName_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, qualifiedName_.get(i)); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.QualifiedNameTable} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTableOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getQualifiedNameFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (qualifiedNameBuilder_ == null) { - qualifiedName_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - qualifiedNameBuilder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable(this); - int from_bitField0_ = bitField0_; - if (qualifiedNameBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { - qualifiedName_ = java.util.Collections.unmodifiableList(qualifiedName_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.qualifiedName_ = qualifiedName_; - } else { - result.qualifiedName_ = qualifiedNameBuilder_.build(); - } - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.getDefaultInstance()) return this; - if (qualifiedNameBuilder_ == null) { - if (!other.qualifiedName_.isEmpty()) { - if (qualifiedName_.isEmpty()) { - qualifiedName_ = other.qualifiedName_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureQualifiedNameIsMutable(); - qualifiedName_.addAll(other.qualifiedName_); - } - onChanged(); - } - } else { - if (!other.qualifiedName_.isEmpty()) { - if (qualifiedNameBuilder_.isEmpty()) { - qualifiedNameBuilder_.dispose(); - qualifiedNameBuilder_ = null; - qualifiedName_ = other.qualifiedName_; - bitField0_ = (bitField0_ & ~0x00000001); - qualifiedNameBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getQualifiedNameFieldBuilder() : null; - } else { - qualifiedNameBuilder_.addAllMessages(other.qualifiedName_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - for (int i = 0; i < getQualifiedNameCount(); i++) { - if (!getQualifiedName(i).isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - private java.util.List qualifiedName_ = - java.util.Collections.emptyList(); - private void ensureQualifiedNameIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - qualifiedName_ = new java.util.ArrayList(qualifiedName_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> qualifiedNameBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public java.util.List getQualifiedNameList() { - if (qualifiedNameBuilder_ == null) { - return java.util.Collections.unmodifiableList(qualifiedName_); - } else { - return qualifiedNameBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public int getQualifiedNameCount() { - if (qualifiedNameBuilder_ == null) { - return qualifiedName_.size(); - } else { - return qualifiedNameBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName getQualifiedName(int index) { - if (qualifiedNameBuilder_ == null) { - return qualifiedName_.get(index); - } else { - return qualifiedNameBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder setQualifiedName( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { - if (qualifiedNameBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureQualifiedNameIsMutable(); - qualifiedName_.set(index, value); - onChanged(); - } else { - qualifiedNameBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder setQualifiedName( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { - if (qualifiedNameBuilder_ == null) { - ensureQualifiedNameIsMutable(); - qualifiedName_.set(index, builderForValue.build()); - onChanged(); - } else { - qualifiedNameBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder addQualifiedName(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { - if (qualifiedNameBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureQualifiedNameIsMutable(); - qualifiedName_.add(value); - onChanged(); - } else { - qualifiedNameBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder addQualifiedName( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName value) { - if (qualifiedNameBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureQualifiedNameIsMutable(); - qualifiedName_.add(index, value); - onChanged(); - } else { - qualifiedNameBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder addQualifiedName( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { - if (qualifiedNameBuilder_ == null) { - ensureQualifiedNameIsMutable(); - qualifiedName_.add(builderForValue.build()); - onChanged(); - } else { - qualifiedNameBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder addQualifiedName( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder builderForValue) { - if (qualifiedNameBuilder_ == null) { - ensureQualifiedNameIsMutable(); - qualifiedName_.add(index, builderForValue.build()); - onChanged(); - } else { - qualifiedNameBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder addAllQualifiedName( - java.lang.Iterable values) { - if (qualifiedNameBuilder_ == null) { - ensureQualifiedNameIsMutable(); - super.addAll(values, qualifiedName_); - onChanged(); - } else { - qualifiedNameBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder clearQualifiedName() { - if (qualifiedNameBuilder_ == null) { - qualifiedName_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - qualifiedNameBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public Builder removeQualifiedName(int index) { - if (qualifiedNameBuilder_ == null) { - ensureQualifiedNameIsMutable(); - qualifiedName_.remove(index); - onChanged(); - } else { - qualifiedNameBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder getQualifiedNameBuilder( - int index) { - return getQualifiedNameFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder getQualifiedNameOrBuilder( - int index) { - if (qualifiedNameBuilder_ == null) { - return qualifiedName_.get(index); } else { - return qualifiedNameBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public java.util.List - getQualifiedNameOrBuilderList() { - if (qualifiedNameBuilder_ != null) { - return qualifiedNameBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(qualifiedName_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder() { - return getQualifiedNameFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder addQualifiedNameBuilder( - int index) { - return getQualifiedNameFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.QualifiedNameTable.QualifiedName qualified_name = 1; - */ - public java.util.List - getQualifiedNameBuilderList() { - return getQualifiedNameFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder> - getQualifiedNameFieldBuilder() { - if (qualifiedNameBuilder_ == null) { - qualifiedNameBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedName.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.QualifiedNameTable.QualifiedNameOrBuilder>( - qualifiedName_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); - qualifiedName_ = null; - } - return qualifiedNameBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable) - } - - static { - defaultInstance = new QualifiedNameTable(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.QualifiedNameTable) - } - - public interface TypeOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - boolean hasConstructor(); - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor(); - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder(); - - // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - java.util.List - getArgumentList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - int getArgumentCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - java.util.List - getArgumentOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder( - int index); - - // optional bool nullable = 3 [default = false]; - /** - * optional bool nullable = 3 [default = false]; - */ - boolean hasNullable(); - /** - * optional bool nullable = 3 [default = false]; - */ - boolean getNullable(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type} - */ - public static final class Type extends - com.google.protobuf.GeneratedMessage - implements TypeOrBuilder { - // Use Type.newBuilder() to construct. - private Type(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private Type(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final Type defaultInstance; - public static Type getDefaultInstance() { - return defaultInstance; - } - - public Type getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Type( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = constructor_.toBuilder(); - } - constructor_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(constructor_); - constructor_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - argument_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000002; - } - argument_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.PARSER, extensionRegistry)); - break; - } - case 24: { - bitField0_ |= 0x00000002; - nullable_ = input.readBool(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - argument_ = java.util.Collections.unmodifiableList(argument_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Type parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Type(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - public interface ConstructorOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - */ - boolean hasKind(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind(); - - // required int32 id = 2; - /** - * required int32 id = 2; - * - * 
-       * CLASS - fqName id, TYPE_PARAMETER - type parameter id
-       *
- */ - boolean hasId(); - /** - * required int32 id = 2; - * - * 
-       * CLASS - fqName id, TYPE_PARAMETER - type parameter id
-       *
- */ - int getId(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor} - */ - public static final class Constructor extends - com.google.protobuf.GeneratedMessage - implements ConstructorOrBuilder { - // Use Constructor.newBuilder() to construct. - private Constructor(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private Constructor(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final Constructor defaultInstance; - public static Constructor getDefaultInstance() { - return defaultInstance; - } - - public Constructor getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Constructor( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - kind_ = value; - } - break; - } - case 16: { - bitField0_ |= 0x00000002; - id_ = input.readInt32(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Constructor parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Constructor(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind} - */ - public enum Kind - implements com.google.protobuf.ProtocolMessageEnum { - /** - * CLASS = 0; - */ - CLASS(0, 0), - /** - * TYPE_PARAMETER = 1; - */ - TYPE_PARAMETER(1, 1), - ; - - /** - * CLASS = 0; - */ - public static final int CLASS_VALUE = 0; - /** - * TYPE_PARAMETER = 1; - */ - public static final int TYPE_PARAMETER_VALUE = 1; - - - public final int getNumber() { return value; } - - public static Kind valueOf(int value) { - switch (value) { - case 0: return CLASS; - case 1: return TYPE_PARAMETER; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public Kind findValueByNumber(int number) { - return Kind.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDescriptor().getEnumTypes().get(0); - } - - private static final Kind[] VALUES = values(); - - public static Kind valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private Kind(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind) - } - - private int bitField0_; - // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - public static final int KIND_FIELD_NUMBER = 1; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind kind_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - */ - public boolean hasKind() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind() { - return kind_; - } - - // required int32 id = 2; - public static final int ID_FIELD_NUMBER = 2; - private int id_; - /** - * required int32 id = 2; - * - * 
-       * CLASS - fqName id, TYPE_PARAMETER - type parameter id
-       *
- */ - public boolean hasId() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required int32 id = 2; - * - * 
-       * CLASS - fqName id, TYPE_PARAMETER - type parameter id
-       *
- */ - public int getId() { - return id_; - } - - private void initFields() { - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS; - id_ = 0; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasId()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeEnum(1, kind_.getNumber()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeInt32(2, id_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(1, kind_.getNumber()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, id_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Constructor} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS; - bitField0_ = (bitField0_ & ~0x00000001); - id_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.kind_ = kind_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.id_ = id_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance()) return this; - if (other.hasKind()) { - setKind(other.getKind()); - } - if (other.hasId()) { - setId(other.getId()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasId()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - */ - public boolean hasKind() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind getKind() { - return kind_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - */ - public Builder setKind(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - kind_ = value; - onChanged(); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Constructor.Kind kind = 1 [default = CLASS]; - */ - public Builder clearKind() { - bitField0_ = (bitField0_ & ~0x00000001); - kind_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Kind.CLASS; - onChanged(); - return this; - } - - // required int32 id = 2; - private int id_ ; - /** - * required int32 id = 2; - * - * 
-         * CLASS - fqName id, TYPE_PARAMETER - type parameter id
-         *
- */ - public boolean hasId() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required int32 id = 2; - * - * 
-         * CLASS - fqName id, TYPE_PARAMETER - type parameter id
-         *
- */ - public int getId() { - return id_; - } - /** - * required int32 id = 2; - * - * 
-         * CLASS - fqName id, TYPE_PARAMETER - type parameter id
-         *
- */ - public Builder setId(int value) { - bitField0_ |= 0x00000002; - id_ = value; - onChanged(); - return this; - } - /** - * required int32 id = 2; - * - * 
-         * CLASS - fqName id, TYPE_PARAMETER - type parameter id
-         *
- */ - public Builder clearId() { - bitField0_ = (bitField0_ & ~0x00000002); - id_ = 0; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor) - } - - static { - defaultInstance = new Constructor(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type.Constructor) - } - - public interface ArgumentOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - */ - boolean hasProjection(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection(); - - // required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - boolean hasType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Argument} - */ - public static final class Argument extends - com.google.protobuf.GeneratedMessage - implements ArgumentOrBuilder { - // Use Argument.newBuilder() to construct. - private Argument(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private Argument(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final Argument defaultInstance; - public static Argument getDefaultInstance() { - return defaultInstance; - } - - public Argument getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Argument( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - int rawValue = input.readEnum(); - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(1, rawValue); - } else { - bitField0_ |= 0x00000001; - projection_ = value; - } - break; - } - case 18: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - subBuilder = type_.toBuilder(); - } - type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(type_); - type_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000002; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Argument parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Argument(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection} - */ - public enum Projection - implements com.google.protobuf.ProtocolMessageEnum { - /** - * IN = 0; - */ - IN(0, 0), - /** - * OUT = 1; - */ - OUT(1, 1), - /** - * INV = 2; - */ - INV(2, 2), - ; - - /** - * IN = 0; - */ - public static final int IN_VALUE = 0; - /** - * OUT = 1; - */ - public static final int OUT_VALUE = 1; - /** - * INV = 2; - */ - public static final int INV_VALUE = 2; - - - public final int getNumber() { return value; } - - public static Projection valueOf(int value) { - switch (value) { - case 0: return IN; - case 1: return OUT; - case 2: return INV; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public Projection findValueByNumber(int number) { - return Projection.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDescriptor().getEnumTypes().get(0); - } - - private static final Projection[] VALUES = values(); - - public static Projection valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private Projection(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection) - } - - private int bitField0_; - // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - public static final int PROJECTION_FIELD_NUMBER = 1; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection projection_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - */ - public boolean hasProjection() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() { - return projection_; - } - - // required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - public static final int TYPE_FIELD_NUMBER = 2; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() { - return type_; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() { - return type_; - } - - private void initFields() { - projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV; - type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasType()) { - memoizedIsInitialized = 0; - return false; - } - if (!getType().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeEnum(1, projection_.getNumber()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeMessage(2, type_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(1, projection_.getNumber()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, type_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type.Argument} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getTypeFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV; - bitField0_ = (bitField0_ & ~0x00000001); - if (typeBuilder_ == null) { - type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } else { - typeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.projection_ = projection_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - if (typeBuilder_ == null) { - result.type_ = type_; - } else { - result.type_ = typeBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()) return this; - if (other.hasProjection()) { - setProjection(other.getProjection()); - } - if (other.hasType()) { - mergeType(other.getType()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasType()) { - - return false; - } - if (!getType().isInitialized()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - */ - public boolean hasProjection() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection getProjection() { - return projection_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - */ - public Builder setProjection(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - projection_ = value; - onChanged(); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type.Argument.Projection projection = 1 [default = INV]; - */ - public Builder clearProjection() { - bitField0_ = (bitField0_ & ~0x00000001); - projection_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Projection.INV; - onChanged(); - return this; - } - - // required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() { - if (typeBuilder_ == null) { - return type_; - } else { - return typeBuilder_.getMessage(); - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (typeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - type_ = value; - onChanged(); - } else { - typeBuilder_.setMessage(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public Builder setType( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (typeBuilder_ == null) { - type_ = builderForValue.build(); - onChanged(); - } else { - typeBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (typeBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002) && - type_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { - type_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial(); - } else { - type_ = value; - } - onChanged(); - } else { - typeBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000002; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public Builder clearType() { - if (typeBuilder_ == null) { - type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - onChanged(); - } else { - typeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000002); - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() { - bitField0_ |= 0x00000002; - onChanged(); - return getTypeFieldBuilder().getBuilder(); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() { - if (typeBuilder_ != null) { - return typeBuilder_.getMessageOrBuilder(); - } else { - return type_; - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 2; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> - getTypeFieldBuilder() { - if (typeBuilder_ == null) { - typeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( - type_, - getParentForChildren(), - isClean()); - type_ = null; - } - return typeBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument) - } - - static { - defaultInstance = new Argument(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type.Argument) - } - - private int bitField0_; - // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - public static final int CONSTRUCTOR_FIELD_NUMBER = 1; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor constructor_; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public boolean hasConstructor() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor() { - return constructor_; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder() { - return constructor_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - public static final int ARGUMENT_FIELD_NUMBER = 2; - private java.util.List argument_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public java.util.List getArgumentList() { - return argument_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public java.util.List - getArgumentOrBuilderList() { - return argument_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public int getArgumentCount() { - return argument_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index) { - return argument_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder( - int index) { - return argument_.get(index); - } - - // optional bool nullable = 3 [default = false]; - public static final int NULLABLE_FIELD_NUMBER = 3; - private boolean nullable_; - /** - * optional bool nullable = 3 [default = false]; - */ - public boolean hasNullable() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional bool nullable = 3 [default = false]; - */ - public boolean getNullable() { - return nullable_; - } - - private void initFields() { - constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); - argument_ = java.util.Collections.emptyList(); - nullable_ = false; - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasConstructor()) { - memoizedIsInitialized = 0; - return false; - } - if (!getConstructor().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - for (int i = 0; i < getArgumentCount(); i++) { - if (!getArgument(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, constructor_); - } - for (int i = 0; i < argument_.size(); i++) { - output.writeMessage(2, argument_.get(i)); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBool(3, nullable_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, constructor_); - } - for (int i = 0; i < argument_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(2, argument_.get(i)); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, nullable_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Type} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getConstructorFieldBuilder(); - getArgumentFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (constructorBuilder_ == null) { - constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); - } else { - constructorBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - if (argumentBuilder_ == null) { - argument_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); - } else { - argumentBuilder_.clear(); - } - nullable_ = false; - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - if (constructorBuilder_ == null) { - result.constructor_ = constructor_; - } else { - result.constructor_ = constructorBuilder_.build(); - } - if (argumentBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { - argument_ = java.util.Collections.unmodifiableList(argument_); - bitField0_ = (bitField0_ & ~0x00000002); - } - result.argument_ = argument_; - } else { - result.argument_ = argumentBuilder_.build(); - } - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000002; - } - result.nullable_ = nullable_; - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) return this; - if (other.hasConstructor()) { - mergeConstructor(other.getConstructor()); - } - if (argumentBuilder_ == null) { - if (!other.argument_.isEmpty()) { - if (argument_.isEmpty()) { - argument_ = other.argument_; - bitField0_ = (bitField0_ & ~0x00000002); - } else { - ensureArgumentIsMutable(); - argument_.addAll(other.argument_); - } - onChanged(); - } - } else { - if (!other.argument_.isEmpty()) { - if (argumentBuilder_.isEmpty()) { - argumentBuilder_.dispose(); - argumentBuilder_ = null; - argument_ = other.argument_; - bitField0_ = (bitField0_ & ~0x00000002); - argumentBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getArgumentFieldBuilder() : null; - } else { - argumentBuilder_.addAllMessages(other.argument_); - } - } - } - if (other.hasNullable()) { - setNullable(other.getNullable()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasConstructor()) { - - return false; - } - if (!getConstructor().isInitialized()) { - - return false; - } - for (int i = 0; i < getArgumentCount(); i++) { - if (!getArgument(i).isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder> constructorBuilder_; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public boolean hasConstructor() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor getConstructor() { - if (constructorBuilder_ == null) { - return constructor_; - } else { - return constructorBuilder_.getMessage(); - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public Builder setConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor value) { - if (constructorBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - constructor_ = value; - onChanged(); - } else { - constructorBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public Builder setConstructor( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder builderForValue) { - if (constructorBuilder_ == null) { - constructor_ = builderForValue.build(); - onChanged(); - } else { - constructorBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public Builder mergeConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor value) { - if (constructorBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - constructor_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance()) { - constructor_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.newBuilder(constructor_).mergeFrom(value).buildPartial(); - } else { - constructor_ = value; - } - onChanged(); - } else { - constructorBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public Builder clearConstructor() { - if (constructorBuilder_ == null) { - constructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.getDefaultInstance(); - onChanged(); - } else { - constructorBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder getConstructorBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getConstructorFieldBuilder().getBuilder(); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder getConstructorOrBuilder() { - if (constructorBuilder_ != null) { - return constructorBuilder_.getMessageOrBuilder(); - } else { - return constructor_; - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type.Constructor constructor = 1; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder> - getConstructorFieldBuilder() { - if (constructorBuilder_ == null) { - constructorBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Constructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ConstructorOrBuilder>( - constructor_, - getParentForChildren(), - isClean()); - constructor_ = null; - } - return constructorBuilder_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - private java.util.List argument_ = - java.util.Collections.emptyList(); - private void ensureArgumentIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - argument_ = new java.util.ArrayList(argument_); - bitField0_ |= 0x00000002; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> argumentBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public java.util.List getArgumentList() { - if (argumentBuilder_ == null) { - return java.util.Collections.unmodifiableList(argument_); - } else { - return argumentBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public int getArgumentCount() { - if (argumentBuilder_ == null) { - return argument_.size(); - } else { - return argumentBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument getArgument(int index) { - if (argumentBuilder_ == null) { - return argument_.get(index); - } else { - return argumentBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder setArgument( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) { - if (argumentBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureArgumentIsMutable(); - argument_.set(index, value); - onChanged(); - } else { - argumentBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder setArgument( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) { - if (argumentBuilder_ == null) { - ensureArgumentIsMutable(); - argument_.set(index, builderForValue.build()); - onChanged(); - } else { - argumentBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder addArgument(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) { - if (argumentBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureArgumentIsMutable(); - argument_.add(value); - onChanged(); - } else { - argumentBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder addArgument( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument value) { - if (argumentBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureArgumentIsMutable(); - argument_.add(index, value); - onChanged(); - } else { - argumentBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder addArgument( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) { - if (argumentBuilder_ == null) { - ensureArgumentIsMutable(); - argument_.add(builderForValue.build()); - onChanged(); - } else { - argumentBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder addArgument( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder builderForValue) { - if (argumentBuilder_ == null) { - ensureArgumentIsMutable(); - argument_.add(index, builderForValue.build()); - onChanged(); - } else { - argumentBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder addAllArgument( - java.lang.Iterable values) { - if (argumentBuilder_ == null) { - ensureArgumentIsMutable(); - super.addAll(values, argument_); - onChanged(); - } else { - argumentBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder clearArgument() { - if (argumentBuilder_ == null) { - argument_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000002); - onChanged(); - } else { - argumentBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public Builder removeArgument(int index) { - if (argumentBuilder_ == null) { - ensureArgumentIsMutable(); - argument_.remove(index); - onChanged(); - } else { - argumentBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder getArgumentBuilder( - int index) { - return getArgumentFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder getArgumentOrBuilder( - int index) { - if (argumentBuilder_ == null) { - return argument_.get(index); } else { - return argumentBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public java.util.List - getArgumentOrBuilderList() { - if (argumentBuilder_ != null) { - return argumentBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(argument_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder() { - return getArgumentFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder addArgumentBuilder( - int index) { - return getArgumentFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type.Argument argument = 2; - */ - public java.util.List - getArgumentBuilderList() { - return getArgumentFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder> - getArgumentFieldBuilder() { - if (argumentBuilder_ == null) { - argumentBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Argument.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.ArgumentOrBuilder>( - argument_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); - argument_ = null; - } - return argumentBuilder_; - } - - // optional bool nullable = 3 [default = false]; - private boolean nullable_ ; - /** - * optional bool nullable = 3 [default = false]; - */ - public boolean hasNullable() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional bool nullable = 3 [default = false]; - */ - public boolean getNullable() { - return nullable_; - } - /** - * optional bool nullable = 3 [default = false]; - */ - public Builder setNullable(boolean value) { - bitField0_ |= 0x00000004; - nullable_ = value; - onChanged(); - return this; - } - /** - * optional bool nullable = 3 [default = false]; - */ - public Builder clearNullable() { - bitField0_ = (bitField0_ & ~0x00000004); - nullable_ = false; - onChanged(); - return this; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Type) - } - - static { - defaultInstance = new Type(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Type) - } - - public interface TypeParameterOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // required int32 id = 1; - /** - * required int32 id = 1; - */ - boolean hasId(); - /** - * required int32 id = 1; - */ - int getId(); - - // required int32 name = 2; - /** - * required int32 name = 2; - */ - boolean hasName(); - /** - * required int32 name = 2; - */ - int getName(); - - // optional bool reified = 3 [default = false]; - /** - * optional bool reified = 3 [default = false]; - */ - boolean hasReified(); - /** - * optional bool reified = 3 [default = false]; - */ - boolean getReified(); - - // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - /** - * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - */ - boolean hasVariance(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance(); - - // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - java.util.List - getUpperBoundList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - int getUpperBoundCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - java.util.List - getUpperBoundOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder( - int index); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.TypeParameter} - */ - public static final class TypeParameter extends - com.google.protobuf.GeneratedMessage - implements TypeParameterOrBuilder { - // Use TypeParameter.newBuilder() to construct. - private TypeParameter(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private TypeParameter(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final TypeParameter defaultInstance; - public static TypeParameter getDefaultInstance() { - return defaultInstance; - } - - public TypeParameter getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private TypeParameter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - id_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - name_ = input.readInt32(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - reified_ = input.readBool(); - break; - } - case 32: { - int rawValue = input.readEnum(); - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance value = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(4, rawValue); - } else { - bitField0_ |= 0x00000008; - variance_ = value; - } - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - upperBound_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - upperBound_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry)); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - upperBound_ = java.util.Collections.unmodifiableList(upperBound_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public TypeParameter parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new TypeParameter(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance} - */ - public enum Variance - implements com.google.protobuf.ProtocolMessageEnum { - /** - * IN = 0; - */ - IN(0, 0), - /** - * OUT = 1; - */ - OUT(1, 1), - /** - * INV = 2; - */ - INV(2, 2), - ; - - /** - * IN = 0; - */ - public static final int IN_VALUE = 0; - /** - * OUT = 1; - */ - public static final int OUT_VALUE = 1; - /** - * INV = 2; - */ - public static final int INV_VALUE = 2; - - - public final int getNumber() { return value; } - - public static Variance valueOf(int value) { - switch (value) { - case 0: return IN; - case 1: return OUT; - case 2: return INV; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public Variance findValueByNumber(int number) { - return Variance.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDescriptor().getEnumTypes().get(0); - } - - private static final Variance[] VALUES = values(); - - public static Variance valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private Variance(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance) - } - - private int bitField0_; - // required int32 id = 1; - public static final int ID_FIELD_NUMBER = 1; - private int id_; - /** - * required int32 id = 1; - */ - public boolean hasId() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required int32 id = 1; - */ - public int getId() { - return id_; - } - - // required int32 name = 2; - public static final int NAME_FIELD_NUMBER = 2; - private int name_; - /** - * required int32 name = 2; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required int32 name = 2; - */ - public int getName() { - return name_; - } - - // optional bool reified = 3 [default = false]; - public static final int REIFIED_FIELD_NUMBER = 3; - private boolean reified_; - /** - * optional bool reified = 3 [default = false]; - */ - public boolean hasReified() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional bool reified = 3 [default = false]; - */ - public boolean getReified() { - return reified_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - public static final int VARIANCE_FIELD_NUMBER = 4; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance variance_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - */ - public boolean hasVariance() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() { - return variance_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - public static final int UPPER_BOUND_FIELD_NUMBER = 5; - private java.util.List upperBound_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public java.util.List getUpperBoundList() { - return upperBound_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public java.util.List - getUpperBoundOrBuilderList() { - return upperBound_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public int getUpperBoundCount() { - return upperBound_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index) { - return upperBound_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder( - int index) { - return upperBound_.get(index); - } - - private void initFields() { - id_ = 0; - name_ = 0; - reified_ = false; - variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV; - upperBound_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasId()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasName()) { - memoizedIsInitialized = 0; - return false; - } - for (int i = 0; i < getUpperBoundCount(); i++) { - if (!getUpperBound(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, id_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeInt32(2, name_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeBool(3, reified_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeEnum(4, variance_.getNumber()); - } - for (int i = 0; i < upperBound_.size(); i++) { - output.writeMessage(5, upperBound_.get(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, id_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, name_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeBoolSize(3, reified_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(4, variance_.getNumber()); - } - for (int i = 0; i < upperBound_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, upperBound_.get(i)); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.TypeParameter} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getUpperBoundFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - id_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); - reified_ = false; - bitField0_ = (bitField0_ & ~0x00000004); - variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV; - bitField0_ = (bitField0_ & ~0x00000008); - if (upperBoundBuilder_ == null) { - upperBound_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); - } else { - upperBoundBuilder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.id_ = id_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.name_ = name_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.reified_ = reified_; - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } - result.variance_ = variance_; - if (upperBoundBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { - upperBound_ = java.util.Collections.unmodifiableList(upperBound_); - bitField0_ = (bitField0_ & ~0x00000010); - } - result.upperBound_ = upperBound_; - } else { - result.upperBound_ = upperBoundBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()) return this; - if (other.hasId()) { - setId(other.getId()); - } - if (other.hasName()) { - setName(other.getName()); - } - if (other.hasReified()) { - setReified(other.getReified()); - } - if (other.hasVariance()) { - setVariance(other.getVariance()); - } - if (upperBoundBuilder_ == null) { - if (!other.upperBound_.isEmpty()) { - if (upperBound_.isEmpty()) { - upperBound_ = other.upperBound_; - bitField0_ = (bitField0_ & ~0x00000010); - } else { - ensureUpperBoundIsMutable(); - upperBound_.addAll(other.upperBound_); - } - onChanged(); - } - } else { - if (!other.upperBound_.isEmpty()) { - if (upperBoundBuilder_.isEmpty()) { - upperBoundBuilder_.dispose(); - upperBoundBuilder_ = null; - upperBound_ = other.upperBound_; - bitField0_ = (bitField0_ & ~0x00000010); - upperBoundBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getUpperBoundFieldBuilder() : null; - } else { - upperBoundBuilder_.addAllMessages(other.upperBound_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasId()) { - - return false; - } - if (!hasName()) { - - return false; - } - for (int i = 0; i < getUpperBoundCount(); i++) { - if (!getUpperBound(i).isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // required int32 id = 1; - private int id_ ; - /** - * required int32 id = 1; - */ - public boolean hasId() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required int32 id = 1; - */ - public int getId() { - return id_; - } - /** - * required int32 id = 1; - */ - public Builder setId(int value) { - bitField0_ |= 0x00000001; - id_ = value; - onChanged(); - return this; - } - /** - * required int32 id = 1; - */ - public Builder clearId() { - bitField0_ = (bitField0_ & ~0x00000001); - id_ = 0; - onChanged(); - return this; - } - - // required int32 name = 2; - private int name_ ; - /** - * required int32 name = 2; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required int32 name = 2; - */ - public int getName() { - return name_; - } - /** - * required int32 name = 2; - */ - public Builder setName(int value) { - bitField0_ |= 0x00000002; - name_ = value; - onChanged(); - return this; - } - /** - * required int32 name = 2; - */ - public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000002); - name_ = 0; - onChanged(); - return this; - } - - // optional bool reified = 3 [default = false]; - private boolean reified_ ; - /** - * optional bool reified = 3 [default = false]; - */ - public boolean hasReified() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional bool reified = 3 [default = false]; - */ - public boolean getReified() { - return reified_; - } - /** - * optional bool reified = 3 [default = false]; - */ - public Builder setReified(boolean value) { - bitField0_ |= 0x00000004; - reified_ = value; - onChanged(); - return this; - } - /** - * optional bool reified = 3 [default = false]; - */ - public Builder clearReified() { - bitField0_ = (bitField0_ & ~0x00000004); - reified_ = false; - onChanged(); - return this; - } - - // optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV; - /** - * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - */ - public boolean hasVariance() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance getVariance() { - return variance_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - */ - public Builder setVariance(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000008; - variance_ = value; - onChanged(); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.TypeParameter.Variance variance = 4 [default = INV]; - */ - public Builder clearVariance() { - bitField0_ = (bitField0_ & ~0x00000008); - variance_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Variance.INV; - onChanged(); - return this; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - private java.util.List upperBound_ = - java.util.Collections.emptyList(); - private void ensureUpperBoundIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { - upperBound_ = new java.util.ArrayList(upperBound_); - bitField0_ |= 0x00000010; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> upperBoundBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public java.util.List getUpperBoundList() { - if (upperBoundBuilder_ == null) { - return java.util.Collections.unmodifiableList(upperBound_); - } else { - return upperBoundBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public int getUpperBoundCount() { - if (upperBoundBuilder_ == null) { - return upperBound_.size(); - } else { - return upperBoundBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getUpperBound(int index) { - if (upperBoundBuilder_ == null) { - return upperBound_.get(index); - } else { - return upperBoundBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder setUpperBound( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (upperBoundBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureUpperBoundIsMutable(); - upperBound_.set(index, value); - onChanged(); - } else { - upperBoundBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder setUpperBound( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (upperBoundBuilder_ == null) { - ensureUpperBoundIsMutable(); - upperBound_.set(index, builderForValue.build()); - onChanged(); - } else { - upperBoundBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder addUpperBound(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (upperBoundBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureUpperBoundIsMutable(); - upperBound_.add(value); - onChanged(); - } else { - upperBoundBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder addUpperBound( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (upperBoundBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureUpperBoundIsMutable(); - upperBound_.add(index, value); - onChanged(); - } else { - upperBoundBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder addUpperBound( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (upperBoundBuilder_ == null) { - ensureUpperBoundIsMutable(); - upperBound_.add(builderForValue.build()); - onChanged(); - } else { - upperBoundBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder addUpperBound( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (upperBoundBuilder_ == null) { - ensureUpperBoundIsMutable(); - upperBound_.add(index, builderForValue.build()); - onChanged(); - } else { - upperBoundBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder addAllUpperBound( - java.lang.Iterable values) { - if (upperBoundBuilder_ == null) { - ensureUpperBoundIsMutable(); - super.addAll(values, upperBound_); - onChanged(); - } else { - upperBoundBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder clearUpperBound() { - if (upperBoundBuilder_ == null) { - upperBound_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); - onChanged(); - } else { - upperBoundBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public Builder removeUpperBound(int index) { - if (upperBoundBuilder_ == null) { - ensureUpperBoundIsMutable(); - upperBound_.remove(index); - onChanged(); - } else { - upperBoundBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getUpperBoundBuilder( - int index) { - return getUpperBoundFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getUpperBoundOrBuilder( - int index) { - if (upperBoundBuilder_ == null) { - return upperBound_.get(index); } else { - return upperBoundBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public java.util.List - getUpperBoundOrBuilderList() { - if (upperBoundBuilder_ != null) { - return upperBoundBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(upperBound_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder() { - return getUpperBoundFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addUpperBoundBuilder( - int index) { - return getUpperBoundFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type upper_bound = 5; - */ - public java.util.List - getUpperBoundBuilderList() { - return getUpperBoundFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> - getUpperBoundFieldBuilder() { - if (upperBoundBuilder_ == null) { - upperBoundBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( - upperBound_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); - upperBound_ = null; - } - return upperBoundBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter) - } - - static { - defaultInstance = new TypeParameter(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.TypeParameter) - } - - public interface ClassOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional int32 flags = 1 [default = 0]; - /** - * optional int32 flags = 1 [default = 0]; - * - * 
-     *
-     *Visibility
-     *Modality
-     *has_annotation
-     *ClassKind
-     *is_inner
-     *
- */ - boolean hasFlags(); - /** - * optional int32 flags = 1 [default = 0]; - * - * 
-     *
-     *Visibility
-     *Modality
-     *has_annotation
-     *ClassKind
-     *is_inner
-     *
- */ - int getFlags(); - - // optional string extra_visibility = 2; - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - boolean hasExtraVisibility(); - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - java.lang.String getExtraVisibility(); - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - com.google.protobuf.ByteString - getExtraVisibilityBytes(); - - // required int32 fq_name = 3; - /** - * required int32 fq_name = 3; - */ - boolean hasFqName(); - /** - * required int32 fq_name = 3; - */ - int getFqName(); - - // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-     *
- */ - boolean hasClassObject(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder(); - - // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - java.util.List - getTypeParameterList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - int getTypeParameterCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - java.util.List - getTypeParameterOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( - int index); - - // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - java.util.List - getSupertypeList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - int getSupertypeCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - java.util.List - getSupertypeOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder( - int index); - - // repeated int32 nested_class_name = 7; - /** - * repeated int32 nested_class_name = 7; - * - * 
-     * we store only names, because the actual information must reside in the corresponding .class files,
-     * to be obtainable through reflection at runtime
-     *
- */ - java.util.List getNestedClassNameList(); - /** - * repeated int32 nested_class_name = 7; - * - * 
-     * we store only names, because the actual information must reside in the corresponding .class files,
-     * to be obtainable through reflection at runtime
-     *
- */ - int getNestedClassNameCount(); - /** - * repeated int32 nested_class_name = 7; - * - * 
-     * we store only names, because the actual information must reside in the corresponding .class files,
-     * to be obtainable through reflection at runtime
-     *
- */ - int getNestedClassName(int index); - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - java.util.List - getMemberList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - int getMemberCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - java.util.List - getMemberOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( - int index); - - // repeated int32 enum_entry = 12; - /** - * repeated int32 enum_entry = 12; - */ - java.util.List getEnumEntryList(); - /** - * repeated int32 enum_entry = 12; - */ - int getEnumEntryCount(); - /** - * repeated int32 enum_entry = 12; - */ - int getEnumEntry(int index); - - // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-     * This field is present if and only if the class has a primary constructor
-     *
- */ - boolean hasPrimaryConstructor(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-     * This field is present if and only if the class has a primary constructor
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-     * This field is present if and only if the class has a primary constructor
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class} - */ - public static final class Class extends - com.google.protobuf.GeneratedMessage - implements ClassOrBuilder { - // Use Class.newBuilder() to construct. - private Class(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private Class(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final Class defaultInstance; - public static Class getDefaultInstance() { - return defaultInstance; - } - - public Class getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Class( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - flags_ = input.readInt32(); - break; - } - case 18: { - bitField0_ |= 0x00000002; - extraVisibility_ = input.readBytes(); - break; - } - case 24: { - bitField0_ |= 0x00000004; - fqName_ = input.readInt32(); - break; - } - case 34: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = classObject_.toBuilder(); - } - classObject_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(classObject_); - classObject_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - break; - } - case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - typeParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry)); - break; - } - case 50: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - supertype_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000020; - } - supertype_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry)); - break; - } - case 56: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - nestedClassName_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000040; - } - nestedClassName_.add(input.readInt32()); - break; - } - case 58: { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040) && input.getBytesUntilLimit() > 0) { - nestedClassName_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000040; - } - while (input.getBytesUntilLimit() > 0) { - nestedClassName_.add(input.readInt32()); - } - input.popLimit(limit); - break; - } - case 90: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { - member_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000080; - } - member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry)); - break; - } - case 96: { - if (!((mutable_bitField0_ & 0x00000100) == 0x00000100)) { - enumEntry_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000100; - } - enumEntry_.add(input.readInt32()); - break; - } - case 98: { - int length = input.readRawVarint32(); - int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000100) == 0x00000100) && input.getBytesUntilLimit() > 0) { - enumEntry_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000100; - } - while (input.getBytesUntilLimit() > 0) { - enumEntry_.add(input.readInt32()); - } - input.popLimit(limit); - break; - } - case 106: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { - subBuilder = primaryConstructor_.toBuilder(); - } - primaryConstructor_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(primaryConstructor_); - primaryConstructor_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000010; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); - } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { - supertype_ = java.util.Collections.unmodifiableList(supertype_); - } - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { - nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_); - } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { - member_ = java.util.Collections.unmodifiableList(member_); - } - if (((mutable_bitField0_ & 0x00000100) == 0x00000100)) { - enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Class parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Class(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Class.Kind} - */ - public enum Kind - implements com.google.protobuf.ProtocolMessageEnum { - /** - * CLASS = 0; - * - * 
-       * 3 bits
-       *
- */ - CLASS(0, 0), - /** - * TRAIT = 1; - */ - TRAIT(1, 1), - /** - * ENUM_CLASS = 2; - */ - ENUM_CLASS(2, 2), - /** - * ENUM_ENTRY = 3; - */ - ENUM_ENTRY(3, 3), - /** - * ANNOTATION_CLASS = 4; - */ - ANNOTATION_CLASS(4, 4), - /** - * OBJECT = 5; - */ - OBJECT(5, 5), - /** - * CLASS_OBJECT = 6; - */ - CLASS_OBJECT(6, 6), - ; - - /** - * CLASS = 0; - * - * 
-       * 3 bits
-       *
- */ - public static final int CLASS_VALUE = 0; - /** - * TRAIT = 1; - */ - public static final int TRAIT_VALUE = 1; - /** - * ENUM_CLASS = 2; - */ - public static final int ENUM_CLASS_VALUE = 2; - /** - * ENUM_ENTRY = 3; - */ - public static final int ENUM_ENTRY_VALUE = 3; - /** - * ANNOTATION_CLASS = 4; - */ - public static final int ANNOTATION_CLASS_VALUE = 4; - /** - * OBJECT = 5; - */ - public static final int OBJECT_VALUE = 5; - /** - * CLASS_OBJECT = 6; - */ - public static final int CLASS_OBJECT_VALUE = 6; - - - public final int getNumber() { return value; } - - public static Kind valueOf(int value) { - switch (value) { - case 0: return CLASS; - case 1: return TRAIT; - case 2: return ENUM_CLASS; - case 3: return ENUM_ENTRY; - case 4: return ANNOTATION_CLASS; - case 5: return OBJECT; - case 6: return CLASS_OBJECT; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public Kind findValueByNumber(int number) { - return Kind.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDescriptor().getEnumTypes().get(0); - } - - private static final Kind[] VALUES = values(); - - public static Kind valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private Kind(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Class.Kind) - } - - public interface ClassObjectOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-       *
- */ - boolean hasData(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-       *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-       *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.ClassObject} - */ - public static final class ClassObject extends - com.google.protobuf.GeneratedMessage - implements ClassObjectOrBuilder { - // Use ClassObject.newBuilder() to construct. - private ClassObject(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private ClassObject(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final ClassObject defaultInstance; - public static ClassObject getDefaultInstance() { - return defaultInstance; - } - - public ClassObject getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ClassObject( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = data_.toBuilder(); - } - data_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(data_); - data_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public ClassObject parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ClassObject(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - public static final int DATA_FIELD_NUMBER = 1; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class data_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-       *
- */ - public boolean hasData() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData() { - return data_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-       * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-       * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder() { - return data_; - } - - private void initFields() { - data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (hasData()) { - if (!getData().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, data_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, data_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.ClassObject} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getDataFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (dataBuilder_ == null) { - data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); - } else { - dataBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - if (dataBuilder_ == null) { - result.data_ = data_; - } else { - result.data_ = dataBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance()) return this; - if (other.hasData()) { - mergeData(other.getData()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (hasData()) { - if (!getData().isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder> dataBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - public boolean hasData() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getData() { - if (dataBuilder_ == null) { - return data_; - } else { - return dataBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - public Builder setData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class value) { - if (dataBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - data_ = value; - onChanged(); - } else { - dataBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - public Builder setData( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder builderForValue) { - if (dataBuilder_ == null) { - data_ = builderForValue.build(); - onChanged(); - } else { - dataBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - public Builder mergeData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class value) { - if (dataBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - data_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance()) { - data_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.newBuilder(data_).mergeFrom(value).buildPartial(); - } else { - data_ = value; - } - onChanged(); - } else { - dataBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - public Builder clearData() { - if (dataBuilder_ == null) { - data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); - onChanged(); - } else { - dataBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder getDataBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getDataFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder getDataOrBuilder() { - if (dataBuilder_ != null) { - return dataBuilder_.getMessageOrBuilder(); - } else { - return data_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class data = 1; - * - * 
-         * If this field is present, it contains serialized data for a synthetic class object, for which there's no class file.
-         * Otherwise class object was compiled to a separate class file and serialized data can be found in the annotation on that class
-         *
- */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder> - getDataFieldBuilder() { - if (dataBuilder_ == null) { - dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder>( - data_, - getParentForChildren(), - isClean()); - data_ = null; - } - return dataBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class.ClassObject) - } - - static { - defaultInstance = new ClassObject(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class.ClassObject) - } - - public interface PrimaryConstructorOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       *
- */ - boolean hasData(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor} - */ - public static final class PrimaryConstructor extends - com.google.protobuf.GeneratedMessage - implements PrimaryConstructorOrBuilder { - // Use PrimaryConstructor.newBuilder() to construct. - private PrimaryConstructor(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private PrimaryConstructor(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final PrimaryConstructor defaultInstance; - public static PrimaryConstructor getDefaultInstance() { - return defaultInstance; - } - - public PrimaryConstructor getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private PrimaryConstructor( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder subBuilder = null; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - subBuilder = data_.toBuilder(); - } - data_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(data_); - data_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000001; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public PrimaryConstructor parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new PrimaryConstructor(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - public static final int DATA_FIELD_NUMBER = 1; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable data_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       *
- */ - public boolean hasData() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData() { - return data_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-       * If this field is present, it contains serialized data for the primary constructor.
-       * Otherwise it's default and can be created manually upon deserialization
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() { - return data_; - } - - private void initFields() { - data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (hasData()) { - if (!getData().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeMessage(1, data_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, data_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getDataFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (dataBuilder_ == null) { - data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); - } else { - dataBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - if (dataBuilder_ == null) { - result.data_ = data_; - } else { - result.data_ = dataBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) return this; - if (other.hasData()) { - mergeData(other.getData()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (hasData()) { - if (!getData().isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> dataBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - public boolean hasData() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getData() { - if (dataBuilder_ == null) { - return data_; - } else { - return dataBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - public Builder setData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { - if (dataBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - data_ = value; - onChanged(); - } else { - dataBuilder_.setMessage(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - public Builder setData( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { - if (dataBuilder_ == null) { - data_ = builderForValue.build(); - onChanged(); - } else { - dataBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - public Builder mergeData(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { - if (dataBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001) && - data_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()) { - data_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.newBuilder(data_).mergeFrom(value).buildPartial(); - } else { - data_ = value; - } - onChanged(); - } else { - dataBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000001; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - public Builder clearData() { - if (dataBuilder_ == null) { - data_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); - onChanged(); - } else { - dataBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000001); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getDataBuilder() { - bitField0_ |= 0x00000001; - onChanged(); - return getDataFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getDataOrBuilder() { - if (dataBuilder_ != null) { - return dataBuilder_.getMessageOrBuilder(); - } else { - return data_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Callable data = 1; - * - * 
-         * If this field is present, it contains serialized data for the primary constructor.
-         * Otherwise it's default and can be created manually upon deserialization
-         *
- */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> - getDataFieldBuilder() { - if (dataBuilder_ == null) { - dataBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>( - data_, - getParentForChildren(), - isClean()); - data_ = null; - } - return dataBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor) - } - - static { - defaultInstance = new PrimaryConstructor(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor) - } - - private int bitField0_; - // optional int32 flags = 1 [default = 0]; - public static final int FLAGS_FIELD_NUMBER = 1; - private int flags_; - /** - * optional int32 flags = 1 [default = 0]; - * - * 
-     *
-     *Visibility
-     *Modality
-     *has_annotation
-     *ClassKind
-     *is_inner
-     *
- */ - public boolean hasFlags() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional int32 flags = 1 [default = 0]; - * - * 
-     *
-     *Visibility
-     *Modality
-     *has_annotation
-     *ClassKind
-     *is_inner
-     *
- */ - public int getFlags() { - return flags_; - } - - // optional string extra_visibility = 2; - public static final int EXTRA_VISIBILITY_FIELD_NUMBER = 2; - private java.lang.Object extraVisibility_; - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - public boolean hasExtraVisibility() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - public java.lang.String getExtraVisibility() { - java.lang.Object ref = extraVisibility_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - extraVisibility_ = s; - } - return s; - } - } - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - public com.google.protobuf.ByteString - getExtraVisibilityBytes() { - java.lang.Object ref = extraVisibility_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - extraVisibility_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // required int32 fq_name = 3; - public static final int FQ_NAME_FIELD_NUMBER = 3; - private int fqName_; - /** - * required int32 fq_name = 3; - */ - public boolean hasFqName() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * required int32 fq_name = 3; - */ - public int getFqName() { - return fqName_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - public static final int CLASS_OBJECT_FIELD_NUMBER = 4; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject classObject_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-     *
- */ - public boolean hasClassObject() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject() { - return classObject_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-     * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder() { - return classObject_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - public static final int TYPE_PARAMETER_FIELD_NUMBER = 5; - private java.util.List typeParameter_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public java.util.List getTypeParameterList() { - return typeParameter_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public java.util.List - getTypeParameterOrBuilderList() { - return typeParameter_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public int getTypeParameterCount() { - return typeParameter_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) { - return typeParameter_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( - int index) { - return typeParameter_.get(index); - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - public static final int SUPERTYPE_FIELD_NUMBER = 6; - private java.util.List supertype_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public java.util.List getSupertypeList() { - return supertype_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public java.util.List - getSupertypeOrBuilderList() { - return supertype_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public int getSupertypeCount() { - return supertype_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index) { - return supertype_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder( - int index) { - return supertype_.get(index); - } - - // repeated int32 nested_class_name = 7; - public static final int NESTED_CLASS_NAME_FIELD_NUMBER = 7; - private java.util.List nestedClassName_; - /** - * repeated int32 nested_class_name = 7; - * - * 
-     * we store only names, because the actual information must reside in the corresponding .class files,
-     * to be obtainable through reflection at runtime
-     *
- */ - public java.util.List - getNestedClassNameList() { - return nestedClassName_; - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-     * we store only names, because the actual information must reside in the corresponding .class files,
-     * to be obtainable through reflection at runtime
-     *
- */ - public int getNestedClassNameCount() { - return nestedClassName_.size(); - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-     * we store only names, because the actual information must reside in the corresponding .class files,
-     * to be obtainable through reflection at runtime
-     *
- */ - public int getNestedClassName(int index) { - return nestedClassName_.get(index); - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - public static final int MEMBER_FIELD_NUMBER = 11; - private java.util.List member_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public java.util.List getMemberList() { - return member_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public java.util.List - getMemberOrBuilderList() { - return member_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public int getMemberCount() { - return member_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) { - return member_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( - int index) { - return member_.get(index); - } - - // repeated int32 enum_entry = 12; - public static final int ENUM_ENTRY_FIELD_NUMBER = 12; - private java.util.List enumEntry_; - /** - * repeated int32 enum_entry = 12; - */ - public java.util.List - getEnumEntryList() { - return enumEntry_; - } - /** - * repeated int32 enum_entry = 12; - */ - public int getEnumEntryCount() { - return enumEntry_.size(); - } - /** - * repeated int32 enum_entry = 12; - */ - public int getEnumEntry(int index) { - return enumEntry_.get(index); - } - - // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - public static final int PRIMARY_CONSTRUCTOR_FIELD_NUMBER = 13; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-     * This field is present if and only if the class has a primary constructor
-     *
- */ - public boolean hasPrimaryConstructor() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-     * This field is present if and only if the class has a primary constructor
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() { - return primaryConstructor_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-     * This field is present if and only if the class has a primary constructor
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() { - return primaryConstructor_; - } - - private void initFields() { - flags_ = 0; - extraVisibility_ = ""; - fqName_ = 0; - classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); - typeParameter_ = java.util.Collections.emptyList(); - supertype_ = java.util.Collections.emptyList(); - nestedClassName_ = java.util.Collections.emptyList(); - member_ = java.util.Collections.emptyList(); - enumEntry_ = java.util.Collections.emptyList(); - primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasFqName()) { - memoizedIsInitialized = 0; - return false; - } - if (hasClassObject()) { - if (!getClassObject().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - for (int i = 0; i < getTypeParameterCount(); i++) { - if (!getTypeParameter(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - for (int i = 0; i < getSupertypeCount(); i++) { - if (!getSupertype(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - for (int i = 0; i < getMemberCount(); i++) { - if (!getMember(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasPrimaryConstructor()) { - if (!getPrimaryConstructor().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, flags_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getExtraVisibilityBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeInt32(3, fqName_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, classObject_); - } - for (int i = 0; i < typeParameter_.size(); i++) { - output.writeMessage(5, typeParameter_.get(i)); - } - for (int i = 0; i < supertype_.size(); i++) { - output.writeMessage(6, supertype_.get(i)); - } - for (int i = 0; i < nestedClassName_.size(); i++) { - output.writeInt32(7, nestedClassName_.get(i)); - } - for (int i = 0; i < member_.size(); i++) { - output.writeMessage(11, member_.get(i)); - } - for (int i = 0; i < enumEntry_.size(); i++) { - output.writeInt32(12, enumEntry_.get(i)); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(13, primaryConstructor_); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, flags_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getExtraVisibilityBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(3, fqName_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, classObject_); - } - for (int i = 0; i < typeParameter_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, typeParameter_.get(i)); - } - for (int i = 0; i < supertype_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(6, supertype_.get(i)); - } - { - int dataSize = 0; - for (int i = 0; i < nestedClassName_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(nestedClassName_.get(i)); - } - size += dataSize; - size += 1 * getNestedClassNameList().size(); - } - for (int i = 0; i < member_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(11, member_.get(i)); - } - { - int dataSize = 0; - for (int i = 0; i < enumEntry_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeInt32SizeNoTag(enumEntry_.get(i)); - } - size += dataSize; - size += 1 * getEnumEntryList().size(); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(13, primaryConstructor_); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Class} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.ClassOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getClassObjectFieldBuilder(); - getTypeParameterFieldBuilder(); - getSupertypeFieldBuilder(); - getMemberFieldBuilder(); - getPrimaryConstructorFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - flags_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); - extraVisibility_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - fqName_ = 0; - bitField0_ = (bitField0_ & ~0x00000004); - if (classObjectBuilder_ == null) { - classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); - } else { - classObjectBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000008); - if (typeParameterBuilder_ == null) { - typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); - } else { - typeParameterBuilder_.clear(); - } - if (supertypeBuilder_ == null) { - supertype_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); - } else { - supertypeBuilder_.clear(); - } - nestedClassName_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000040); - if (memberBuilder_ == null) { - member_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); - } else { - memberBuilder_.clear(); - } - enumEntry_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000100); - if (primaryConstructorBuilder_ == null) { - primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); - } else { - primaryConstructorBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000200); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.flags_ = flags_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.extraVisibility_ = extraVisibility_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.fqName_ = fqName_; - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } - if (classObjectBuilder_ == null) { - result.classObject_ = classObject_; - } else { - result.classObject_ = classObjectBuilder_.build(); - } - if (typeParameterBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); - bitField0_ = (bitField0_ & ~0x00000010); - } - result.typeParameter_ = typeParameter_; - } else { - result.typeParameter_ = typeParameterBuilder_.build(); - } - if (supertypeBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { - supertype_ = java.util.Collections.unmodifiableList(supertype_); - bitField0_ = (bitField0_ & ~0x00000020); - } - result.supertype_ = supertype_; - } else { - result.supertype_ = supertypeBuilder_.build(); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - nestedClassName_ = java.util.Collections.unmodifiableList(nestedClassName_); - bitField0_ = (bitField0_ & ~0x00000040); - } - result.nestedClassName_ = nestedClassName_; - if (memberBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { - member_ = java.util.Collections.unmodifiableList(member_); - bitField0_ = (bitField0_ & ~0x00000080); - } - result.member_ = member_; - } else { - result.member_ = memberBuilder_.build(); - } - if (((bitField0_ & 0x00000100) == 0x00000100)) { - enumEntry_ = java.util.Collections.unmodifiableList(enumEntry_); - bitField0_ = (bitField0_ & ~0x00000100); - } - result.enumEntry_ = enumEntry_; - if (((from_bitField0_ & 0x00000200) == 0x00000200)) { - to_bitField0_ |= 0x00000010; - } - if (primaryConstructorBuilder_ == null) { - result.primaryConstructor_ = primaryConstructor_; - } else { - result.primaryConstructor_ = primaryConstructorBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.getDefaultInstance()) return this; - if (other.hasFlags()) { - setFlags(other.getFlags()); - } - if (other.hasExtraVisibility()) { - bitField0_ |= 0x00000002; - extraVisibility_ = other.extraVisibility_; - onChanged(); - } - if (other.hasFqName()) { - setFqName(other.getFqName()); - } - if (other.hasClassObject()) { - mergeClassObject(other.getClassObject()); - } - if (typeParameterBuilder_ == null) { - if (!other.typeParameter_.isEmpty()) { - if (typeParameter_.isEmpty()) { - typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); - } else { - ensureTypeParameterIsMutable(); - typeParameter_.addAll(other.typeParameter_); - } - onChanged(); - } - } else { - if (!other.typeParameter_.isEmpty()) { - if (typeParameterBuilder_.isEmpty()) { - typeParameterBuilder_.dispose(); - typeParameterBuilder_ = null; - typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); - typeParameterBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getTypeParameterFieldBuilder() : null; - } else { - typeParameterBuilder_.addAllMessages(other.typeParameter_); - } - } - } - if (supertypeBuilder_ == null) { - if (!other.supertype_.isEmpty()) { - if (supertype_.isEmpty()) { - supertype_ = other.supertype_; - bitField0_ = (bitField0_ & ~0x00000020); - } else { - ensureSupertypeIsMutable(); - supertype_.addAll(other.supertype_); - } - onChanged(); - } - } else { - if (!other.supertype_.isEmpty()) { - if (supertypeBuilder_.isEmpty()) { - supertypeBuilder_.dispose(); - supertypeBuilder_ = null; - supertype_ = other.supertype_; - bitField0_ = (bitField0_ & ~0x00000020); - supertypeBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getSupertypeFieldBuilder() : null; - } else { - supertypeBuilder_.addAllMessages(other.supertype_); - } - } - } - if (!other.nestedClassName_.isEmpty()) { - if (nestedClassName_.isEmpty()) { - nestedClassName_ = other.nestedClassName_; - bitField0_ = (bitField0_ & ~0x00000040); - } else { - ensureNestedClassNameIsMutable(); - nestedClassName_.addAll(other.nestedClassName_); - } - onChanged(); - } - if (memberBuilder_ == null) { - if (!other.member_.isEmpty()) { - if (member_.isEmpty()) { - member_ = other.member_; - bitField0_ = (bitField0_ & ~0x00000080); - } else { - ensureMemberIsMutable(); - member_.addAll(other.member_); - } - onChanged(); - } - } else { - if (!other.member_.isEmpty()) { - if (memberBuilder_.isEmpty()) { - memberBuilder_.dispose(); - memberBuilder_ = null; - member_ = other.member_; - bitField0_ = (bitField0_ & ~0x00000080); - memberBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getMemberFieldBuilder() : null; - } else { - memberBuilder_.addAllMessages(other.member_); - } - } - } - if (!other.enumEntry_.isEmpty()) { - if (enumEntry_.isEmpty()) { - enumEntry_ = other.enumEntry_; - bitField0_ = (bitField0_ & ~0x00000100); - } else { - ensureEnumEntryIsMutable(); - enumEntry_.addAll(other.enumEntry_); - } - onChanged(); - } - if (other.hasPrimaryConstructor()) { - mergePrimaryConstructor(other.getPrimaryConstructor()); - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasFqName()) { - - return false; - } - if (hasClassObject()) { - if (!getClassObject().isInitialized()) { - - return false; - } - } - for (int i = 0; i < getTypeParameterCount(); i++) { - if (!getTypeParameter(i).isInitialized()) { - - return false; - } - } - for (int i = 0; i < getSupertypeCount(); i++) { - if (!getSupertype(i).isInitialized()) { - - return false; - } - } - for (int i = 0; i < getMemberCount(); i++) { - if (!getMember(i).isInitialized()) { - - return false; - } - } - if (hasPrimaryConstructor()) { - if (!getPrimaryConstructor().isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional int32 flags = 1 [default = 0]; - private int flags_ ; - /** - * optional int32 flags = 1 [default = 0]; - * - * 
-       *
-       *Visibility
-       *Modality
-       *has_annotation
-       *ClassKind
-       *is_inner
-       *
- */ - public boolean hasFlags() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional int32 flags = 1 [default = 0]; - * - * 
-       *
-       *Visibility
-       *Modality
-       *has_annotation
-       *ClassKind
-       *is_inner
-       *
- */ - public int getFlags() { - return flags_; - } - /** - * optional int32 flags = 1 [default = 0]; - * - * 
-       *
-       *Visibility
-       *Modality
-       *has_annotation
-       *ClassKind
-       *is_inner
-       *
- */ - public Builder setFlags(int value) { - bitField0_ |= 0x00000001; - flags_ = value; - onChanged(); - return this; - } - /** - * optional int32 flags = 1 [default = 0]; - * - * 
-       *
-       *Visibility
-       *Modality
-       *has_annotation
-       *ClassKind
-       *is_inner
-       *
- */ - public Builder clearFlags() { - bitField0_ = (bitField0_ & ~0x00000001); - flags_ = 0; - onChanged(); - return this; - } - - // optional string extra_visibility = 2; - private java.lang.Object extraVisibility_ = ""; - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public boolean hasExtraVisibility() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public java.lang.String getExtraVisibility() { - java.lang.Object ref = extraVisibility_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - extraVisibility_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public com.google.protobuf.ByteString - getExtraVisibilityBytes() { - java.lang.Object ref = extraVisibility_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - extraVisibility_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public Builder setExtraVisibility( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - extraVisibility_ = value; - onChanged(); - return this; - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public Builder clearExtraVisibility() { - bitField0_ = (bitField0_ & ~0x00000002); - extraVisibility_ = getDefaultInstance().getExtraVisibility(); - onChanged(); - return this; - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public Builder setExtraVisibilityBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - extraVisibility_ = value; - onChanged(); - return this; - } - - // required int32 fq_name = 3; - private int fqName_ ; - /** - * required int32 fq_name = 3; - */ - public boolean hasFqName() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * required int32 fq_name = 3; - */ - public int getFqName() { - return fqName_; - } - /** - * required int32 fq_name = 3; - */ - public Builder setFqName(int value) { - bitField0_ |= 0x00000004; - fqName_ = value; - onChanged(); - return this; - } - /** - * required int32 fq_name = 3; - */ - public Builder clearFqName() { - bitField0_ = (bitField0_ & ~0x00000004); - fqName_ = 0; - onChanged(); - return this; - } - - // optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder> classObjectBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - public boolean hasClassObject() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject getClassObject() { - if (classObjectBuilder_ == null) { - return classObject_; - } else { - return classObjectBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - public Builder setClassObject(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject value) { - if (classObjectBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - classObject_ = value; - onChanged(); - } else { - classObjectBuilder_.setMessage(value); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - public Builder setClassObject( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder builderForValue) { - if (classObjectBuilder_ == null) { - classObject_ = builderForValue.build(); - onChanged(); - } else { - classObjectBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - public Builder mergeClassObject(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject value) { - if (classObjectBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008) && - classObject_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance()) { - classObject_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.newBuilder(classObject_).mergeFrom(value).buildPartial(); - } else { - classObject_ = value; - } - onChanged(); - } else { - classObjectBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - public Builder clearClassObject() { - if (classObjectBuilder_ == null) { - classObject_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.getDefaultInstance(); - onChanged(); - } else { - classObjectBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder getClassObjectBuilder() { - bitField0_ |= 0x00000008; - onChanged(); - return getClassObjectFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder getClassObjectOrBuilder() { - if (classObjectBuilder_ != null) { - return classObjectBuilder_.getMessageOrBuilder(); - } else { - return classObject_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.ClassObject class_object = 4; - * - * 
-       * This field is present if and only if the class has a class object. Its proto should be found either here or in the separate file
-       *
- */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder> - getClassObjectFieldBuilder() { - if (classObjectBuilder_ == null) { - classObjectBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObject.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.ClassObjectOrBuilder>( - classObject_, - getParentForChildren(), - isClean()); - classObject_ = null; - } - return classObjectBuilder_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - private java.util.List typeParameter_ = - java.util.Collections.emptyList(); - private void ensureTypeParameterIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = new java.util.ArrayList(typeParameter_); - bitField0_ |= 0x00000010; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public java.util.List getTypeParameterList() { - if (typeParameterBuilder_ == null) { - return java.util.Collections.unmodifiableList(typeParameter_); - } else { - return typeParameterBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public int getTypeParameterCount() { - if (typeParameterBuilder_ == null) { - return typeParameter_.size(); - } else { - return typeParameterBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) { - if (typeParameterBuilder_ == null) { - return typeParameter_.get(index); - } else { - return typeParameterBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder setTypeParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { - if (typeParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTypeParameterIsMutable(); - typeParameter_.set(index, value); - onChanged(); - } else { - typeParameterBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder setTypeParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - typeParameter_.set(index, builderForValue.build()); - onChanged(); - } else { - typeParameterBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder addTypeParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { - if (typeParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTypeParameterIsMutable(); - typeParameter_.add(value); - onChanged(); - } else { - typeParameterBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder addTypeParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { - if (typeParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTypeParameterIsMutable(); - typeParameter_.add(index, value); - onChanged(); - } else { - typeParameterBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder addTypeParameter( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - typeParameter_.add(builderForValue.build()); - onChanged(); - } else { - typeParameterBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder addTypeParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - typeParameter_.add(index, builderForValue.build()); - onChanged(); - } else { - typeParameterBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder addAllTypeParameter( - java.lang.Iterable values) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - super.addAll(values, typeParameter_); - onChanged(); - } else { - typeParameterBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder clearTypeParameter() { - if (typeParameterBuilder_ == null) { - typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); - onChanged(); - } else { - typeParameterBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public Builder removeTypeParameter(int index) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - typeParameter_.remove(index); - onChanged(); - } else { - typeParameterBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder( - int index) { - return getTypeParameterFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( - int index) { - if (typeParameterBuilder_ == null) { - return typeParameter_.get(index); } else { - return typeParameterBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public java.util.List - getTypeParameterOrBuilderList() { - if (typeParameterBuilder_ != null) { - return typeParameterBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(typeParameter_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() { - return getTypeParameterFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder( - int index) { - return getTypeParameterFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 5; - */ - public java.util.List - getTypeParameterBuilderList() { - return getTypeParameterFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> - getTypeParameterFieldBuilder() { - if (typeParameterBuilder_ == null) { - typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder>( - typeParameter_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); - typeParameter_ = null; - } - return typeParameterBuilder_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - private java.util.List supertype_ = - java.util.Collections.emptyList(); - private void ensureSupertypeIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { - supertype_ = new java.util.ArrayList(supertype_); - bitField0_ |= 0x00000020; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> supertypeBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public java.util.List getSupertypeList() { - if (supertypeBuilder_ == null) { - return java.util.Collections.unmodifiableList(supertype_); - } else { - return supertypeBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public int getSupertypeCount() { - if (supertypeBuilder_ == null) { - return supertype_.size(); - } else { - return supertypeBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getSupertype(int index) { - if (supertypeBuilder_ == null) { - return supertype_.get(index); - } else { - return supertypeBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder setSupertype( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (supertypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureSupertypeIsMutable(); - supertype_.set(index, value); - onChanged(); - } else { - supertypeBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder setSupertype( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (supertypeBuilder_ == null) { - ensureSupertypeIsMutable(); - supertype_.set(index, builderForValue.build()); - onChanged(); - } else { - supertypeBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder addSupertype(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (supertypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureSupertypeIsMutable(); - supertype_.add(value); - onChanged(); - } else { - supertypeBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder addSupertype( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (supertypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureSupertypeIsMutable(); - supertype_.add(index, value); - onChanged(); - } else { - supertypeBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder addSupertype( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (supertypeBuilder_ == null) { - ensureSupertypeIsMutable(); - supertype_.add(builderForValue.build()); - onChanged(); - } else { - supertypeBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder addSupertype( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (supertypeBuilder_ == null) { - ensureSupertypeIsMutable(); - supertype_.add(index, builderForValue.build()); - onChanged(); - } else { - supertypeBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder addAllSupertype( - java.lang.Iterable values) { - if (supertypeBuilder_ == null) { - ensureSupertypeIsMutable(); - super.addAll(values, supertype_); - onChanged(); - } else { - supertypeBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder clearSupertype() { - if (supertypeBuilder_ == null) { - supertype_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000020); - onChanged(); - } else { - supertypeBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public Builder removeSupertype(int index) { - if (supertypeBuilder_ == null) { - ensureSupertypeIsMutable(); - supertype_.remove(index); - onChanged(); - } else { - supertypeBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getSupertypeBuilder( - int index) { - return getSupertypeFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getSupertypeOrBuilder( - int index) { - if (supertypeBuilder_ == null) { - return supertype_.get(index); } else { - return supertypeBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public java.util.List - getSupertypeOrBuilderList() { - if (supertypeBuilder_ != null) { - return supertypeBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(supertype_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder() { - return getSupertypeFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder addSupertypeBuilder( - int index) { - return getSupertypeFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Type supertype = 6; - */ - public java.util.List - getSupertypeBuilderList() { - return getSupertypeFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> - getSupertypeFieldBuilder() { - if (supertypeBuilder_ == null) { - supertypeBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( - supertype_, - ((bitField0_ & 0x00000020) == 0x00000020), - getParentForChildren(), - isClean()); - supertype_ = null; - } - return supertypeBuilder_; - } - - // repeated int32 nested_class_name = 7; - private java.util.List nestedClassName_ = java.util.Collections.emptyList(); - private void ensureNestedClassNameIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { - nestedClassName_ = new java.util.ArrayList(nestedClassName_); - bitField0_ |= 0x00000040; - } - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-       * we store only names, because the actual information must reside in the corresponding .class files,
-       * to be obtainable through reflection at runtime
-       *
- */ - public java.util.List - getNestedClassNameList() { - return java.util.Collections.unmodifiableList(nestedClassName_); - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-       * we store only names, because the actual information must reside in the corresponding .class files,
-       * to be obtainable through reflection at runtime
-       *
- */ - public int getNestedClassNameCount() { - return nestedClassName_.size(); - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-       * we store only names, because the actual information must reside in the corresponding .class files,
-       * to be obtainable through reflection at runtime
-       *
- */ - public int getNestedClassName(int index) { - return nestedClassName_.get(index); - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-       * we store only names, because the actual information must reside in the corresponding .class files,
-       * to be obtainable through reflection at runtime
-       *
- */ - public Builder setNestedClassName( - int index, int value) { - ensureNestedClassNameIsMutable(); - nestedClassName_.set(index, value); - onChanged(); - return this; - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-       * we store only names, because the actual information must reside in the corresponding .class files,
-       * to be obtainable through reflection at runtime
-       *
- */ - public Builder addNestedClassName(int value) { - ensureNestedClassNameIsMutable(); - nestedClassName_.add(value); - onChanged(); - return this; - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-       * we store only names, because the actual information must reside in the corresponding .class files,
-       * to be obtainable through reflection at runtime
-       *
- */ - public Builder addAllNestedClassName( - java.lang.Iterable values) { - ensureNestedClassNameIsMutable(); - super.addAll(values, nestedClassName_); - onChanged(); - return this; - } - /** - * repeated int32 nested_class_name = 7; - * - * 
-       * we store only names, because the actual information must reside in the corresponding .class files,
-       * to be obtainable through reflection at runtime
-       *
- */ - public Builder clearNestedClassName() { - nestedClassName_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000040); - onChanged(); - return this; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - private java.util.List member_ = - java.util.Collections.emptyList(); - private void ensureMemberIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { - member_ = new java.util.ArrayList(member_); - bitField0_ |= 0x00000080; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public java.util.List getMemberList() { - if (memberBuilder_ == null) { - return java.util.Collections.unmodifiableList(member_); - } else { - return memberBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public int getMemberCount() { - if (memberBuilder_ == null) { - return member_.size(); - } else { - return memberBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) { - if (memberBuilder_ == null) { - return member_.get(index); - } else { - return memberBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder setMember( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { - if (memberBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMemberIsMutable(); - member_.set(index, value); - onChanged(); - } else { - memberBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder setMember( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - member_.set(index, builderForValue.build()); - onChanged(); - } else { - memberBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder addMember(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { - if (memberBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMemberIsMutable(); - member_.add(value); - onChanged(); - } else { - memberBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder addMember( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { - if (memberBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMemberIsMutable(); - member_.add(index, value); - onChanged(); - } else { - memberBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder addMember( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - member_.add(builderForValue.build()); - onChanged(); - } else { - memberBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder addMember( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - member_.add(index, builderForValue.build()); - onChanged(); - } else { - memberBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder addAllMember( - java.lang.Iterable values) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - super.addAll(values, member_); - onChanged(); - } else { - memberBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder clearMember() { - if (memberBuilder_ == null) { - member_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); - onChanged(); - } else { - memberBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public Builder removeMember(int index) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - member_.remove(index); - onChanged(); - } else { - memberBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder( - int index) { - return getMemberFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( - int index) { - if (memberBuilder_ == null) { - return member_.get(index); } else { - return memberBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public java.util.List - getMemberOrBuilderList() { - if (memberBuilder_ != null) { - return memberBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(member_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() { - return getMemberFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder( - int index) { - return getMemberFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 11; - */ - public java.util.List - getMemberBuilderList() { - return getMemberFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> - getMemberFieldBuilder() { - if (memberBuilder_ == null) { - memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>( - member_, - ((bitField0_ & 0x00000080) == 0x00000080), - getParentForChildren(), - isClean()); - member_ = null; - } - return memberBuilder_; - } - - // repeated int32 enum_entry = 12; - private java.util.List enumEntry_ = java.util.Collections.emptyList(); - private void ensureEnumEntryIsMutable() { - if (!((bitField0_ & 0x00000100) == 0x00000100)) { - enumEntry_ = new java.util.ArrayList(enumEntry_); - bitField0_ |= 0x00000100; - } - } - /** - * repeated int32 enum_entry = 12; - */ - public java.util.List - getEnumEntryList() { - return java.util.Collections.unmodifiableList(enumEntry_); - } - /** - * repeated int32 enum_entry = 12; - */ - public int getEnumEntryCount() { - return enumEntry_.size(); - } - /** - * repeated int32 enum_entry = 12; - */ - public int getEnumEntry(int index) { - return enumEntry_.get(index); - } - /** - * repeated int32 enum_entry = 12; - */ - public Builder setEnumEntry( - int index, int value) { - ensureEnumEntryIsMutable(); - enumEntry_.set(index, value); - onChanged(); - return this; - } - /** - * repeated int32 enum_entry = 12; - */ - public Builder addEnumEntry(int value) { - ensureEnumEntryIsMutable(); - enumEntry_.add(value); - onChanged(); - return this; - } - /** - * repeated int32 enum_entry = 12; - */ - public Builder addAllEnumEntry( - java.lang.Iterable values) { - ensureEnumEntryIsMutable(); - super.addAll(values, enumEntry_); - onChanged(); - return this; - } - /** - * repeated int32 enum_entry = 12; - */ - public Builder clearEnumEntry() { - enumEntry_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000100); - onChanged(); - return this; - } - - // optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> primaryConstructorBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - public boolean hasPrimaryConstructor() { - return ((bitField0_ & 0x00000200) == 0x00000200); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor getPrimaryConstructor() { - if (primaryConstructorBuilder_ == null) { - return primaryConstructor_; - } else { - return primaryConstructorBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - public Builder setPrimaryConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor value) { - if (primaryConstructorBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - primaryConstructor_ = value; - onChanged(); - } else { - primaryConstructorBuilder_.setMessage(value); - } - bitField0_ |= 0x00000200; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - public Builder setPrimaryConstructor( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder builderForValue) { - if (primaryConstructorBuilder_ == null) { - primaryConstructor_ = builderForValue.build(); - onChanged(); - } else { - primaryConstructorBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000200; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - public Builder mergePrimaryConstructor(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor value) { - if (primaryConstructorBuilder_ == null) { - if (((bitField0_ & 0x00000200) == 0x00000200) && - primaryConstructor_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance()) { - primaryConstructor_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.newBuilder(primaryConstructor_).mergeFrom(value).buildPartial(); - } else { - primaryConstructor_ = value; - } - onChanged(); - } else { - primaryConstructorBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000200; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - public Builder clearPrimaryConstructor() { - if (primaryConstructorBuilder_ == null) { - primaryConstructor_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.getDefaultInstance(); - onChanged(); - } else { - primaryConstructorBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000200); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder getPrimaryConstructorBuilder() { - bitField0_ |= 0x00000200; - onChanged(); - return getPrimaryConstructorFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder getPrimaryConstructorOrBuilder() { - if (primaryConstructorBuilder_ != null) { - return primaryConstructorBuilder_.getMessageOrBuilder(); - } else { - return primaryConstructor_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Class.PrimaryConstructor primary_constructor = 13; - * - * 
-       * This field is present if and only if the class has a primary constructor
-       *
- */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder> - getPrimaryConstructorFieldBuilder() { - if (primaryConstructorBuilder_ == null) { - primaryConstructorBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructor.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Class.PrimaryConstructorOrBuilder>( - primaryConstructor_, - getParentForChildren(), - isClean()); - primaryConstructor_ = null; - } - return primaryConstructorBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Class) - } - - static { - defaultInstance = new Class(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Class) - } - - public interface PackageOrBuilder - extends com.google.protobuf.MessageOrBuilder { - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - java.util.List - getMemberList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - int getMemberCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - java.util.List - getMemberOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( - int index); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Package} - */ - public static final class Package extends - com.google.protobuf.GeneratedMessage - implements PackageOrBuilder { - // Use Package.newBuilder() to construct. - private Package(com.google.protobuf.GeneratedMessage.Builder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private Package(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final Package defaultInstance; - public static Package getDefaultInstance() { - return defaultInstance; - } - - public Package getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Package( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - member_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000001; - } - member_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.PARSER, extensionRegistry)); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - member_ = java.util.Collections.unmodifiableList(member_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Package parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Package(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - public static final int MEMBER_FIELD_NUMBER = 1; - private java.util.List member_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public java.util.List getMemberList() { - return member_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public java.util.List - getMemberOrBuilderList() { - return member_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public int getMemberCount() { - return member_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) { - return member_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( - int index) { - return member_.get(index); - } - - private void initFields() { - member_ = java.util.Collections.emptyList(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - for (int i = 0; i < getMemberCount(); i++) { - if (!getMember(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - for (int i = 0; i < member_.size(); i++) { - output.writeMessage(1, member_.get(i)); - } - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - for (int i = 0; i < member_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(1, member_.get(i)); - } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Package} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder - implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.PackageOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getMemberFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - if (memberBuilder_ == null) { - member_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - } else { - memberBuilder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package(this); - int from_bitField0_ = bitField0_; - if (memberBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { - member_ = java.util.Collections.unmodifiableList(member_); - bitField0_ = (bitField0_ & ~0x00000001); - } - result.member_ = member_; - } else { - result.member_ = memberBuilder_.build(); - } - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package.getDefaultInstance()) return this; - if (memberBuilder_ == null) { - if (!other.member_.isEmpty()) { - if (member_.isEmpty()) { - member_ = other.member_; - bitField0_ = (bitField0_ & ~0x00000001); - } else { - ensureMemberIsMutable(); - member_.addAll(other.member_); - } - onChanged(); - } - } else { - if (!other.member_.isEmpty()) { - if (memberBuilder_.isEmpty()) { - memberBuilder_.dispose(); - memberBuilder_ = null; - member_ = other.member_; - bitField0_ = (bitField0_ & ~0x00000001); - memberBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getMemberFieldBuilder() : null; - } else { - memberBuilder_.addAllMessages(other.member_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - for (int i = 0; i < getMemberCount(); i++) { - if (!getMember(i).isInitialized()) { - - return false; - } - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Package) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - private java.util.List member_ = - java.util.Collections.emptyList(); - private void ensureMemberIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { - member_ = new java.util.ArrayList(member_); - bitField0_ |= 0x00000001; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> memberBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public java.util.List getMemberList() { - if (memberBuilder_ == null) { - return java.util.Collections.unmodifiableList(member_); - } else { - return memberBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public int getMemberCount() { - if (memberBuilder_ == null) { - return member_.size(); - } else { - return memberBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getMember(int index) { - if (memberBuilder_ == null) { - return member_.get(index); - } else { - return memberBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder setMember( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { - if (memberBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMemberIsMutable(); - member_.set(index, value); - onChanged(); - } else { - memberBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder setMember( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - member_.set(index, builderForValue.build()); - onChanged(); - } else { - memberBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder addMember(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { - if (memberBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMemberIsMutable(); - member_.add(value); - onChanged(); - } else { - memberBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder addMember( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable value) { - if (memberBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureMemberIsMutable(); - member_.add(index, value); - onChanged(); - } else { - memberBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder addMember( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - member_.add(builderForValue.build()); - onChanged(); - } else { - memberBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder addMember( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder builderForValue) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - member_.add(index, builderForValue.build()); - onChanged(); - } else { - memberBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder addAllMember( - java.lang.Iterable values) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - super.addAll(values, member_); - onChanged(); - } else { - memberBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder clearMember() { - if (memberBuilder_ == null) { - member_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000001); - onChanged(); - } else { - memberBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public Builder removeMember(int index) { - if (memberBuilder_ == null) { - ensureMemberIsMutable(); - member_.remove(index); - onChanged(); - } else { - memberBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder getMemberBuilder( - int index) { - return getMemberFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder getMemberOrBuilder( - int index) { - if (memberBuilder_ == null) { - return member_.get(index); } else { - return memberBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public java.util.List - getMemberOrBuilderList() { - if (memberBuilder_ != null) { - return memberBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(member_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder() { - return getMemberFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder addMemberBuilder( - int index) { - return getMemberFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable member = 1; - */ - public java.util.List - getMemberBuilderList() { - return getMemberFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder> - getMemberFieldBuilder() { - if (memberBuilder_ == null) { - memberBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder>( - member_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); - member_ = null; - } - return memberBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Package) - } - - static { - defaultInstance = new Package(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Package) - } - - public interface CallableOrBuilder extends - com.google.protobuf.GeneratedMessage. - ExtendableMessageOrBuilder { - - // optional int32 flags = 1; - /** - * optional int32 flags = 1; - * - * 
-     *
-     *Visibility
-     *Modality
-     *has_annotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *
- */ - boolean hasFlags(); - /** - * optional int32 flags = 1; - * - * 
-     *
-     *Visibility
-     *Modality
-     *has_annotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *
- */ - int getFlags(); - - // optional string extra_visibility = 2; - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - boolean hasExtraVisibility(); - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - java.lang.String getExtraVisibility(); - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - com.google.protobuf.ByteString - getExtraVisibilityBytes(); - - // optional int32 getter_flags = 9; - /** - * optional int32 getter_flags = 9; - * - * 
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *has_annotations
-     *
- */ - boolean hasGetterFlags(); - /** - * optional int32 getter_flags = 9; - * - * 
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *has_annotations
-     *
- */ - int getGetterFlags(); - - // optional int32 setter_flags = 10; - /** - * optional int32 setter_flags = 10; - */ - boolean hasSetterFlags(); - /** - * optional int32 setter_flags = 10; - */ - int getSetterFlags(); - - // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - java.util.List - getTypeParameterList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - int getTypeParameterCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - java.util.List - getTypeParameterOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( - int index); - - // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - boolean hasReceiverType(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder(); - - // required int32 name = 6; - /** - * required int32 name = 6; - */ - boolean hasName(); - /** - * required int32 name = 6; - */ - int getName(); - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - java.util.List - getValueParameterList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - int getValueParameterCount(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - java.util.List - getValueParameterOrBuilderList(); - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder( - int index); - - // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - boolean hasReturnType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable} - */ - public static final class Callable extends - com.google.protobuf.GeneratedMessage.ExtendableMessage< - Callable> implements CallableOrBuilder { - // Use Callable.newBuilder() to construct. - private Callable(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private Callable(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final Callable defaultInstance; - public static Callable getDefaultInstance() { - return defaultInstance; - } - - public Callable getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private Callable( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - flags_ = input.readInt32(); - break; - } - case 18: { - bitField0_ |= 0x00000002; - extraVisibility_ = input.readBytes(); - break; - } - case 34: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000010; - } - typeParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.PARSER, extensionRegistry)); - break; - } - case 42: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000010) == 0x00000010)) { - subBuilder = receiverType_.toBuilder(); - } - receiverType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(receiverType_); - receiverType_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000010; - break; - } - case 48: { - bitField0_ |= 0x00000020; - name_ = input.readInt32(); - break; - } - case 58: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { - valueParameter_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000080; - } - valueParameter_.add(input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.PARSER, extensionRegistry)); - break; - } - case 66: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000040) == 0x00000040)) { - subBuilder = returnType_.toBuilder(); - } - returnType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(returnType_); - returnType_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000040; - break; - } - case 72: { - bitField0_ |= 0x00000004; - getterFlags_ = input.readInt32(); - break; - } - case 80: { - bitField0_ |= 0x00000008; - setterFlags_ = input.readInt32(); - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); - } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { - valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); - } - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public Callable parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new Callable(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Callable.MemberKind} - */ - public enum MemberKind - implements com.google.protobuf.ProtocolMessageEnum { - /** - * DECLARATION = 0; - * - * 
-       * 2 bits
-       *
- */ - DECLARATION(0, 0), - /** - * FAKE_OVERRIDE = 1; - */ - FAKE_OVERRIDE(1, 1), - /** - * DELEGATION = 2; - */ - DELEGATION(2, 2), - /** - * SYNTHESIZED = 3; - */ - SYNTHESIZED(3, 3), - ; - - /** - * DECLARATION = 0; - * - * 
-       * 2 bits
-       *
- */ - public static final int DECLARATION_VALUE = 0; - /** - * FAKE_OVERRIDE = 1; - */ - public static final int FAKE_OVERRIDE_VALUE = 1; - /** - * DELEGATION = 2; - */ - public static final int DELEGATION_VALUE = 2; - /** - * SYNTHESIZED = 3; - */ - public static final int SYNTHESIZED_VALUE = 3; - - - public final int getNumber() { return value; } - - public static MemberKind valueOf(int value) { - switch (value) { - case 0: return DECLARATION; - case 1: return FAKE_OVERRIDE; - case 2: return DELEGATION; - case 3: return SYNTHESIZED; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public MemberKind findValueByNumber(int number) { - return MemberKind.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDescriptor().getEnumTypes().get(0); - } - - private static final MemberKind[] VALUES = values(); - - public static MemberKind valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private MemberKind(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Callable.MemberKind) - } - - /** - * Protobuf enum {@code org.jetbrains.jet.descriptors.serialization.Callable.CallableKind} - */ - public enum CallableKind - implements com.google.protobuf.ProtocolMessageEnum { - /** - * FUN = 0; - * - * 
-       * 2 bits
-       *
- */ - FUN(0, 0), - /** - * VAL = 1; - */ - VAL(1, 1), - /** - * VAR = 2; - */ - VAR(2, 2), - /** - * CONSTRUCTOR = 3; - */ - CONSTRUCTOR(3, 3), - ; - - /** - * FUN = 0; - * - * 
-       * 2 bits
-       *
- */ - public static final int FUN_VALUE = 0; - /** - * VAL = 1; - */ - public static final int VAL_VALUE = 1; - /** - * VAR = 2; - */ - public static final int VAR_VALUE = 2; - /** - * CONSTRUCTOR = 3; - */ - public static final int CONSTRUCTOR_VALUE = 3; - - - public final int getNumber() { return value; } - - public static CallableKind valueOf(int value) { - switch (value) { - case 0: return FUN; - case 1: return VAL; - case 2: return VAR; - case 3: return CONSTRUCTOR; - default: return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - private static com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public CallableKind findValueByNumber(int number) { - return CallableKind.valueOf(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { - return getDescriptor().getValues().get(index); - } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { - return getDescriptor(); - } - public static final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDescriptor().getEnumTypes().get(1); - } - - private static final CallableKind[] VALUES = values(); - - public static CallableKind valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); - } - return VALUES[desc.getIndex()]; - } - - private final int index; - private final int value; - - private CallableKind(int index, int value) { - this.index = index; - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:org.jetbrains.jet.descriptors.serialization.Callable.CallableKind) - } - - public interface ValueParameterOrBuilder extends - com.google.protobuf.GeneratedMessage. - ExtendableMessageOrBuilder { - - // optional int32 flags = 1; - /** - * optional int32 flags = 1; - * - * 
-       *
-       *declaresDefault
-       *has_annotations
-       *
- */ - boolean hasFlags(); - /** - * optional int32 flags = 1; - * - * 
-       *
-       *declaresDefault
-       *has_annotations
-       *
- */ - int getFlags(); - - // required int32 name = 2; - /** - * required int32 name = 2; - */ - boolean hasName(); - /** - * required int32 name = 2; - */ - int getName(); - - // required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - boolean hasType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType(); - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder(); - - // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - boolean hasVarargElementType(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType(); - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder(); - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter} - */ - public static final class ValueParameter extends - com.google.protobuf.GeneratedMessage.ExtendableMessage< - ValueParameter> implements ValueParameterOrBuilder { - // Use ValueParameter.newBuilder() to construct. - private ValueParameter(com.google.protobuf.GeneratedMessage.ExtendableBuilder builder) { - super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private ValueParameter(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final ValueParameter defaultInstance; - public static ValueParameter getDefaultInstance() { - return defaultInstance; - } - - public ValueParameter getDefaultInstanceForType() { - return defaultInstance; - } - - private final com.google.protobuf.UnknownFieldSet unknownFields; - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { - return this.unknownFields; - } - private ValueParameter( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); - int mutable_bitField0_ = 0; - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - default: { - if (!parseUnknownField(input, unknownFields, - extensionRegistry, tag)) { - done = true; - } - break; - } - case 8: { - bitField0_ |= 0x00000001; - flags_ = input.readInt32(); - break; - } - case 16: { - bitField0_ |= 0x00000002; - name_ = input.readInt32(); - break; - } - case 26: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - subBuilder = type_.toBuilder(); - } - type_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(type_); - type_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000004; - break; - } - case 34: { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder subBuilder = null; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - subBuilder = varargElementType_.toBuilder(); - } - varargElementType_ = input.readMessage(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.PARSER, extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(varargElementType_); - varargElementType_ = subBuilder.buildPartial(); - } - bitField0_ |= 0x00000008; - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder.class); - } - - public static com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - public ValueParameter parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new ValueParameter(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser getParserForType() { - return PARSER; - } - - private int bitField0_; - // optional int32 flags = 1; - public static final int FLAGS_FIELD_NUMBER = 1; - private int flags_; - /** - * optional int32 flags = 1; - * - * 
-       *
-       *declaresDefault
-       *has_annotations
-       *
- */ - public boolean hasFlags() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional int32 flags = 1; - * - * 
-       *
-       *declaresDefault
-       *has_annotations
-       *
- */ - public int getFlags() { - return flags_; - } - - // required int32 name = 2; - public static final int NAME_FIELD_NUMBER = 2; - private int name_; - /** - * required int32 name = 2; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required int32 name = 2; - */ - public int getName() { - return name_; - } - - // required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - public static final int TYPE_FIELD_NUMBER = 3; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() { - return type_; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() { - return type_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - public static final int VARARG_ELEMENT_TYPE_FIELD_NUMBER = 4; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type varargElementType_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public boolean hasVarargElementType() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType() { - return varargElementType_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() { - return varargElementType_; - } - - private void initFields() { - flags_ = 0; - name_ = 0; - type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasName()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasType()) { - memoizedIsInitialized = 0; - return false; - } - if (!getType().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - if (hasVarargElementType()) { - if (!getVarargElementType().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (!extensionsAreInitialized()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - com.google.protobuf.GeneratedMessage - .ExtendableMessage.ExtensionWriter extensionWriter = - newExtensionWriter(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, flags_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeInt32(2, name_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeMessage(3, type_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeMessage(4, varargElementType_); - } - extensionWriter.writeUntil(200, output); - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, flags_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(2, name_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(3, type_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, varargElementType_); - } - size += extensionsSerializedSize(); - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.ExtendableBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, Builder> implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getTypeFieldBuilder(); - getVarargElementTypeFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - flags_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); - name_ = 0; - bitField0_ = (bitField0_ & ~0x00000002); - if (typeBuilder_ == null) { - type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } else { - typeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000004); - if (varargElementTypeBuilder_ == null) { - varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } else { - varargElementTypeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.flags_ = flags_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.name_ = name_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - if (typeBuilder_ == null) { - result.type_ = type_; - } else { - result.type_ = typeBuilder_.build(); - } - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } - if (varargElementTypeBuilder_ == null) { - result.varargElementType_ = varargElementType_; - } else { - result.varargElementType_ = varargElementTypeBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance()) return this; - if (other.hasFlags()) { - setFlags(other.getFlags()); - } - if (other.hasName()) { - setName(other.getName()); - } - if (other.hasType()) { - mergeType(other.getType()); - } - if (other.hasVarargElementType()) { - mergeVarargElementType(other.getVarargElementType()); - } - this.mergeExtensionFields(other); - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasName()) { - - return false; - } - if (!hasType()) { - - return false; - } - if (!getType().isInitialized()) { - - return false; - } - if (hasVarargElementType()) { - if (!getVarargElementType().isInitialized()) { - - return false; - } - } - if (!extensionsAreInitialized()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional int32 flags = 1; - private int flags_ ; - /** - * optional int32 flags = 1; - * - * 
-         *
-         *declaresDefault
-         *has_annotations
-         *
- */ - public boolean hasFlags() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional int32 flags = 1; - * - * 
-         *
-         *declaresDefault
-         *has_annotations
-         *
- */ - public int getFlags() { - return flags_; - } - /** - * optional int32 flags = 1; - * - * 
-         *
-         *declaresDefault
-         *has_annotations
-         *
- */ - public Builder setFlags(int value) { - bitField0_ |= 0x00000001; - flags_ = value; - onChanged(); - return this; - } - /** - * optional int32 flags = 1; - * - * 
-         *
-         *declaresDefault
-         *has_annotations
-         *
- */ - public Builder clearFlags() { - bitField0_ = (bitField0_ & ~0x00000001); - flags_ = 0; - onChanged(); - return this; - } - - // required int32 name = 2; - private int name_ ; - /** - * required int32 name = 2; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required int32 name = 2; - */ - public int getName() { - return name_; - } - /** - * required int32 name = 2; - */ - public Builder setName(int value) { - bitField0_ |= 0x00000002; - name_ = value; - onChanged(); - return this; - } - /** - * required int32 name = 2; - */ - public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000002); - name_ = 0; - onChanged(); - return this; - } - - // required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> typeBuilder_; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getType() { - if (typeBuilder_ == null) { - return type_; - } else { - return typeBuilder_.getMessage(); - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public Builder setType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (typeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - type_ = value; - onChanged(); - } else { - typeBuilder_.setMessage(value); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public Builder setType( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (typeBuilder_ == null) { - type_ = builderForValue.build(); - onChanged(); - } else { - typeBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public Builder mergeType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (typeBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004) && - type_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { - type_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(type_).mergeFrom(value).buildPartial(); - } else { - type_ = value; - } - onChanged(); - } else { - typeBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000004; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public Builder clearType() { - if (typeBuilder_ == null) { - type_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - onChanged(); - } else { - typeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000004); - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getTypeBuilder() { - bitField0_ |= 0x00000004; - onChanged(); - return getTypeFieldBuilder().getBuilder(); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getTypeOrBuilder() { - if (typeBuilder_ != null) { - return typeBuilder_.getMessageOrBuilder(); - } else { - return type_; - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type type = 3; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> - getTypeFieldBuilder() { - if (typeBuilder_ == null) { - typeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( - type_, - getParentForChildren(), - isClean()); - type_ = null; - } - return typeBuilder_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> varargElementTypeBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public boolean hasVarargElementType() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getVarargElementType() { - if (varargElementTypeBuilder_ == null) { - return varargElementType_; - } else { - return varargElementTypeBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public Builder setVarargElementType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (varargElementTypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - varargElementType_ = value; - onChanged(); - } else { - varargElementTypeBuilder_.setMessage(value); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public Builder setVarargElementType( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (varargElementTypeBuilder_ == null) { - varargElementType_ = builderForValue.build(); - onChanged(); - } else { - varargElementTypeBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public Builder mergeVarargElementType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (varargElementTypeBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008) && - varargElementType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { - varargElementType_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(varargElementType_).mergeFrom(value).buildPartial(); - } else { - varargElementType_ = value; - } - onChanged(); - } else { - varargElementTypeBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000008; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public Builder clearVarargElementType() { - if (varargElementTypeBuilder_ == null) { - varargElementType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - onChanged(); - } else { - varargElementTypeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000008); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getVarargElementTypeBuilder() { - bitField0_ |= 0x00000008; - onChanged(); - return getVarargElementTypeFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getVarargElementTypeOrBuilder() { - if (varargElementTypeBuilder_ != null) { - return varargElementTypeBuilder_.getMessageOrBuilder(); - } else { - return varargElementType_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type vararg_element_type = 4; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> - getVarargElementTypeFieldBuilder() { - if (varargElementTypeBuilder_ == null) { - varargElementTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( - varargElementType_, - getParentForChildren(), - isClean()); - varargElementType_ = null; - } - return varargElementTypeBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter) - } - - static { - defaultInstance = new ValueParameter(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter) - } - - private int bitField0_; - // optional int32 flags = 1; - public static final int FLAGS_FIELD_NUMBER = 1; - private int flags_; - /** - * optional int32 flags = 1; - * - * 
-     *
-     *Visibility
-     *Modality
-     *has_annotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *
- */ - public boolean hasFlags() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional int32 flags = 1; - * - * 
-     *
-     *Visibility
-     *Modality
-     *has_annotations
-     *CallableKind
-     *MemberKind
-     *hasGetter
-     *hasSetter
-     *
- */ - public int getFlags() { - return flags_; - } - - // optional string extra_visibility = 2; - public static final int EXTRA_VISIBILITY_FIELD_NUMBER = 2; - private java.lang.Object extraVisibility_; - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - public boolean hasExtraVisibility() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - public java.lang.String getExtraVisibility() { - java.lang.Object ref = extraVisibility_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - extraVisibility_ = s; - } - return s; - } - } - /** - * optional string extra_visibility = 2; - * - * 
-     * for things like java-specific visibilities
-     *
- */ - public com.google.protobuf.ByteString - getExtraVisibilityBytes() { - java.lang.Object ref = extraVisibility_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - extraVisibility_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // optional int32 getter_flags = 9; - public static final int GETTER_FLAGS_FIELD_NUMBER = 9; - private int getterFlags_; - /** - * optional int32 getter_flags = 9; - * - * 
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *has_annotations
-     *
- */ - public boolean hasGetterFlags() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional int32 getter_flags = 9; - * - * 
-     *
-     *isNotDefault
-     *Visibility
-     *Modality
-     *has_annotations
-     *
- */ - public int getGetterFlags() { - return getterFlags_; - } - - // optional int32 setter_flags = 10; - public static final int SETTER_FLAGS_FIELD_NUMBER = 10; - private int setterFlags_; - /** - * optional int32 setter_flags = 10; - */ - public boolean hasSetterFlags() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional int32 setter_flags = 10; - */ - public int getSetterFlags() { - return setterFlags_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - public static final int TYPE_PARAMETER_FIELD_NUMBER = 4; - private java.util.List typeParameter_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public java.util.List getTypeParameterList() { - return typeParameter_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public java.util.List - getTypeParameterOrBuilderList() { - return typeParameter_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public int getTypeParameterCount() { - return typeParameter_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) { - return typeParameter_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( - int index) { - return typeParameter_.get(index); - } - - // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - public static final int RECEIVER_TYPE_FIELD_NUMBER = 5; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type receiverType_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public boolean hasReceiverType() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType() { - return receiverType_; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() { - return receiverType_; - } - - // required int32 name = 6; - public static final int NAME_FIELD_NUMBER = 6; - private int name_; - /** - * required int32 name = 6; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * required int32 name = 6; - */ - public int getName() { - return name_; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - public static final int VALUE_PARAMETER_FIELD_NUMBER = 7; - private java.util.List valueParameter_; - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - public java.util.List getValueParameterList() { - return valueParameter_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - public java.util.List - getValueParameterOrBuilderList() { - return valueParameter_; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - public int getValueParameterCount() { - return valueParameter_.size(); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) { - return valueParameter_.get(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-     * Value parameters for functions and constructors, or setter value parameter for properties
-     *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder( - int index) { - return valueParameter_.get(index); - } - - // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - public static final int RETURN_TYPE_FIELD_NUMBER = 8; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type returnType_; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public boolean hasReturnType() { - return ((bitField0_ & 0x00000040) == 0x00000040); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType() { - return returnType_; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() { - return returnType_; - } - - private void initFields() { - flags_ = 0; - extraVisibility_ = ""; - getterFlags_ = 0; - setterFlags_ = 0; - typeParameter_ = java.util.Collections.emptyList(); - receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - name_ = 0; - valueParameter_ = java.util.Collections.emptyList(); - returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } - private byte memoizedIsInitialized = -1; - public final boolean isInitialized() { - byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; - - if (!hasName()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasReturnType()) { - memoizedIsInitialized = 0; - return false; - } - for (int i = 0; i < getTypeParameterCount(); i++) { - if (!getTypeParameter(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (hasReceiverType()) { - if (!getReceiverType().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - for (int i = 0; i < getValueParameterCount(); i++) { - if (!getValueParameter(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } - if (!getReturnType().isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - if (!extensionsAreInitialized()) { - memoizedIsInitialized = 0; - return false; - } - memoizedIsInitialized = 1; - return true; - } - - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { - getSerializedSize(); - com.google.protobuf.GeneratedMessage - .ExtendableMessage.ExtensionWriter extensionWriter = - newExtensionWriter(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeInt32(1, flags_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getExtraVisibilityBytes()); - } - for (int i = 0; i < typeParameter_.size(); i++) { - output.writeMessage(4, typeParameter_.get(i)); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeMessage(5, receiverType_); - } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - output.writeInt32(6, name_); - } - for (int i = 0; i < valueParameter_.size(); i++) { - output.writeMessage(7, valueParameter_.get(i)); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - output.writeMessage(8, returnType_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeInt32(9, getterFlags_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeInt32(10, setterFlags_); - } - extensionWriter.writeUntil(200, output); - getUnknownFields().writeTo(output); - } - - private int memoizedSerializedSize = -1; - public int getSerializedSize() { - int size = memoizedSerializedSize; - if (size != -1) return size; - - size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(1, flags_); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getExtraVisibilityBytes()); - } - for (int i = 0; i < typeParameter_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, typeParameter_.get(i)); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(5, receiverType_); - } - if (((bitField0_ & 0x00000020) == 0x00000020)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(6, name_); - } - for (int i = 0; i < valueParameter_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, valueParameter_.get(i)); - } - if (((bitField0_ & 0x00000040) == 0x00000040)) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, returnType_); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(9, getterFlags_); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeInt32Size(10, setterFlags_); - } - size += extensionsSerializedSize(); - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; - return size; - } - - private static final long serialVersionUID = 0L; - @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); - } - - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( - com.google.protobuf.ByteString data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( - com.google.protobuf.ByteString data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(byte[] data) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return PARSER.parseFrom(data, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return PARSER.parseFrom(input); - } - public static org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parseFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); - } - - public static Builder newBuilder() { return Builder.create(); } - public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable prototype) { - return newBuilder().mergeFrom(prototype); - } - public Builder toBuilder() { return newBuilder(this); } - - @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - Builder builder = new Builder(parent); - return builder; - } - /** - * Protobuf type {@code org.jetbrains.jet.descriptors.serialization.Callable} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.ExtendableBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable, Builder> implements org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.CallableOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor; - } - - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable - internalGetFieldAccessorTable() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable - .ensureFieldAccessorsInitialized( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.class, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.Builder.class); - } - - // Construct using org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.newBuilder() - private Builder() { - maybeForceBuilderInitialization(); - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getTypeParameterFieldBuilder(); - getReceiverTypeFieldBuilder(); - getValueParameterFieldBuilder(); - getReturnTypeFieldBuilder(); - } - } - private static Builder create() { - return new Builder(); - } - - public Builder clear() { - super.clear(); - flags_ = 0; - bitField0_ = (bitField0_ & ~0x00000001); - extraVisibility_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - getterFlags_ = 0; - bitField0_ = (bitField0_ & ~0x00000004); - setterFlags_ = 0; - bitField0_ = (bitField0_ & ~0x00000008); - if (typeParameterBuilder_ == null) { - typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); - } else { - typeParameterBuilder_.clear(); - } - if (receiverTypeBuilder_ == null) { - receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } else { - receiverTypeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000020); - name_ = 0; - bitField0_ = (bitField0_ & ~0x00000040); - if (valueParameterBuilder_ == null) { - valueParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); - } else { - valueParameterBuilder_.clear(); - } - if (returnTypeBuilder_ == null) { - returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - } else { - returnTypeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000100); - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable getDefaultInstanceForType() { - return org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance(); - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable build() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable buildPartial() { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable result = new org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.flags_ = flags_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.extraVisibility_ = extraVisibility_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.getterFlags_ = getterFlags_; - if (((from_bitField0_ & 0x00000008) == 0x00000008)) { - to_bitField0_ |= 0x00000008; - } - result.setterFlags_ = setterFlags_; - if (typeParameterBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = java.util.Collections.unmodifiableList(typeParameter_); - bitField0_ = (bitField0_ & ~0x00000010); - } - result.typeParameter_ = typeParameter_; - } else { - result.typeParameter_ = typeParameterBuilder_.build(); - } - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { - to_bitField0_ |= 0x00000010; - } - if (receiverTypeBuilder_ == null) { - result.receiverType_ = receiverType_; - } else { - result.receiverType_ = receiverTypeBuilder_.build(); - } - if (((from_bitField0_ & 0x00000040) == 0x00000040)) { - to_bitField0_ |= 0x00000020; - } - result.name_ = name_; - if (valueParameterBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { - valueParameter_ = java.util.Collections.unmodifiableList(valueParameter_); - bitField0_ = (bitField0_ & ~0x00000080); - } - result.valueParameter_ = valueParameter_; - } else { - result.valueParameter_ = valueParameterBuilder_.build(); - } - if (((from_bitField0_ & 0x00000100) == 0x00000100)) { - to_bitField0_ |= 0x00000040; - } - if (returnTypeBuilder_ == null) { - result.returnType_ = returnType_; - } else { - result.returnType_ = returnTypeBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable) { - return mergeFrom((org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable other) { - if (other == org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.getDefaultInstance()) return this; - if (other.hasFlags()) { - setFlags(other.getFlags()); - } - if (other.hasExtraVisibility()) { - bitField0_ |= 0x00000002; - extraVisibility_ = other.extraVisibility_; - onChanged(); - } - if (other.hasGetterFlags()) { - setGetterFlags(other.getGetterFlags()); - } - if (other.hasSetterFlags()) { - setSetterFlags(other.getSetterFlags()); - } - if (typeParameterBuilder_ == null) { - if (!other.typeParameter_.isEmpty()) { - if (typeParameter_.isEmpty()) { - typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); - } else { - ensureTypeParameterIsMutable(); - typeParameter_.addAll(other.typeParameter_); - } - onChanged(); - } - } else { - if (!other.typeParameter_.isEmpty()) { - if (typeParameterBuilder_.isEmpty()) { - typeParameterBuilder_.dispose(); - typeParameterBuilder_ = null; - typeParameter_ = other.typeParameter_; - bitField0_ = (bitField0_ & ~0x00000010); - typeParameterBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getTypeParameterFieldBuilder() : null; - } else { - typeParameterBuilder_.addAllMessages(other.typeParameter_); - } - } - } - if (other.hasReceiverType()) { - mergeReceiverType(other.getReceiverType()); - } - if (other.hasName()) { - setName(other.getName()); - } - if (valueParameterBuilder_ == null) { - if (!other.valueParameter_.isEmpty()) { - if (valueParameter_.isEmpty()) { - valueParameter_ = other.valueParameter_; - bitField0_ = (bitField0_ & ~0x00000080); - } else { - ensureValueParameterIsMutable(); - valueParameter_.addAll(other.valueParameter_); - } - onChanged(); - } - } else { - if (!other.valueParameter_.isEmpty()) { - if (valueParameterBuilder_.isEmpty()) { - valueParameterBuilder_.dispose(); - valueParameterBuilder_ = null; - valueParameter_ = other.valueParameter_; - bitField0_ = (bitField0_ & ~0x00000080); - valueParameterBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getValueParameterFieldBuilder() : null; - } else { - valueParameterBuilder_.addAllMessages(other.valueParameter_); - } - } - } - if (other.hasReturnType()) { - mergeReturnType(other.getReturnType()); - } - this.mergeExtensionFields(other); - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasName()) { - - return false; - } - if (!hasReturnType()) { - - return false; - } - for (int i = 0; i < getTypeParameterCount(); i++) { - if (!getTypeParameter(i).isInitialized()) { - - return false; - } - } - if (hasReceiverType()) { - if (!getReceiverType().isInitialized()) { - - return false; - } - } - for (int i = 0; i < getValueParameterCount(); i++) { - if (!getValueParameter(i).isInitialized()) { - - return false; - } - } - if (!getReturnType().isInitialized()) { - - return false; - } - if (!extensionsAreInitialized()) { - - return false; - } - return true; - } - - public Builder mergeFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws java.io.IOException { - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // optional int32 flags = 1; - private int flags_ ; - /** - * optional int32 flags = 1; - * - * 
-       *
-       *Visibility
-       *Modality
-       *has_annotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *
- */ - public boolean hasFlags() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * optional int32 flags = 1; - * - * 
-       *
-       *Visibility
-       *Modality
-       *has_annotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *
- */ - public int getFlags() { - return flags_; - } - /** - * optional int32 flags = 1; - * - * 
-       *
-       *Visibility
-       *Modality
-       *has_annotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *
- */ - public Builder setFlags(int value) { - bitField0_ |= 0x00000001; - flags_ = value; - onChanged(); - return this; - } - /** - * optional int32 flags = 1; - * - * 
-       *
-       *Visibility
-       *Modality
-       *has_annotations
-       *CallableKind
-       *MemberKind
-       *hasGetter
-       *hasSetter
-       *
- */ - public Builder clearFlags() { - bitField0_ = (bitField0_ & ~0x00000001); - flags_ = 0; - onChanged(); - return this; - } - - // optional string extra_visibility = 2; - private java.lang.Object extraVisibility_ = ""; - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public boolean hasExtraVisibility() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public java.lang.String getExtraVisibility() { - java.lang.Object ref = extraVisibility_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - extraVisibility_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public com.google.protobuf.ByteString - getExtraVisibilityBytes() { - java.lang.Object ref = extraVisibility_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - extraVisibility_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public Builder setExtraVisibility( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - extraVisibility_ = value; - onChanged(); - return this; - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public Builder clearExtraVisibility() { - bitField0_ = (bitField0_ & ~0x00000002); - extraVisibility_ = getDefaultInstance().getExtraVisibility(); - onChanged(); - return this; - } - /** - * optional string extra_visibility = 2; - * - * 
-       * for things like java-specific visibilities
-       *
- */ - public Builder setExtraVisibilityBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - extraVisibility_ = value; - onChanged(); - return this; - } - - // optional int32 getter_flags = 9; - private int getterFlags_ ; - /** - * optional int32 getter_flags = 9; - * - * 
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *has_annotations
-       *
- */ - public boolean hasGetterFlags() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * optional int32 getter_flags = 9; - * - * 
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *has_annotations
-       *
- */ - public int getGetterFlags() { - return getterFlags_; - } - /** - * optional int32 getter_flags = 9; - * - * 
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *has_annotations
-       *
- */ - public Builder setGetterFlags(int value) { - bitField0_ |= 0x00000004; - getterFlags_ = value; - onChanged(); - return this; - } - /** - * optional int32 getter_flags = 9; - * - * 
-       *
-       *isNotDefault
-       *Visibility
-       *Modality
-       *has_annotations
-       *
- */ - public Builder clearGetterFlags() { - bitField0_ = (bitField0_ & ~0x00000004); - getterFlags_ = 0; - onChanged(); - return this; - } - - // optional int32 setter_flags = 10; - private int setterFlags_ ; - /** - * optional int32 setter_flags = 10; - */ - public boolean hasSetterFlags() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * optional int32 setter_flags = 10; - */ - public int getSetterFlags() { - return setterFlags_; - } - /** - * optional int32 setter_flags = 10; - */ - public Builder setSetterFlags(int value) { - bitField0_ |= 0x00000008; - setterFlags_ = value; - onChanged(); - return this; - } - /** - * optional int32 setter_flags = 10; - */ - public Builder clearSetterFlags() { - bitField0_ = (bitField0_ & ~0x00000008); - setterFlags_ = 0; - onChanged(); - return this; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - private java.util.List typeParameter_ = - java.util.Collections.emptyList(); - private void ensureTypeParameterIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { - typeParameter_ = new java.util.ArrayList(typeParameter_); - bitField0_ |= 0x00000010; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> typeParameterBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public java.util.List getTypeParameterList() { - if (typeParameterBuilder_ == null) { - return java.util.Collections.unmodifiableList(typeParameter_); - } else { - return typeParameterBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public int getTypeParameterCount() { - if (typeParameterBuilder_ == null) { - return typeParameter_.size(); - } else { - return typeParameterBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter getTypeParameter(int index) { - if (typeParameterBuilder_ == null) { - return typeParameter_.get(index); - } else { - return typeParameterBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder setTypeParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { - if (typeParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTypeParameterIsMutable(); - typeParameter_.set(index, value); - onChanged(); - } else { - typeParameterBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder setTypeParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - typeParameter_.set(index, builderForValue.build()); - onChanged(); - } else { - typeParameterBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder addTypeParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { - if (typeParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTypeParameterIsMutable(); - typeParameter_.add(value); - onChanged(); - } else { - typeParameterBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder addTypeParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter value) { - if (typeParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTypeParameterIsMutable(); - typeParameter_.add(index, value); - onChanged(); - } else { - typeParameterBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder addTypeParameter( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - typeParameter_.add(builderForValue.build()); - onChanged(); - } else { - typeParameterBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder addTypeParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder builderForValue) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - typeParameter_.add(index, builderForValue.build()); - onChanged(); - } else { - typeParameterBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder addAllTypeParameter( - java.lang.Iterable values) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - super.addAll(values, typeParameter_); - onChanged(); - } else { - typeParameterBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder clearTypeParameter() { - if (typeParameterBuilder_ == null) { - typeParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000010); - onChanged(); - } else { - typeParameterBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public Builder removeTypeParameter(int index) { - if (typeParameterBuilder_ == null) { - ensureTypeParameterIsMutable(); - typeParameter_.remove(index); - onChanged(); - } else { - typeParameterBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder getTypeParameterBuilder( - int index) { - return getTypeParameterFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder getTypeParameterOrBuilder( - int index) { - if (typeParameterBuilder_ == null) { - return typeParameter_.get(index); } else { - return typeParameterBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public java.util.List - getTypeParameterOrBuilderList() { - if (typeParameterBuilder_ != null) { - return typeParameterBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(typeParameter_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder() { - return getTypeParameterFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder addTypeParameterBuilder( - int index) { - return getTypeParameterFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.TypeParameter type_parameter = 4; - */ - public java.util.List - getTypeParameterBuilderList() { - return getTypeParameterFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder> - getTypeParameterFieldBuilder() { - if (typeParameterBuilder_ == null) { - typeParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeParameterOrBuilder>( - typeParameter_, - ((bitField0_ & 0x00000010) == 0x00000010), - getParentForChildren(), - isClean()); - typeParameter_ = null; - } - return typeParameterBuilder_; - } - - // optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> receiverTypeBuilder_; - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public boolean hasReceiverType() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReceiverType() { - if (receiverTypeBuilder_ == null) { - return receiverType_; - } else { - return receiverTypeBuilder_.getMessage(); - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public Builder setReceiverType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (receiverTypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - receiverType_ = value; - onChanged(); - } else { - receiverTypeBuilder_.setMessage(value); - } - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public Builder setReceiverType( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (receiverTypeBuilder_ == null) { - receiverType_ = builderForValue.build(); - onChanged(); - } else { - receiverTypeBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public Builder mergeReceiverType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (receiverTypeBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020) && - receiverType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { - receiverType_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(receiverType_).mergeFrom(value).buildPartial(); - } else { - receiverType_ = value; - } - onChanged(); - } else { - receiverTypeBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000020; - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public Builder clearReceiverType() { - if (receiverTypeBuilder_ == null) { - receiverType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - onChanged(); - } else { - receiverTypeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000020); - return this; - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getReceiverTypeBuilder() { - bitField0_ |= 0x00000020; - onChanged(); - return getReceiverTypeFieldBuilder().getBuilder(); - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReceiverTypeOrBuilder() { - if (receiverTypeBuilder_ != null) { - return receiverTypeBuilder_.getMessageOrBuilder(); - } else { - return receiverType_; - } - } - /** - * optional .org.jetbrains.jet.descriptors.serialization.Type receiver_type = 5; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> - getReceiverTypeFieldBuilder() { - if (receiverTypeBuilder_ == null) { - receiverTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( - receiverType_, - getParentForChildren(), - isClean()); - receiverType_ = null; - } - return receiverTypeBuilder_; - } - - // required int32 name = 6; - private int name_ ; - /** - * required int32 name = 6; - */ - public boolean hasName() { - return ((bitField0_ & 0x00000040) == 0x00000040); - } - /** - * required int32 name = 6; - */ - public int getName() { - return name_; - } - /** - * required int32 name = 6; - */ - public Builder setName(int value) { - bitField0_ |= 0x00000040; - name_ = value; - onChanged(); - return this; - } - /** - * required int32 name = 6; - */ - public Builder clearName() { - bitField0_ = (bitField0_ & ~0x00000040); - name_ = 0; - onChanged(); - return this; - } - - // repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - private java.util.List valueParameter_ = - java.util.Collections.emptyList(); - private void ensureValueParameterIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { - valueParameter_ = new java.util.ArrayList(valueParameter_); - bitField0_ |= 0x00000080; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder> valueParameterBuilder_; - - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public java.util.List getValueParameterList() { - if (valueParameterBuilder_ == null) { - return java.util.Collections.unmodifiableList(valueParameter_); - } else { - return valueParameterBuilder_.getMessageList(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public int getValueParameterCount() { - if (valueParameterBuilder_ == null) { - return valueParameter_.size(); - } else { - return valueParameterBuilder_.getCount(); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter getValueParameter(int index) { - if (valueParameterBuilder_ == null) { - return valueParameter_.get(index); - } else { - return valueParameterBuilder_.getMessage(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder setValueParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) { - if (valueParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureValueParameterIsMutable(); - valueParameter_.set(index, value); - onChanged(); - } else { - valueParameterBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder setValueParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) { - if (valueParameterBuilder_ == null) { - ensureValueParameterIsMutable(); - valueParameter_.set(index, builderForValue.build()); - onChanged(); - } else { - valueParameterBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder addValueParameter(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) { - if (valueParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureValueParameterIsMutable(); - valueParameter_.add(value); - onChanged(); - } else { - valueParameterBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder addValueParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter value) { - if (valueParameterBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureValueParameterIsMutable(); - valueParameter_.add(index, value); - onChanged(); - } else { - valueParameterBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder addValueParameter( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) { - if (valueParameterBuilder_ == null) { - ensureValueParameterIsMutable(); - valueParameter_.add(builderForValue.build()); - onChanged(); - } else { - valueParameterBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder addValueParameter( - int index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder builderForValue) { - if (valueParameterBuilder_ == null) { - ensureValueParameterIsMutable(); - valueParameter_.add(index, builderForValue.build()); - onChanged(); - } else { - valueParameterBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder addAllValueParameter( - java.lang.Iterable values) { - if (valueParameterBuilder_ == null) { - ensureValueParameterIsMutable(); - super.addAll(values, valueParameter_); - onChanged(); - } else { - valueParameterBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder clearValueParameter() { - if (valueParameterBuilder_ == null) { - valueParameter_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); - onChanged(); - } else { - valueParameterBuilder_.clear(); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public Builder removeValueParameter(int index) { - if (valueParameterBuilder_ == null) { - ensureValueParameterIsMutable(); - valueParameter_.remove(index); - onChanged(); - } else { - valueParameterBuilder_.remove(index); - } - return this; - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder getValueParameterBuilder( - int index) { - return getValueParameterFieldBuilder().getBuilder(index); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder getValueParameterOrBuilder( - int index) { - if (valueParameterBuilder_ == null) { - return valueParameter_.get(index); } else { - return valueParameterBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public java.util.List - getValueParameterOrBuilderList() { - if (valueParameterBuilder_ != null) { - return valueParameterBuilder_.getMessageOrBuilderList(); - } else { - return java.util.Collections.unmodifiableList(valueParameter_); - } - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder() { - return getValueParameterFieldBuilder().addBuilder( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder addValueParameterBuilder( - int index) { - return getValueParameterFieldBuilder().addBuilder( - index, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.getDefaultInstance()); - } - /** - * repeated .org.jetbrains.jet.descriptors.serialization.Callable.ValueParameter value_parameter = 7; - * - * 
-       * Value parameters for functions and constructors, or setter value parameter for properties
-       *
- */ - public java.util.List - getValueParameterBuilderList() { - return getValueParameterFieldBuilder().getBuilderList(); - } - private com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder> - getValueParameterFieldBuilder() { - if (valueParameterBuilder_ == null) { - valueParameterBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameter.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Callable.ValueParameterOrBuilder>( - valueParameter_, - ((bitField0_ & 0x00000080) == 0x00000080), - getParentForChildren(), - isClean()); - valueParameter_ = null; - } - return valueParameterBuilder_; - } - - // required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - private org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> returnTypeBuilder_; - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public boolean hasReturnType() { - return ((bitField0_ & 0x00000100) == 0x00000100); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type getReturnType() { - if (returnTypeBuilder_ == null) { - return returnType_; - } else { - return returnTypeBuilder_.getMessage(); - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public Builder setReturnType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (returnTypeBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - returnType_ = value; - onChanged(); - } else { - returnTypeBuilder_.setMessage(value); - } - bitField0_ |= 0x00000100; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public Builder setReturnType( - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder builderForValue) { - if (returnTypeBuilder_ == null) { - returnType_ = builderForValue.build(); - onChanged(); - } else { - returnTypeBuilder_.setMessage(builderForValue.build()); - } - bitField0_ |= 0x00000100; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public Builder mergeReturnType(org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type value) { - if (returnTypeBuilder_ == null) { - if (((bitField0_ & 0x00000100) == 0x00000100) && - returnType_ != org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance()) { - returnType_ = - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.newBuilder(returnType_).mergeFrom(value).buildPartial(); - } else { - returnType_ = value; - } - onChanged(); - } else { - returnTypeBuilder_.mergeFrom(value); - } - bitField0_ |= 0x00000100; - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public Builder clearReturnType() { - if (returnTypeBuilder_ == null) { - returnType_ = org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.getDefaultInstance(); - onChanged(); - } else { - returnTypeBuilder_.clear(); - } - bitField0_ = (bitField0_ & ~0x00000100); - return this; - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder getReturnTypeBuilder() { - bitField0_ |= 0x00000100; - onChanged(); - return getReturnTypeFieldBuilder().getBuilder(); - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - public org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder getReturnTypeOrBuilder() { - if (returnTypeBuilder_ != null) { - return returnTypeBuilder_.getMessageOrBuilder(); - } else { - return returnType_; - } - } - /** - * required .org.jetbrains.jet.descriptors.serialization.Type return_type = 8; - */ - private com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder> - getReturnTypeFieldBuilder() { - if (returnTypeBuilder_ == null) { - returnTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder< - org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.Type.Builder, org.jetbrains.jet.descriptors.serialization.DebugProtoBuf.TypeOrBuilder>( - returnType_, - getParentForChildren(), - isClean()); - returnType_ = null; - } - return returnTypeBuilder_; - } - - // @@protoc_insertion_point(builder_scope:org.jetbrains.jet.descriptors.serialization.Callable) - } - - static { - defaultInstance = new Callable(true); - defaultInstance.initFields(); - } - - // @@protoc_insertion_point(class_scope:org.jetbrains.jet.descriptors.serialization.Callable) - } - - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable; - private static com.google.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable; - - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { - return descriptor; - } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; - static { - java.lang.String[] descriptorData = { - "\n;compiler/frontend/serialization/src/de" + - "scriptors.debug.proto\022+org.jetbrains.jet" + - ".descriptors.serialization\"\037\n\017SimpleName" + - "Table\022\014\n\004name\030\001 \003(\t\"\317\002\n\022QualifiedNameTab" + - "le\022e\n\016qualified_name\030\001 \003(\0132M.org.jetbrai" + - "ns.jet.descriptors.serialization.Qualifi" + - "edNameTable.QualifiedName\032\321\001\n\rQualifiedN" + - "ame\022!\n\025parent_qualified_name\030\001 \001(\005:\002-1\022\022" + - "\n\nshort_name\030\002 \002(\005\022i\n\004kind\030\003 \001(\0162R.org.j" + - "etbrains.jet.descriptors.serialization.Q", - "ualifiedNameTable.QualifiedName.Kind:\007PA" + - "CKAGE\"\036\n\004Kind\022\t\n\005CLASS\020\000\022\013\n\007PACKAGE\020\001\"\263\004" + - "\n\004Type\022R\n\013constructor\030\001 \002(\0132=.org.jetbra" + - "ins.jet.descriptors.serialization.Type.C" + - "onstructor\022L\n\010argument\030\002 \003(\0132:.org.jetbr" + - "ains.jet.descriptors.serialization.Type." + - "Argument\022\027\n\010nullable\030\003 \001(\010:\005false\032\231\001\n\013Co" + - "nstructor\022W\n\004kind\030\001 \001(\0162B.org.jetbrains." + - "jet.descriptors.serialization.Type.Const" + - "ructor.Kind:\005CLASS\022\n\n\002id\030\002 \002(\005\"%\n\004Kind\022\t", - "\n\005CLASS\020\000\022\022\n\016TYPE_PARAMETER\020\001\032\323\001\n\010Argume" + - "nt\022^\n\nprojection\030\001 \001(\0162E.org.jetbrains.j" + - "et.descriptors.serialization.Type.Argume" + - "nt.Projection:\003INV\022?\n\004type\030\002 \002(\01321.org.j" + - "etbrains.jet.descriptors.serialization.T" + - "ype\"&\n\nProjection\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003IN" + - "V\020\002\"\213\002\n\rTypeParameter\022\n\n\002id\030\001 \002(\005\022\014\n\004nam" + - "e\030\002 \002(\005\022\026\n\007reified\030\003 \001(\010:\005false\022Z\n\010varia" + - "nce\030\004 \001(\0162C.org.jetbrains.jet.descriptor" + - "s.serialization.TypeParameter.Variance:\003", - "INV\022F\n\013upper_bound\030\005 \003(\01321.org.jetbrains" + - ".jet.descriptors.serialization.Type\"$\n\010V" + - "ariance\022\006\n\002IN\020\000\022\007\n\003OUT\020\001\022\007\n\003INV\020\002\"\254\006\n\005Cl" + - "ass\022\020\n\005flags\030\001 \001(\005:\0010\022\030\n\020extra_visibilit" + - "y\030\002 \001(\t\022\017\n\007fq_name\030\003 \002(\005\022T\n\014class_object" + - "\030\004 \001(\0132>.org.jetbrains.jet.descriptors.s" + - "erialization.Class.ClassObject\022R\n\016type_p" + - "arameter\030\005 \003(\0132:.org.jetbrains.jet.descr" + - "iptors.serialization.TypeParameter\022D\n\tsu" + - "pertype\030\006 \003(\01321.org.jetbrains.jet.descri", - "ptors.serialization.Type\022\031\n\021nested_class" + - "_name\030\007 \003(\005\022E\n\006member\030\013 \003(\01325.org.jetbra" + - "ins.jet.descriptors.serialization.Callab" + - "le\022\022\n\nenum_entry\030\014 \003(\005\022b\n\023primary_constr" + - "uctor\030\r \001(\0132E.org.jetbrains.jet.descript" + - "ors.serialization.Class.PrimaryConstruct" + - "or\032O\n\013ClassObject\022@\n\004data\030\001 \001(\01322.org.je" + - "tbrains.jet.descriptors.serialization.Cl" + - "ass\032Y\n\022PrimaryConstructor\022C\n\004data\030\001 \001(\0132" + - "5.org.jetbrains.jet.descriptors.serializ", - "ation.Callable\"p\n\004Kind\022\t\n\005CLASS\020\000\022\t\n\005TRA" + - "IT\020\001\022\016\n\nENUM_CLASS\020\002\022\016\n\nENUM_ENTRY\020\003\022\024\n\020" + - "ANNOTATION_CLASS\020\004\022\n\n\006OBJECT\020\005\022\020\n\014CLASS_" + - "OBJECT\020\006\"P\n\007Package\022E\n\006member\030\001 \003(\01325.or" + - "g.jetbrains.jet.descriptors.serializatio" + - "n.Callable\"\220\006\n\010Callable\022\r\n\005flags\030\001 \001(\005\022\030" + - "\n\020extra_visibility\030\002 \001(\t\022\024\n\014getter_flags" + - "\030\t \001(\005\022\024\n\014setter_flags\030\n \001(\005\022R\n\016type_par" + - "ameter\030\004 \003(\0132:.org.jetbrains.jet.descrip" + - "tors.serialization.TypeParameter\022H\n\rrece", - "iver_type\030\005 \001(\01321.org.jetbrains.jet.desc" + - "riptors.serialization.Type\022\014\n\004name\030\006 \002(\005" + - "\022]\n\017value_parameter\030\007 \003(\0132D.org.jetbrain" + - "s.jet.descriptors.serialization.Callable" + - ".ValueParameter\022F\n\013return_type\030\010 \002(\01321.o" + - "rg.jetbrains.jet.descriptors.serializati" + - "on.Type\032\305\001\n\016ValueParameter\022\r\n\005flags\030\001 \001(" + - "\005\022\014\n\004name\030\002 \002(\005\022?\n\004type\030\003 \002(\01321.org.jetb" + - "rains.jet.descriptors.serialization.Type" + - "\022N\n\023vararg_element_type\030\004 \001(\01321.org.jetb", - "rains.jet.descriptors.serialization.Type" + - "*\005\010d\020\310\001\"Q\n\nMemberKind\022\017\n\013DECLARATION\020\000\022\021" + - "\n\rFAKE_OVERRIDE\020\001\022\016\n\nDELEGATION\020\002\022\017\n\013SYN" + - "THESIZED\020\003\":\n\014CallableKind\022\007\n\003FUN\020\000\022\007\n\003V" + - "AL\020\001\022\007\n\003VAR\020\002\022\017\n\013CONSTRUCTOR\020\003*\005\010d\020\310\001*-\n" + - "\010Modality\022\t\n\005FINAL\020\000\022\010\n\004OPEN\020\001\022\014\n\010ABSTRA" + - "CT\020\002*M\n\nVisibility\022\014\n\010INTERNAL\020\000\022\013\n\007PRIV" + - "ATE\020\001\022\r\n\tPROTECTED\020\002\022\n\n\006PUBLIC\020\003\022\t\n\005EXTR" + - "A\020\004B\022B\rDebugProtoBuf\210\001\000" - }; - com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_SimpleNameTable_descriptor, - new java.lang.String[] { "Name", }); - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor = - getDescriptor().getMessageTypes().get(1); - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor, - new java.lang.String[] { "QualifiedName", }); - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor = - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_descriptor.getNestedTypes().get(0); - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_QualifiedNameTable_QualifiedName_descriptor, - new java.lang.String[] { "ParentQualifiedName", "ShortName", "Kind", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor = - getDescriptor().getMessageTypes().get(2); - internal_static_org_jetbrains_jet_descriptors_serialization_Type_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor, - new java.lang.String[] { "Constructor", "Argument", "Nullable", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor = - internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor.getNestedTypes().get(0); - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Constructor_descriptor, - new java.lang.String[] { "Kind", "Id", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor = - internal_static_org_jetbrains_jet_descriptors_serialization_Type_descriptor.getNestedTypes().get(1); - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Type_Argument_descriptor, - new java.lang.String[] { "Projection", "Type", }); - internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor = - getDescriptor().getMessageTypes().get(3); - internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_TypeParameter_descriptor, - new java.lang.String[] { "Id", "Name", "Reified", "Variance", "UpperBound", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor = - getDescriptor().getMessageTypes().get(4); - internal_static_org_jetbrains_jet_descriptors_serialization_Class_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor, - new java.lang.String[] { "Flags", "ExtraVisibility", "FqName", "ClassObject", "TypeParameter", "Supertype", "NestedClassName", "Member", "EnumEntry", "PrimaryConstructor", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor = - internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor.getNestedTypes().get(0); - internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Class_ClassObject_descriptor, - new java.lang.String[] { "Data", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor = - internal_static_org_jetbrains_jet_descriptors_serialization_Class_descriptor.getNestedTypes().get(1); - internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Class_PrimaryConstructor_descriptor, - new java.lang.String[] { "Data", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor = - getDescriptor().getMessageTypes().get(5); - internal_static_org_jetbrains_jet_descriptors_serialization_Package_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Package_descriptor, - new java.lang.String[] { "Member", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor = - getDescriptor().getMessageTypes().get(6); - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor, - new java.lang.String[] { "Flags", "ExtraVisibility", "GetterFlags", "SetterFlags", "TypeParameter", "ReceiverType", "Name", "ValueParameter", "ReturnType", }); - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor = - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_descriptor.getNestedTypes().get(0); - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_jet_descriptors_serialization_Callable_ValueParameter_descriptor, - new java.lang.String[] { "Flags", "Name", "Type", "VarargElementType", }); - return null; - } - }; - com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }, assigner); - } - - // @@protoc_insertion_point(outer_class_scope) -} From 7586056fedf12d0d75057359e8d6156d8c7f8c6c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 22 Jan 2014 20:08:45 +0400 Subject: [PATCH 0062/1557] Moved general JPS test data to common directory. Original commit: 9e22c29825c10cbaed65f363688aed841b0b65c4 --- .../jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 2 +- .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../module2/module2.iml | 0 .../module2/src/JSecond.java | 0 .../src/JFirst.java | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../module2/module2.iml | 0 .../module2/src/JSecond.java | 0 .../module2/src/kt1.kt | 0 .../src/JFirst.java | 0 .../src/kt2.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/Excluded.kt | 0 .../src/dir/YetAnotherExcluded.kt | 0 .../ExcludeFileUsingCompilerSettings/src/dir/bar.kt | 0 .../ExcludeFileUsingCompilerSettings/src/foo.kt | 0 .../ExcludeFolderInSourceRoot/kotlinProject.iml | 0 .../ExcludeFolderInSourceRoot/kotlinProject.ipr | 0 .../src/exclude/Excluded.kt | 0 .../ExcludeFolderInSourceRoot/src/foo.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/dir/Excluded.kt | 0 .../src/dir/subdir/YetAnotherExcluded.kt | 0 .../src/dir/subdir/bar.kt | 0 .../src/foo.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/bar.kt | 0 .../src/exclude/Excluded.kt | 0 .../src/exclude/YetAnotherExcluded.kt | 0 .../src/exclude/subdir/Excluded.kt | 0 .../src/exclude/subdir/YetAnotherExcluded.kt | 0 .../src/foo.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/foo.kt | 0 .../src/module2/module2.iml | 0 .../src/module2/src/foo.kt | 0 .../JKJInheritanceProject}/kotlinProject.iml | 2 +- .../JKJInheritanceProject/kotlinProject.ipr | 0 .../JKJInheritanceProject/src/java/JFirst.java | 0 .../JKJInheritanceProject/src/java/JSecond.java | 0 .../JKJInheritanceProject/src/kotlin/KFirst.kt | 0 .../JKJProject}/kotlinProject.iml | 0 .../{ => general}/JKJProject/kotlinProject.ipr | 0 .../{ => general}/JKJProject/src/java/JFirst.java | 0 .../{ => general}/JKJProject/src/java/JSecond.java | 0 .../{ => general}/JKJProject/src/kotlin/KFirst.kt | 0 .../KJCircularProject/kotlinProject.iml | 0 .../KJCircularProject/kotlinProject.ipr | 0 .../KJCircularProject/src/java/JFirst.java | 0 .../KJCircularProject/src/kotlin/KFirst.kt | 0 .../KJKInheritanceProject/kotlinProject.iml | 0 .../KJKInheritanceProject/kotlinProject.ipr | 0 .../KJKInheritanceProject/src/java/JFirst.java | 0 .../KJKInheritanceProject/src/kotlin/KFirst.kt | 0 .../KJKInheritanceProject/src/kotlin/KSecond.kt | 0 .../{ => general}/KJKProject/kotlinProject.iml | 0 .../{ => general}/KJKProject/kotlinProject.ipr | 0 .../{ => general}/KJKProject/src/java/JFirst.java | 0 .../{ => general}/KJKProject/src/kotlin/KFirst.kt | 0 .../{ => general}/KJKProject/src/kotlin/KSecond.kt | 0 .../KotlinJavaProject/kotlinProject.iml | 0 .../KotlinJavaProject/kotlinProject.ipr | 0 .../{ => general}/KotlinJavaProject/src/Test.java | 0 .../KotlinJavaProject/src/kotlinFile.kt | 0 .../{ => general}/KotlinProject/kotlinProject.iml | 0 .../{ => general}/KotlinProject/kotlinProject.ipr | 0 .../{ => general}/KotlinProject/src/test1.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../KotlinProjectTwoFilesInOnePackage/src/test1.kt | 0 .../KotlinProjectTwoFilesInOnePackage/src/test2.kt | 0 .../{ => general}/ManyFiles/kotlinProject.iml | 0 .../{ => general}/ManyFiles/kotlinProject.ipr | 0 .../testData/{ => general}/ManyFiles/src/Bar.kt | 0 .../testData/{ => general}/ManyFiles/src/boo.kt | 0 .../testData/{ => general}/ManyFiles/src/main.kt | 0 .../ReexportedDependency/kotlinProject.iml | 0 .../ReexportedDependency/kotlinProject.ipr | 0 .../ReexportedDependency/module2/lib/j/J.class | Bin .../ReexportedDependency/module2/lib/j/J.java | 0 .../module2/lib/j/annotations.xml | 0 .../ReexportedDependency/module2/module2.iml | 0 .../ReexportedDependency/module2/src/JSecond.java | 0 .../ReexportedDependency/module2/src/my.kt | 0 .../ReexportedDependency/module3/module3.iml | 0 .../ReexportedDependency/module3/src/m3.kt | 0 .../{ => general}/ReexportedDependency/src/main.kt | 0 .../TestDependencyLibrary/kotlinProject.iml | 0 .../TestDependencyLibrary/kotlinProject.ipr | 0 .../{ => general}/TestDependencyLibrary/src/src.kt | 0 .../TestDependencyLibrary/test/test.kt | 0 97 files changed, 2 insertions(+), 2 deletions(-) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/module2/module2.iml (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesNoKotlinFiles/src/JFirst.java (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java (100%) rename jps/jps-plugin/testData/{ => general}/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/src/Excluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/src/dir/bar.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFileUsingCompilerSettings/src/foo.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderInSourceRoot/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderInSourceRoot/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderInSourceRoot/src/foo.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml (100%) rename jps/jps-plugin/testData/{ => general}/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt (100%) rename jps/jps-plugin/testData/{JKJProject => general/JKJInheritanceProject}/kotlinProject.iml (98%) rename jps/jps-plugin/testData/{ => general}/JKJInheritanceProject/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/JKJInheritanceProject/src/java/JFirst.java (100%) rename jps/jps-plugin/testData/{ => general}/JKJInheritanceProject/src/java/JSecond.java (100%) rename jps/jps-plugin/testData/{ => general}/JKJInheritanceProject/src/kotlin/KFirst.kt (100%) rename jps/jps-plugin/testData/{JKJInheritanceProject => general/JKJProject}/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/JKJProject/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/JKJProject/src/java/JFirst.java (100%) rename jps/jps-plugin/testData/{ => general}/JKJProject/src/java/JSecond.java (100%) rename jps/jps-plugin/testData/{ => general}/JKJProject/src/kotlin/KFirst.kt (100%) rename jps/jps-plugin/testData/{ => general}/KJCircularProject/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/KJCircularProject/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/KJCircularProject/src/java/JFirst.java (100%) rename jps/jps-plugin/testData/{ => general}/KJCircularProject/src/kotlin/KFirst.kt (100%) rename jps/jps-plugin/testData/{ => general}/KJKInheritanceProject/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/KJKInheritanceProject/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/KJKInheritanceProject/src/java/JFirst.java (100%) rename jps/jps-plugin/testData/{ => general}/KJKInheritanceProject/src/kotlin/KFirst.kt (100%) rename jps/jps-plugin/testData/{ => general}/KJKInheritanceProject/src/kotlin/KSecond.kt (100%) rename jps/jps-plugin/testData/{ => general}/KJKProject/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/KJKProject/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/KJKProject/src/java/JFirst.java (100%) rename jps/jps-plugin/testData/{ => general}/KJKProject/src/kotlin/KFirst.kt (100%) rename jps/jps-plugin/testData/{ => general}/KJKProject/src/kotlin/KSecond.kt (100%) rename jps/jps-plugin/testData/{ => general}/KotlinJavaProject/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/KotlinJavaProject/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/KotlinJavaProject/src/Test.java (100%) rename jps/jps-plugin/testData/{ => general}/KotlinJavaProject/src/kotlinFile.kt (100%) rename jps/jps-plugin/testData/{ => general}/KotlinProject/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/KotlinProject/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/KotlinProject/src/test1.kt (100%) rename jps/jps-plugin/testData/{ => general}/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/KotlinProjectTwoFilesInOnePackage/src/test1.kt (100%) rename jps/jps-plugin/testData/{ => general}/KotlinProjectTwoFilesInOnePackage/src/test2.kt (100%) rename jps/jps-plugin/testData/{ => general}/ManyFiles/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/ManyFiles/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/ManyFiles/src/Bar.kt (100%) rename jps/jps-plugin/testData/{ => general}/ManyFiles/src/boo.kt (100%) rename jps/jps-plugin/testData/{ => general}/ManyFiles/src/main.kt (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/module2/lib/j/J.class (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/module2/lib/j/J.java (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/module2/lib/j/annotations.xml (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/module2/module2.iml (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/module2/src/JSecond.java (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/module2/src/my.kt (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/module3/module3.iml (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/module3/src/m3.kt (100%) rename jps/jps-plugin/testData/{ => general}/ReexportedDependency/src/main.kt (100%) rename jps/jps-plugin/testData/{ => general}/TestDependencyLibrary/kotlinProject.iml (100%) rename jps/jps-plugin/testData/{ => general}/TestDependencyLibrary/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/{ => general}/TestDependencyLibrary/src/src.kt (100%) rename jps/jps-plugin/testData/{ => general}/TestDependencyLibrary/test/test.kt (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 3d065cb8dfd..e4b717829c4 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -42,7 +42,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { @Override public void setUp() throws Exception { super.setUp(); - File sourceFilesRoot = new File(TEST_DATA_PATH + getTestName(false)); + File sourceFilesRoot = new File(TEST_DATA_PATH + "general/" + getTestName(false)); workDir = copyTestDataToTmpDir(sourceFilesRoot); getOrCreateProjectDir(); } diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml b/jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.iml rename to jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.iml diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr b/jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/kotlinProject.ipr rename to jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/module2/module2.iml similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/module2.iml rename to jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/module2/module2.iml diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java b/jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java rename to jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/module2/src/JSecond.java diff --git a/jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java b/jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/src/JFirst.java similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesNoKotlinFiles/src/JFirst.java rename to jps/jps-plugin/testData/general/CircularDependenciesNoKotlinFiles/src/JFirst.java diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml b/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml rename to jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr b/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr rename to jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml rename to jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java b/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java rename to jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt b/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt rename to jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java b/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java rename to jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java diff --git a/jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt b/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt similarity index 100% rename from jps/jps-plugin/testData/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt rename to jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml b/jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.iml rename to jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.iml diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr b/jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/kotlinProject.ipr rename to jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt b/jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/Excluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/Excluded.kt rename to jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/Excluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt b/jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt rename to jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/dir/YetAnotherExcluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt b/jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/dir/bar.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/dir/bar.kt rename to jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/dir/bar.kt diff --git a/jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/foo.kt b/jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/foo.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFileUsingCompilerSettings/src/foo.kt rename to jps/jps-plugin/testData/general/ExcludeFileUsingCompilerSettings/src/foo.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.iml b/jps/jps-plugin/testData/general/ExcludeFolderInSourceRoot/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.iml rename to jps/jps-plugin/testData/general/ExcludeFolderInSourceRoot/kotlinProject.iml diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.ipr b/jps/jps-plugin/testData/general/ExcludeFolderInSourceRoot/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderInSourceRoot/kotlinProject.ipr rename to jps/jps-plugin/testData/general/ExcludeFolderInSourceRoot/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt b/jps/jps-plugin/testData/general/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt rename to jps/jps-plugin/testData/general/ExcludeFolderInSourceRoot/src/exclude/Excluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/foo.kt b/jps/jps-plugin/testData/general/ExcludeFolderInSourceRoot/src/foo.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderInSourceRoot/src/foo.kt rename to jps/jps-plugin/testData/general/ExcludeFolderInSourceRoot/src/foo.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml b/jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml rename to jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.iml diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr b/jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr rename to jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt b/jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt rename to jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/Excluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt b/jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt rename to jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/YetAnotherExcluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt b/jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt rename to jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/dir/subdir/bar.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt b/jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt rename to jps/jps-plugin/testData/general/ExcludeFolderNonRecursivelyUsingCompilerSettings/src/foo.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml b/jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml rename to jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.iml diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr b/jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr rename to jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt b/jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt rename to jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/bar.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt b/jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt rename to jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/Excluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt b/jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt rename to jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/YetAnotherExcluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt b/jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt rename to jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/Excluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt b/jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt rename to jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/exclude/subdir/YetAnotherExcluded.kt diff --git a/jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt b/jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt rename to jps/jps-plugin/testData/general/ExcludeFolderRecursivelyUsingCompilerSettings/src/foo.kt diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml b/jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml rename to jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.iml diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr b/jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr rename to jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt b/jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt rename to jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/foo.kt diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml b/jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml similarity index 100% rename from jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml rename to jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/module2.iml diff --git a/jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt b/jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt similarity index 100% rename from jps/jps-plugin/testData/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt rename to jps/jps-plugin/testData/general/ExcludeModuleFolderInSourceRootOfAnotherModule/src/module2/src/foo.kt diff --git a/jps/jps-plugin/testData/JKJProject/kotlinProject.iml b/jps/jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.iml similarity index 98% rename from jps/jps-plugin/testData/JKJProject/kotlinProject.iml rename to jps/jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.iml index 10db71f5cd2..5d6f3a17863 100644 --- a/jps/jps-plugin/testData/JKJProject/kotlinProject.iml +++ b/jps/jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.iml @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.ipr rename to jps/jps-plugin/testData/general/JKJInheritanceProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/JKJInheritanceProject/src/java/JFirst.java similarity index 100% rename from jps/jps-plugin/testData/JKJInheritanceProject/src/java/JFirst.java rename to jps/jps-plugin/testData/general/JKJInheritanceProject/src/java/JFirst.java diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java b/jps/jps-plugin/testData/general/JKJInheritanceProject/src/java/JSecond.java similarity index 100% rename from jps/jps-plugin/testData/JKJInheritanceProject/src/java/JSecond.java rename to jps/jps-plugin/testData/general/JKJInheritanceProject/src/java/JSecond.java diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/JKJInheritanceProject/src/kotlin/KFirst.kt similarity index 100% rename from jps/jps-plugin/testData/JKJInheritanceProject/src/kotlin/KFirst.kt rename to jps/jps-plugin/testData/general/JKJInheritanceProject/src/kotlin/KFirst.kt diff --git a/jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml b/jps/jps-plugin/testData/general/JKJProject/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/JKJInheritanceProject/kotlinProject.iml rename to jps/jps-plugin/testData/general/JKJProject/kotlinProject.iml diff --git a/jps/jps-plugin/testData/JKJProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/JKJProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/JKJProject/kotlinProject.ipr rename to jps/jps-plugin/testData/general/JKJProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/JKJProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java similarity index 100% rename from jps/jps-plugin/testData/JKJProject/src/java/JFirst.java rename to jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java diff --git a/jps/jps-plugin/testData/JKJProject/src/java/JSecond.java b/jps/jps-plugin/testData/general/JKJProject/src/java/JSecond.java similarity index 100% rename from jps/jps-plugin/testData/JKJProject/src/java/JSecond.java rename to jps/jps-plugin/testData/general/JKJProject/src/java/JSecond.java diff --git a/jps/jps-plugin/testData/JKJProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt similarity index 100% rename from jps/jps-plugin/testData/JKJProject/src/kotlin/KFirst.kt rename to jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt diff --git a/jps/jps-plugin/testData/KJCircularProject/kotlinProject.iml b/jps/jps-plugin/testData/general/KJCircularProject/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/KJCircularProject/kotlinProject.iml rename to jps/jps-plugin/testData/general/KJCircularProject/kotlinProject.iml diff --git a/jps/jps-plugin/testData/KJCircularProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/KJCircularProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/KJCircularProject/kotlinProject.ipr rename to jps/jps-plugin/testData/general/KJCircularProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/KJCircularProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java similarity index 100% rename from jps/jps-plugin/testData/KJCircularProject/src/java/JFirst.java rename to jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java diff --git a/jps/jps-plugin/testData/KJCircularProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt similarity index 100% rename from jps/jps-plugin/testData/KJCircularProject/src/kotlin/KFirst.kt rename to jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml b/jps/jps-plugin/testData/general/KJKInheritanceProject/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.iml rename to jps/jps-plugin/testData/general/KJKInheritanceProject/kotlinProject.iml diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/KJKInheritanceProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/KJKInheritanceProject/kotlinProject.ipr rename to jps/jps-plugin/testData/general/KJKInheritanceProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/KJKInheritanceProject/src/java/JFirst.java similarity index 100% rename from jps/jps-plugin/testData/KJKInheritanceProject/src/java/JFirst.java rename to jps/jps-plugin/testData/general/KJKInheritanceProject/src/java/JFirst.java diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/KJKInheritanceProject/src/kotlin/KFirst.kt similarity index 100% rename from jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KFirst.kt rename to jps/jps-plugin/testData/general/KJKInheritanceProject/src/kotlin/KFirst.kt diff --git a/jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/general/KJKInheritanceProject/src/kotlin/KSecond.kt similarity index 100% rename from jps/jps-plugin/testData/KJKInheritanceProject/src/kotlin/KSecond.kt rename to jps/jps-plugin/testData/general/KJKInheritanceProject/src/kotlin/KSecond.kt diff --git a/jps/jps-plugin/testData/KJKProject/kotlinProject.iml b/jps/jps-plugin/testData/general/KJKProject/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/KJKProject/kotlinProject.iml rename to jps/jps-plugin/testData/general/KJKProject/kotlinProject.iml diff --git a/jps/jps-plugin/testData/KJKProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/KJKProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/KJKProject/kotlinProject.ipr rename to jps/jps-plugin/testData/general/KJKProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/KJKProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java similarity index 100% rename from jps/jps-plugin/testData/KJKProject/src/java/JFirst.java rename to jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java diff --git a/jps/jps-plugin/testData/KJKProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt similarity index 100% rename from jps/jps-plugin/testData/KJKProject/src/kotlin/KFirst.kt rename to jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt diff --git a/jps/jps-plugin/testData/KJKProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt similarity index 100% rename from jps/jps-plugin/testData/KJKProject/src/kotlin/KSecond.kt rename to jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt diff --git a/jps/jps-plugin/testData/KotlinJavaProject/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaProject/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/KotlinJavaProject/kotlinProject.iml rename to jps/jps-plugin/testData/general/KotlinJavaProject/kotlinProject.iml diff --git a/jps/jps-plugin/testData/KotlinJavaProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/KotlinJavaProject/kotlinProject.ipr rename to jps/jps-plugin/testData/general/KotlinJavaProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/KotlinJavaProject/src/Test.java b/jps/jps-plugin/testData/general/KotlinJavaProject/src/Test.java similarity index 100% rename from jps/jps-plugin/testData/KotlinJavaProject/src/Test.java rename to jps/jps-plugin/testData/general/KotlinJavaProject/src/Test.java diff --git a/jps/jps-plugin/testData/KotlinJavaProject/src/kotlinFile.kt b/jps/jps-plugin/testData/general/KotlinJavaProject/src/kotlinFile.kt similarity index 100% rename from jps/jps-plugin/testData/KotlinJavaProject/src/kotlinFile.kt rename to jps/jps-plugin/testData/general/KotlinJavaProject/src/kotlinFile.kt diff --git a/jps/jps-plugin/testData/KotlinProject/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProject/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/KotlinProject/kotlinProject.iml rename to jps/jps-plugin/testData/general/KotlinProject/kotlinProject.iml diff --git a/jps/jps-plugin/testData/KotlinProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProject/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/KotlinProject/kotlinProject.ipr rename to jps/jps-plugin/testData/general/KotlinProject/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/KotlinProject/src/test1.kt b/jps/jps-plugin/testData/general/KotlinProject/src/test1.kt similarity index 100% rename from jps/jps-plugin/testData/KotlinProject/src/test1.kt rename to jps/jps-plugin/testData/general/KotlinProject/src/test1.kt diff --git a/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml rename to jps/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.iml diff --git a/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr rename to jps/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test1.kt b/jps/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/src/test1.kt similarity index 100% rename from jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test1.kt rename to jps/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/src/test1.kt diff --git a/jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test2.kt b/jps/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/src/test2.kt similarity index 100% rename from jps/jps-plugin/testData/KotlinProjectTwoFilesInOnePackage/src/test2.kt rename to jps/jps-plugin/testData/general/KotlinProjectTwoFilesInOnePackage/src/test2.kt diff --git a/jps/jps-plugin/testData/ManyFiles/kotlinProject.iml b/jps/jps-plugin/testData/general/ManyFiles/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/ManyFiles/kotlinProject.iml rename to jps/jps-plugin/testData/general/ManyFiles/kotlinProject.iml diff --git a/jps/jps-plugin/testData/ManyFiles/kotlinProject.ipr b/jps/jps-plugin/testData/general/ManyFiles/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/ManyFiles/kotlinProject.ipr rename to jps/jps-plugin/testData/general/ManyFiles/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/ManyFiles/src/Bar.kt b/jps/jps-plugin/testData/general/ManyFiles/src/Bar.kt similarity index 100% rename from jps/jps-plugin/testData/ManyFiles/src/Bar.kt rename to jps/jps-plugin/testData/general/ManyFiles/src/Bar.kt diff --git a/jps/jps-plugin/testData/ManyFiles/src/boo.kt b/jps/jps-plugin/testData/general/ManyFiles/src/boo.kt similarity index 100% rename from jps/jps-plugin/testData/ManyFiles/src/boo.kt rename to jps/jps-plugin/testData/general/ManyFiles/src/boo.kt diff --git a/jps/jps-plugin/testData/ManyFiles/src/main.kt b/jps/jps-plugin/testData/general/ManyFiles/src/main.kt similarity index 100% rename from jps/jps-plugin/testData/ManyFiles/src/main.kt rename to jps/jps-plugin/testData/general/ManyFiles/src/main.kt diff --git a/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml b/jps/jps-plugin/testData/general/ReexportedDependency/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/kotlinProject.iml rename to jps/jps-plugin/testData/general/ReexportedDependency/kotlinProject.iml diff --git a/jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr b/jps/jps-plugin/testData/general/ReexportedDependency/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/kotlinProject.ipr rename to jps/jps-plugin/testData/general/ReexportedDependency/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.class b/jps/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/J.class similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.class rename to jps/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/J.class diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java b/jps/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/J.java similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/J.java rename to jps/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/J.java diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml b/jps/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/annotations.xml similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/module2/lib/j/annotations.xml rename to jps/jps-plugin/testData/general/ReexportedDependency/module2/lib/j/annotations.xml diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml b/jps/jps-plugin/testData/general/ReexportedDependency/module2/module2.iml similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/module2/module2.iml rename to jps/jps-plugin/testData/general/ReexportedDependency/module2/module2.iml diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/src/JSecond.java b/jps/jps-plugin/testData/general/ReexportedDependency/module2/src/JSecond.java similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/module2/src/JSecond.java rename to jps/jps-plugin/testData/general/ReexportedDependency/module2/src/JSecond.java diff --git a/jps/jps-plugin/testData/ReexportedDependency/module2/src/my.kt b/jps/jps-plugin/testData/general/ReexportedDependency/module2/src/my.kt similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/module2/src/my.kt rename to jps/jps-plugin/testData/general/ReexportedDependency/module2/src/my.kt diff --git a/jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml b/jps/jps-plugin/testData/general/ReexportedDependency/module3/module3.iml similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/module3/module3.iml rename to jps/jps-plugin/testData/general/ReexportedDependency/module3/module3.iml diff --git a/jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt b/jps/jps-plugin/testData/general/ReexportedDependency/module3/src/m3.kt similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/module3/src/m3.kt rename to jps/jps-plugin/testData/general/ReexportedDependency/module3/src/m3.kt diff --git a/jps/jps-plugin/testData/ReexportedDependency/src/main.kt b/jps/jps-plugin/testData/general/ReexportedDependency/src/main.kt similarity index 100% rename from jps/jps-plugin/testData/ReexportedDependency/src/main.kt rename to jps/jps-plugin/testData/general/ReexportedDependency/src/main.kt diff --git a/jps/jps-plugin/testData/TestDependencyLibrary/kotlinProject.iml b/jps/jps-plugin/testData/general/TestDependencyLibrary/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/TestDependencyLibrary/kotlinProject.iml rename to jps/jps-plugin/testData/general/TestDependencyLibrary/kotlinProject.iml diff --git a/jps/jps-plugin/testData/TestDependencyLibrary/kotlinProject.ipr b/jps/jps-plugin/testData/general/TestDependencyLibrary/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/TestDependencyLibrary/kotlinProject.ipr rename to jps/jps-plugin/testData/general/TestDependencyLibrary/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/TestDependencyLibrary/src/src.kt b/jps/jps-plugin/testData/general/TestDependencyLibrary/src/src.kt similarity index 100% rename from jps/jps-plugin/testData/TestDependencyLibrary/src/src.kt rename to jps/jps-plugin/testData/general/TestDependencyLibrary/src/src.kt diff --git a/jps/jps-plugin/testData/TestDependencyLibrary/test/test.kt b/jps/jps-plugin/testData/general/TestDependencyLibrary/test/test.kt similarity index 100% rename from jps/jps-plugin/testData/TestDependencyLibrary/test/test.kt rename to jps/jps-plugin/testData/general/TestDependencyLibrary/test/test.kt From 259d03198d59fdf3290b12908f75e040cd765582 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 22 Jan 2014 23:38:57 +0400 Subject: [PATCH 0063/1557] Baby steps for incremental compilation. Original commit: 5acd054c72bae50bc61fce045fa867e78cf68994 --- .../KAnnotatorJpsBuildTestCase.java | 5 - .../jet/jps/build/KotlinBuilder.java | 37 +++++- .../KotlinBuilderModuleScriptGenerator.java | 17 ++- .../build/AbstractKotlinJpsBuildTestCase.java | 2 +- .../jet/jps/build/IncrementalJpsTest.kt | 114 ++++++++++++++++++ .../incremental/independentClasses/Bar.kt | 2 + .../incremental/independentClasses/Foo.kt | 2 + .../incremental/independentClasses/Foo.kt.new | 2 + .../incremental/independentClasses/build.log | 12 ++ .../incremental/simpleClassDependency/Bar.kt | 2 + .../incremental/simpleClassDependency/Foo.kt | 8 ++ .../simpleClassDependency/Foo.kt.new | 8 ++ .../simpleClassDependency/build.log | 13 ++ 13 files changed, 210 insertions(+), 14 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt create mode 100644 jps/jps-plugin/testData/incremental/independentClasses/Bar.kt create mode 100644 jps/jps-plugin/testData/incremental/independentClasses/Foo.kt create mode 100644 jps/jps-plugin/testData/incremental/independentClasses/Foo.kt.new create mode 100644 jps/jps-plugin/testData/incremental/independentClasses/build.log create mode 100644 jps/jps-plugin/testData/incremental/simpleClassDependency/Bar.kt create mode 100644 jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt create mode 100644 jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt.new create mode 100644 jps/jps-plugin/testData/incremental/simpleClassDependency/build.log diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java index 467d6976a59..d6c95360413 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java @@ -90,11 +90,6 @@ public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { return result; } - @Override - protected File doGetProjectDir() throws IOException { - return workDir; - } - private void initProject() { addJdk(JDK_NAME); loadProject(workDir.getAbsolutePath()); diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 3b21e8d228d..dfa5db0a8ae 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,9 +16,12 @@ package org.jetbrains.jet.jps.build; +import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; +import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.KotlinVersion; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; @@ -46,6 +49,7 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.module.JpsModule; import java.io.File; +import java.io.FileFilter; import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -58,8 +62,9 @@ import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsComp import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler; public class KotlinBuilder extends ModuleLevelBuilder { + private static final Key> ALL_COMPILED_FILES_KEY = Key.create("_all_kotlin_compiled_files_"); - private static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; + public static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; private static final List COMPILABLE_FILE_EXTENSIONS = Collections.singletonList("kt"); private static final Function MODULE_NAME = new Function() { @@ -122,6 +127,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { CommonCompilerArguments commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project); CompilerSettings compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project); + final Set allCompiledFiles = getAllCompiledFilesContainer(context); + if (JpsUtils.isJsKotlinModule(representativeTarget)) { if (chunk.getModules().size() > 1) { // We do not support circular dependencies, but if they are present, we do our best should not break the build, @@ -134,7 +141,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); + Collection sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); if (sourceFiles.isEmpty()) { @@ -157,7 +164,11 @@ public class KotlinBuilder extends ModuleLevelBuilder { NO_LOCATION); } - File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk); + List filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); + filesToCompile.removeAll(allCompiledFiles); + allCompiledFiles.addAll(filesToCompile); + + File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile); if (moduleFile == null) { // No Kotlin sources found return ExitCode.NOTHING_DONE; @@ -192,13 +203,29 @@ public class KotlinBuilder extends ModuleLevelBuilder { outputConsumer.registerOutputFile(target != null ? target : representativeTarget, outputItem.getOutputFile(), paths(sourceFiles)); } - return ExitCode.OK; + // TODO should mark dependencies as dirty, as well + FSOperations.markDirty(context, chunk, new FileFilter() { + @Override + public boolean accept(@NotNull File file) { + return !allCompiledFiles.contains(file); + } + }); + return ExitCode.ADDITIONAL_PASS_REQUIRED; + } + + private static Set getAllCompiledFilesContainer(CompileContext context) { + Set allCompiledFiles = ALL_COMPILED_FILES_KEY.get(context); + if (allCompiledFiles == null) { + allCompiledFiles = new THashSet(FileUtil.FILE_HASHING_STRATEGY); + ALL_COMPILED_FILES_KEY.set(context, allCompiledFiles); + } + return allCompiledFiles; } private static boolean hasKotlinFiles(@NotNull ModuleChunk chunk) { boolean hasKotlinFiles = false; for (ModuleBuildTarget target : chunk.getTargets()) { - List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(target); + Collection sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(target); if (!sourceFiles.isEmpty()) { hasKotlinFiles = true; break; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index f105f36047c..b77ce9de3d5 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -25,6 +25,7 @@ import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilderFactory; import org.jetbrains.jet.compiler.runner.KotlinModuleXmlBuilderFactory; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; +import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.messages.BuildMessage; @@ -52,7 +53,11 @@ public class KotlinBuilderModuleScriptGenerator { public static final KotlinModuleDescriptionBuilderFactory FACTORY = KotlinModuleXmlBuilderFactory.INSTANCE; @Nullable - public static File generateModuleDescription(CompileContext context, ModuleChunk chunk) + public static File generateModuleDescription( + CompileContext context, + ModuleChunk chunk, + List sourceFiles + ) throws IOException { KotlinModuleDescriptionBuilder builder = FACTORY.create(); @@ -63,11 +68,17 @@ public class KotlinBuilderModuleScriptGenerator { for (ModuleBuildTarget target : chunk.getTargets()) { outputDirs.add(getOutputDir(target)); } + ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger(); for (ModuleBuildTarget target : chunk.getTargets()) { File outputDir = getOutputDir(target); - List sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(target); - noSources &= sourceFiles.isEmpty(); + if (sourceFiles.size() > 0) { + noSources = false; + + if (logger.isEnabled()) { + logger.logCompiledFiles(sourceFiles, KotlinBuilder.KOTLIN_BUILDER_NAME, "Compiling files:"); + } + } builder.addModule( target.getId(), diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index 7dd4d207f22..eb7ddb5a7f6 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -37,7 +37,7 @@ import java.io.IOException; import java.util.Collection; public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { - protected static final String TEST_DATA_PATH = "jps-plugin/testData/"; + public static final String TEST_DATA_PATH = "jps-plugin/testData/"; protected File workDir; diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt new file mode 100644 index 00000000000..aca6d23a63d --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -0,0 +1,114 @@ +/* + * Copyright 2010-2014 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.jps.build + +import org.jetbrains.ether.IncrementalTestCase +import org.jetbrains.jps.builders.JpsBuildTestCase +import kotlin.properties.Delegates +import com.intellij.openapi.util.io.FileUtil +import java.io.File +import org.jetbrains.jps.builders.CompileScopeTestBuilder +import org.jetbrains.jps.builders.BuildResult +import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase +import org.jetbrains.jps.builders.logging.BuildLoggingManager +import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.jps.util.JpsPathUtil +import com.intellij.testFramework.UsefulTestCase + +public class IncrementalJpsTest : JpsBuildTestCase() { + private val testDataDir: File + get() = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "incremental/" + getTestName(true)) + + var workDir: File by Delegates.notNull() + + override fun setUp() { + super.setUp() + System.setProperty("kotlin.jps.tests", "true") + + workDir = FileUtil.createTempDirectory("jps-build", null) + + FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) + + JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject!!) + .setOutputUrl(JpsPathUtil.pathToUrl(getAbsolutePath("out"))) + } + + override fun tearDown() { + System.clearProperty("kotlin.jps.tests") + super.tearDown() + } + + fun makeAllGetLog(): String { + val scope = CompileScopeTestBuilder.make().all() + val logger = MyLogger(FileUtil.toSystemIndependentName(workDir.getAbsolutePath())) + val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) + try { + doBuild(descriptor, scope)!!.assertSuccessful() + return logger.log + } finally { + descriptor.release() + } + } + + private fun doTest() { + addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) + + makeAllGetLog() + + FileUtil.processFilesRecursively(testDataDir, { + if (it!!.getName().endsWith(".new")) { + it.copyTo(File(workDir, "src/" + it.getName().trimTrailing(".new"))) + } + + true + }) + + val log = makeAllGetLog() + UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), log) + } + + override fun doGetProjectDir(): File? = workDir + + fun testIndependentClasses() { + doTest() + } + + fun testSimpleClassDependency() { + doTest() + } + + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { + private val logBuf = StringBuilder() + public val log: String + get() = logBuf.toString() + + override fun isEnabled(): Boolean = true + + override fun logLine(message: String?) { + + fun String.replaceHashWithStar(): String { + val lastHyphen = this.lastIndexOf('-') + if (lastHyphen != -1 && substring(lastHyphen + 1).matches("[0-9a-f]{8}\\.class")) { + return substring(0, lastHyphen) + "-*.class" + } + return this + } + + logBuf.append(message!!.trimLeading(rootPath + "/").replaceHashWithStar()).append('\n') + } + } +} diff --git a/jps/jps-plugin/testData/incremental/independentClasses/Bar.kt b/jps/jps-plugin/testData/incremental/independentClasses/Bar.kt new file mode 100644 index 00000000000..d10dda29c09 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/independentClasses/Bar.kt @@ -0,0 +1,2 @@ +package test +class Bar \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/independentClasses/Foo.kt b/jps/jps-plugin/testData/incremental/independentClasses/Foo.kt new file mode 100644 index 00000000000..de4f811f0b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/independentClasses/Foo.kt @@ -0,0 +1,2 @@ +package test +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/independentClasses/Foo.kt.new b/jps/jps-plugin/testData/incremental/independentClasses/Foo.kt.new new file mode 100644 index 00000000000..de4f811f0b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/independentClasses/Foo.kt.new @@ -0,0 +1,2 @@ +package test +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/independentClasses/build.log b/jps/jps-plugin/testData/incremental/independentClasses/build.log new file mode 100644 index 00000000000..0d52aa1b838 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/independentClasses/build.log @@ -0,0 +1,12 @@ +Cleaning output files: +out/production/module/test/Foo.class +End of files +Compiling files: +src/Foo.kt +End of files +Cleaning output files: +out/production/module/test/Bar.class +End of files +Compiling files: +src/Bar.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/Bar.kt b/jps/jps-plugin/testData/incremental/simpleClassDependency/Bar.kt new file mode 100644 index 00000000000..862629bf67c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/simpleClassDependency/Bar.kt @@ -0,0 +1,2 @@ +package test +class Bar diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt b/jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt new file mode 100644 index 00000000000..d40f04709d3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt @@ -0,0 +1,8 @@ +package test +class Foo { + fun f() { + Bar() + } + + class Boo +} diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt.new b/jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt.new new file mode 100644 index 00000000000..a9fb2ea18ed --- /dev/null +++ b/jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt.new @@ -0,0 +1,8 @@ +package test +class Foo { + fun f() { + Bar() + } + + class Boo +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/build.log b/jps/jps-plugin/testData/incremental/simpleClassDependency/build.log new file mode 100644 index 00000000000..6c95f57482f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/simpleClassDependency/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/test/Foo$Boo.class +out/production/module/test/Foo.class +End of files +Compiling files: +src/Foo.kt +End of files +Cleaning output files: +out/production/module/test/Bar.class +End of files +Compiling files: +src/Bar.kt +End of files \ No newline at end of file From 02c0baf065c5639999406d796848b252b7a927d0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 4 Feb 2014 21:56:23 +0400 Subject: [PATCH 0064/1557] Checking class files contents after make and rebuild. Original commit: e1a47deeaece2d78f21851e0957e648d3d113239 --- .../jet/jps/build/IncrementalJpsTest.kt | 15 +- .../jet/jps/build/classFilesComparison.kt | 133 ++++++++++++++++++ 2 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index aca6d23a63d..0823675e211 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -52,8 +52,7 @@ public class IncrementalJpsTest : JpsBuildTestCase() { super.tearDown() } - fun makeAllGetLog(): String { - val scope = CompileScopeTestBuilder.make().all() + fun buildGetLog(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): String { val logger = MyLogger(FileUtil.toSystemIndependentName(workDir.getAbsolutePath())) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) try { @@ -67,7 +66,7 @@ public class IncrementalJpsTest : JpsBuildTestCase() { private fun doTest() { addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) - makeAllGetLog() + buildGetLog() FileUtil.processFilesRecursively(testDataDir, { if (it!!.getName().endsWith(".new")) { @@ -77,8 +76,16 @@ public class IncrementalJpsTest : JpsBuildTestCase() { true }) - val log = makeAllGetLog() + val log = buildGetLog() UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), log) + + val outDir = File(getAbsolutePath("out")) + val outAfterMake = File(getAbsolutePath("out-after-make")) + FileUtil.copyDir(outDir, outAfterMake) + + buildGetLog(CompileScopeTestBuilder.rebuild().allModules()) + + assertEqualDirectories(outDir, outAfterMake, { it.name == "script.xml" }) } override fun doGetProjectDir(): File? = workDir diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt new file mode 100644 index 00000000000..8cd431c2296 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -0,0 +1,133 @@ +/* + * Copyright 2010-2014 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.jps.build + +import java.io.File +import org.junit.Assert.* +import org.jetbrains.asm4.util.TraceClassVisitor +import java.io.PrintWriter +import org.jetbrains.asm4.ClassReader +import java.io.StringWriter +import org.jetbrains.jet.utils.Printer +import com.google.common.io.Files +import com.google.common.hash.Hashing +import com.intellij.openapi.util.io.FileUtil +import com.google.common.collect.Sets +import java.util.HashSet +import com.intellij.openapi.vfs.local.CoreLocalFileSystem +import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass +import org.jetbrains.jet.storage.LockBasedStorageManager +import org.jetbrains.jet.lang.resolve.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.jet.descriptors.serialization.BitEncoding +import org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf +import com.google.protobuf.ExtensionRegistry +import java.io.ByteArrayInputStream +import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf +import java.util.Arrays + +fun File.hash() = Files.hash(this, Hashing.crc32()) + +fun getDirectoryString(dir: File, interestingPaths: List, ignore: (File) -> Boolean): String { + val buf = StringBuilder() + val p = Printer(buf) + + + fun addDirContent(dir: File) { + p.pushIndent() + + val listFiles = dir.listFiles() + assertNotNull(listFiles) + + val children = listFiles!!.toList().sortBy { it.getName() }.sortBy { it.isDirectory() } + for (child in children) { + if (ignore(child)) { + continue + } + + if (child.isDirectory()) { + p.println(child.name) + addDirContent(child) + } + else { + p.println(child.name, " ", child.hash()) + } + } + + p.popIndent() + } + + + p.println(".") + addDirContent(dir) + + for (path in interestingPaths) { + p.println("================", path, "================") + p.println(fileToStringRepresentation(File(dir, path))) + p.println() + p.println() + } + + return buf.toString() +} + +fun getAllRelativePaths(dir: File, ignore: (File) -> Boolean): Set { + val result = HashSet() + FileUtil.processFilesRecursively(dir) { + if (it!!.isFile() && !ignore(it)) { + result.add(FileUtil.getRelativePath(dir, it)!!) + } + + true + } + + return result +} + +fun assertEqualDirectories(expected: File, actual: File, ignore: (File) -> Boolean) { + val pathsInExpected = getAllRelativePaths(expected, ignore) + val pathsInActual = getAllRelativePaths(actual, ignore) + + val changedPaths = Sets.intersection(pathsInExpected, pathsInActual) + .filter { !Arrays.equals(File(expected, it).readBytes(), File(actual, it).readBytes()) } + .sort() + + val expectedString = getDirectoryString(expected, changedPaths, ignore) + val actualString = getDirectoryString(actual, changedPaths, ignore) + + assertEquals(expectedString, actualString) +} + +fun classFileToString(classFile: File): String { + val out = StringWriter() + val traceVisitor = TraceClassVisitor(PrintWriter(out)) + ClassReader(classFile.readBytes()).accept(traceVisitor, 0) + + // TODO serialize protobuf + return out.toString() +} + +fun fileToStringRepresentation(file: File): String { + return when { + file.name.endsWith(".class") -> { + classFileToString(file) + } + else -> { + file.readText() + } + } +} From cf1cf25cb4c4ec25745b7ae698e8cece4d070e90 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 13 Feb 2014 20:39:53 +0400 Subject: [PATCH 0065/1557] Rendering class or package proto when JPS test fails. Original commit: 5c8253c09954d99916ae6d5d12f24c39c0a48621 --- jps/jps-plugin/jps-plugin.iml | 4 ++ .../jet/jps/build/classFilesComparison.kt | 40 +++++++++++++++---- 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 37590a836e4..1b4d326d32d 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -16,6 +16,10 @@ + + + + diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index 8cd431c2296..6af1c8a34d2 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -28,10 +28,6 @@ import com.google.common.hash.Hashing import com.intellij.openapi.util.io.FileUtil import com.google.common.collect.Sets import java.util.HashSet -import com.intellij.openapi.vfs.local.CoreLocalFileSystem -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass -import org.jetbrains.jet.storage.LockBasedStorageManager -import org.jetbrains.jet.lang.resolve.kotlin.header.ReadKotlinClassHeaderAnnotationVisitor import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader import org.jetbrains.jet.descriptors.serialization.BitEncoding import org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf @@ -39,6 +35,7 @@ import com.google.protobuf.ExtensionRegistry import java.io.ByteArrayInputStream import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf import java.util.Arrays +import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass fun File.hash() = Files.hash(this, Hashing.crc32()) @@ -114,13 +111,42 @@ fun assertEqualDirectories(expected: File, actual: File, ignore: (File) -> Boole fun classFileToString(classFile: File): String { val out = StringWriter() - val traceVisitor = TraceClassVisitor(PrintWriter(out)) - ClassReader(classFile.readBytes()).accept(traceVisitor, 0) - // TODO serialize protobuf + val classBytes = classFile.readBytes() + + val traceVisitor = TraceClassVisitor(PrintWriter(out)) + ClassReader(classBytes).accept(traceVisitor, 0) + + val classHeader = VirtualFileKotlinClass.readClassHeader(classBytes) + + val annotationDataEncoded = classHeader?.annotationData + if (annotationDataEncoded != null) { + ByteArrayInputStream(BitEncoding.decodeBytes(annotationDataEncoded)).use { + input -> + + out.write("\n------ simpleNames proto -----\n${DebugProtoBuf.SimpleNameTable.parseDelimitedFrom(input)}") + out.write("\n------ qualifiedNames proto -----\n${DebugProtoBuf.QualifiedNameTable.parseDelimitedFrom(input)}") + + when (classHeader!!.kind) { + KotlinClassHeader.Kind.PACKAGE_FACADE -> + out.write("\n------ package proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") + + KotlinClassHeader.Kind.CLASS -> + out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") + else -> throw IllegalStateException() + } + } + } + return out.toString() } +fun getExtensionRegistry(): ExtensionRegistry { + val registry = ExtensionRegistry.newInstance()!! + DebugJavaProtoBuf.registerAllExtensions(registry) + return registry +} + fun fileToStringRepresentation(file: File): String { return when { file.name.endsWith(".class") -> { From e676bd841dbc5dd6440bc9557712d89a59e658bb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 28 Jan 2014 22:56:16 +0400 Subject: [PATCH 0066/1557] Partial compilation of package (only functions supported). Original commit: d62bc0743794db73a8e27aeb71bdc8fa0c3ecef8 --- .../org/jetbrains/jet/jps/build/KotlinBuilder.java | 7 ++++++- .../jetbrains/jet/jps/build/IncrementalJpsTest.kt | 4 ++++ .../incremental/topLevelMembersInTwoPackages/a.kt | 9 +++++++++ .../topLevelMembersInTwoPackages/a.kt.new | 9 +++++++++ .../incremental/topLevelMembersInTwoPackages/b.kt | 9 +++++++++ .../topLevelMembersInTwoPackages/build.log | 12 ++++++++++++ 6 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt create mode 100644 jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt create mode 100644 jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index dfa5db0a8ae..2b6607c95df 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -191,6 +191,10 @@ public class KotlinBuilder extends ModuleLevelBuilder { } for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { + // TODO this is a hack: we don't remove + if (outputItem.getOutputFile().getName().endsWith("Package.class")) { + continue; + } BuildTarget target = null; Collection sourceFiles = outputItem.getSourceFiles(); if (sourceFiles != null && !sourceFiles.isEmpty()) { @@ -200,7 +204,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { messageCollector.report(EXCEPTION, "KotlinBuilder: outputItem.sourceFiles is null or empty, outputItem = " + outputItem, NO_LOCATION); } - outputConsumer.registerOutputFile(target != null ? target : representativeTarget, outputItem.getOutputFile(), paths(sourceFiles)); + outputConsumer.registerOutputFile(target != null ? target : representativeTarget, outputItem.getOutputFile(), + paths(sourceFiles)); } // TODO should mark dependencies as dirty, as well diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index 0823675e211..1e3f934f02c 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -98,6 +98,10 @@ public class IncrementalJpsTest : JpsBuildTestCase() { doTest() } + fun testTopLevelMembersInTwoPackages() { + doTest() + } + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt new file mode 100644 index 00000000000..0aae67fb7fd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt @@ -0,0 +1,9 @@ +package test + +fun foo() { + bar(5) + baz() +} + +fun baz() { +} diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new new file mode 100644 index 00000000000..5e5e3542b2c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new @@ -0,0 +1,9 @@ +package test + +fun foo() { + bar(4) + baz() +} + +fun baz() { +} diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt new file mode 100644 index 00000000000..0790fb178f1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt @@ -0,0 +1,9 @@ +package test + +fun bar(i: Int): String { + return "$i ${quux()} $i" +} + +fun quux(): String { + return "quux" +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log new file mode 100644 index 00000000000..37736142dc4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log @@ -0,0 +1,12 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +End of files +Compiling files: +src/a.kt +End of files +Cleaning output files: +out/production/module/test/TestPackage-b-*.class +End of files +Compiling files: +src/b.kt +End of files From 06cb6eb030bb890c6e8f79375f4e558be398a6e4 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 19 Feb 2014 22:17:32 +0400 Subject: [PATCH 0067/1557] Supported properties in partial compilation of package. Original commit: 733de56178a4bbf817f0e34456040c76d3174592 --- .../build/AbstractKotlinJpsBuildTestCase.java | 12 +++++++++--- .../jet/jps/build/IncrementalJpsTest.kt | 1 + .../topLevelMembersInTwoPackages/a.kt | 3 +++ .../topLevelMembersInTwoPackages/a.kt.new | 3 +++ .../topLevelMembersInTwoPackages/b.kt | 17 ++++++++++++++++- 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index eb7ddb5a7f6..33709bc39dc 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -17,10 +17,12 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.io.FileUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.builders.JpsBuildTestCase; import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.JpsModuleRootModificationUtil; +import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.java.JpsAnnotationRootType; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaLibraryType; @@ -76,11 +78,15 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { } protected JpsLibrary addKotlinRuntimeDependency() { - return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, myProject.getModules(), false); + return addKotlinRuntimeDependency(myProject); } - protected JpsLibrary addKotlinRuntimeDependency(JpsJavaDependencyScope type, Collection modules, boolean exported) { - JpsLibrary library = myProject.addLibrary("kotlin-runtime", JpsJavaLibraryType.INSTANCE); + static JpsLibrary addKotlinRuntimeDependency(@NotNull JpsProject project) { + return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); + } + + protected static JpsLibrary addKotlinRuntimeDependency(JpsJavaDependencyScope type, Collection modules, boolean exported) { + JpsLibrary library = modules.iterator().next().getProject().addLibrary("kotlin-runtime", JpsJavaLibraryType.INSTANCE); File runtime = PathUtil.getKotlinPathsForDistDirectory().getRuntimePath(); library.addRoot(runtime, JpsOrderRootType.COMPILED); for (JpsModule module : modules) { diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index 1e3f934f02c..f0b321e7b19 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -65,6 +65,7 @@ public class IncrementalJpsTest : JpsBuildTestCase() { private fun doTest() { addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) + AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject!!) buildGetLog() diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt index 0aae67fb7fd..82c07232354 100644 --- a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt @@ -7,3 +7,6 @@ fun foo() { fun baz() { } + +val prop1 = "" +val prop2 = prop1 diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new index 5e5e3542b2c..d03b1414762 100644 --- a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new @@ -7,3 +7,6 @@ fun foo() { fun baz() { } + +val prop1 = "" +val prop2 = prop1 diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt index 0790fb178f1..1580ba620dc 100644 --- a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt @@ -1,9 +1,24 @@ package test fun bar(i: Int): String { + simpleVar = ":) " + simpleVar + return "$i ${quux()} $i" } fun quux(): String { return "quux" -} \ No newline at end of file +} + +var simpleVar = prop1 + +var fieldlessVar: String + get() = "" + set(value) {} + +deprecated("") +val fieldlessValWithAnnotation: String + get() = "" + +var delegated: String by kotlin.properties.Delegates.notNull() + From d1a14f1d7827140ad548937beeb10c577836ebb2 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 11 Mar 2014 23:56:50 +0400 Subject: [PATCH 0068/1557] Added incremental compilation flag. For publishing intermediate implementation. Original commit: a502374a62d2f90a76c46123f63657acb35d64e3 --- .../jet/jps/build/KotlinBuilder.java | 31 ++++++++++++------- .../KotlinBuilderModuleScriptGenerator.java | 7 ++++- .../jet/jps/build/IncrementalJpsTest.kt | 5 +++ 3 files changed, 31 insertions(+), 12 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 2b6607c95df..c99ce3f55c9 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.jps.build; +import com.google.common.collect.Maps; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -35,6 +36,7 @@ import org.jetbrains.jet.compiler.runner.CompilerEnvironment; import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants; import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.compiler.runner.SimpleOutputItem; +import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; @@ -191,9 +193,11 @@ public class KotlinBuilder extends ModuleLevelBuilder { } for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { - // TODO this is a hack: we don't remove - if (outputItem.getOutputFile().getName().endsWith("Package.class")) { - continue; + if (IncrementalCompilation.ENABLED) { + // TODO this is a hack: we don't remove + if (outputItem.getOutputFile().getName().endsWith("Package.class")) { + continue; + } } BuildTarget target = null; Collection sourceFiles = outputItem.getSourceFiles(); @@ -208,14 +212,19 @@ public class KotlinBuilder extends ModuleLevelBuilder { paths(sourceFiles)); } - // TODO should mark dependencies as dirty, as well - FSOperations.markDirty(context, chunk, new FileFilter() { - @Override - public boolean accept(@NotNull File file) { - return !allCompiledFiles.contains(file); - } - }); - return ExitCode.ADDITIONAL_PASS_REQUIRED; + if (IncrementalCompilation.ENABLED) { + // TODO should mark dependencies as dirty, as well + FSOperations.markDirty(context, chunk, new FileFilter() { + @Override + public boolean accept(@NotNull File file) { + return !allCompiledFiles.contains(file); + } + }); + return ExitCode.ADDITIONAL_PASS_REQUIRED; + } + else { + return ExitCode.OK; + } } private static Set getAllCompiledFilesContainer(CompileContext context) { diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index b77ce9de3d5..ae00121e279 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -23,6 +23,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilderFactory; import org.jetbrains.jet.compiler.runner.KotlinModuleXmlBuilderFactory; +import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; @@ -56,7 +57,7 @@ public class KotlinBuilderModuleScriptGenerator { public static File generateModuleDescription( CompileContext context, ModuleChunk chunk, - List sourceFiles + List sourceFiles // ignored for non-incremental compilation ) throws IOException { @@ -72,6 +73,10 @@ public class KotlinBuilderModuleScriptGenerator { for (ModuleBuildTarget target : chunk.getTargets()) { File outputDir = getOutputDir(target); + if (!IncrementalCompilation.ENABLED) { + sourceFiles = new ArrayList(KotlinSourceFileCollector.getAllKotlinSourceFiles(target)); + } + if (sourceFiles.size() > 0) { noSources = false; diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index f0b321e7b19..26b23e69b33 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -28,6 +28,7 @@ import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil import com.intellij.testFramework.UsefulTestCase +import org.jetbrains.jet.config.IncrementalCompilation public class IncrementalJpsTest : JpsBuildTestCase() { private val testDataDir: File @@ -64,6 +65,10 @@ public class IncrementalJpsTest : JpsBuildTestCase() { } private fun doTest() { + if (!IncrementalCompilation.ENABLED) { + return + } + addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject!!) From dfc72a87847530154967154266db1467a9449635 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Thu, 27 Mar 2014 19:43:20 +0400 Subject: [PATCH 0069/1557] Render file name and position in errors from JS library stubs Original commit: bcc684383581142060f76317e1111c9c2bd29030 --- .../org/jetbrains/jet/jps/build/KotlinBuilder.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index c99ce3f55c9..ae45d220ab5 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.jps.build; -import com.google.common.collect.Maps; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -288,7 +287,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { context.processMessage(new CompilerMessage( CompilerRunnerConstants.KOTLIN_COMPILER_NAME, kind(severity), - prefix + message, + prefix + message + renderLocationIfNeeded(location), location.getPath(), -1, -1, -1, location.getLine(), @@ -296,6 +295,16 @@ public class KotlinBuilder extends ModuleLevelBuilder { )); } + private static String renderLocationIfNeeded(@NotNull CompilerMessageLocation location) { + if (location == NO_LOCATION) return ""; + + // Sometimes we report errors in JavaScript library stubs, i.e. files like core/javautil.kt + // IDEA can't find these files, and does not display paths in Messages View, so we add the position information + // to the error message itself: + String pathname = String.valueOf(location.getPath()); + return new File(pathname).exists() ? "" : " (" + location + ")"; + } + @NotNull private static BuildMessage.Kind kind(@NotNull CompilerMessageSeverity severity) { switch (severity) { From 133413be570d629e61082d76ef796d509f90860b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 25 Mar 2014 17:44:58 +0400 Subject: [PATCH 0070/1557] Update to idea 135.666 EAP with asm5 library Original commit: 95fd8709885d6d3d0d7c2a061973689c1f5381ee --- .../test/org/jetbrains/jet/jps/build/classFilesComparison.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index 6af1c8a34d2..d5cf4a3667e 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -18,9 +18,9 @@ package org.jetbrains.jet.jps.build import java.io.File import org.junit.Assert.* -import org.jetbrains.asm4.util.TraceClassVisitor +import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor import java.io.PrintWriter -import org.jetbrains.asm4.ClassReader +import org.jetbrains.org.objectweb.asm.ClassReader import java.io.StringWriter import org.jetbrains.jet.utils.Printer import com.google.common.io.Files From db8def641df55b2ecb1d975b22a6c7261e81a2da Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 14 May 2014 15:01:04 +0400 Subject: [PATCH 0071/1557] Guard loading top-level classes with a check that they are not Kotlin binaries Original commit: 291741754b3dcb98352968f94589ed5d51a85f6e --- .../jet/jps/build/SimpleKotlinJpsBuildTest.kt | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt index 651fcebdffc..1adc05168c3 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/SimpleKotlinJpsBuildTest.kt @@ -71,4 +71,39 @@ public class SimpleKotlinJpsBuildTest : JpsBuildTestCase() { rebuildAll() } + + public fun testLoadingKotlinFromDifferentModules() { + val aFile = createFile("m1/K.kt", + """ + package m1; + + trait K { + } + """) + createFile("m1/J.java", + """ + package m1; + + public interface J { + K bar(); + } + """) + val a = addModule("m1", PathUtil.getParentPath(aFile)) + + val bFile = createFile("m2/m2.kt", + """ + import m1.J; + import m1.K; + + trait M2: J { + override fun bar(): K + } + """) + val b = addModule("b", PathUtil.getParentPath(bFile)) + JpsJavaExtensionService.getInstance().getOrCreateDependencyExtension( + b.getDependenciesList().addModuleDependency(a) + ).setExported(false) + + rebuildAll() + } } From 178d7793e9325b99b74d5eabe383cb7f66af5785 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Jun 2014 21:50:06 +0400 Subject: [PATCH 0072/1557] Renamed and refactored test. Original commit: ad8affe07c2fdea7202dfffd2ee29b30892000ad --- .../jet/jps/build/KotlinJpsBuildTest.java | 41 ++++++++++++------- .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../module2/module2.iml | 0 .../module2/src/JSecond.java | 0 .../module2/src/kt1.kt | 0 .../src/JFirst.java | 0 .../src/kt2.kt | 0 8 files changed, 26 insertions(+), 15 deletions(-) rename jps/jps-plugin/testData/general/{CircularDependenciesWithKotlinFilesDifferentPackages => CircularDependenciesDifferentPackages}/kotlinProject.iml (100%) rename jps/jps-plugin/testData/general/{CircularDependenciesWithKotlinFilesDifferentPackages => CircularDependenciesDifferentPackages}/kotlinProject.ipr (100%) rename jps/jps-plugin/testData/general/{CircularDependenciesWithKotlinFilesDifferentPackages => CircularDependenciesDifferentPackages}/module2/module2.iml (100%) rename jps/jps-plugin/testData/general/{CircularDependenciesWithKotlinFilesDifferentPackages => CircularDependenciesDifferentPackages}/module2/src/JSecond.java (100%) rename jps/jps-plugin/testData/general/{CircularDependenciesWithKotlinFilesDifferentPackages => CircularDependenciesDifferentPackages}/module2/src/kt1.kt (100%) rename jps/jps-plugin/testData/general/{CircularDependenciesWithKotlinFilesDifferentPackages => CircularDependenciesDifferentPackages}/src/JFirst.java (100%) rename jps/jps-plugin/testData/general/{CircularDependenciesWithKotlinFilesDifferentPackages => CircularDependenciesDifferentPackages}/src/kt2.kt (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index e4b717829c4..b96c5356fbb 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -21,6 +21,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.codegen.PackageCodegen; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jps.builders.BuildResult; @@ -189,19 +190,14 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { doTest(); } - public void testCircularDependenciesWithKotlinFilesDifferentPackages() { + public void testCircularDependenciesDifferentPackages() { initProject(); BuildResult result = makeAll(); // Check that outputs are located properly - for (JpsModule module : myProject.getModules()) { - if (module.getName().equals("module2")) { - assertFilesExistInOutput(module, "kt1/Kt1Package.class"); - } - if (module.getName().equals("kotlinProject")) { - assertFilesExistInOutput(module, "kt2/Kt2Package.class"); - } - } + assertFilesExistInOutput(findModule("module2"), "kt1/Kt1Package.class"); + assertFilesExistInOutput(findModule("kotlinProject"), "kt2/Kt2Package.class"); + result.assertSuccessful(); checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/kt2.kt", "kt2.Kt2Package"); @@ -216,16 +212,24 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { public boolean value(JpsModule module) { return module.getName().equals("module2"); } - }), true); + }), true + ); makeAll().assertSuccessful(); } + @NotNull + private JpsModule findModule(@NotNull String name) { + for (JpsModule module : myProject.getModules()) { + if (module.getName().equals(name)) { + return module; + } + } + throw new IllegalStateException("Couldn't find module " + name); + } + private static void assertFilesExistInOutput(JpsModule module, String... relativePaths) { - String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false); - assertNotNull(outputUrl); - File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); for (String path : relativePaths) { - File outputFile = new File(outputDir, path); + File outputFile = findFileInOutputDir(module, path); assertTrue("Output not written: " + outputFile.getAbsolutePath() + "\n Directory contents: \n" + @@ -234,6 +238,13 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { } } + private static File findFileInOutputDir(JpsModule module, String relativePath) { + String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false); + assertNotNull(outputUrl); + File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); + return new File(outputDir, relativePath); + } + private void checkExcludesNotAffectedToOutput(String module, String... excludeRelativePaths) { for (String path : excludeRelativePaths) { checkClassesDeletedFromOutputWhen(Operation.CHANGE, module, path, NOTHING); @@ -246,7 +257,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); for (String path : relativePaths) { File outputFile = new File(outputDir, path); - assertFalse("Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"", + assertFalse("Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"", outputFile.exists()); } } diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml b/jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/kotlinProject.iml similarity index 100% rename from jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.iml rename to jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/kotlinProject.iml diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr b/jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/kotlinProject.ipr similarity index 100% rename from jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/kotlinProject.ipr rename to jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/kotlinProject.ipr diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/module2/module2.iml similarity index 100% rename from jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/module2.iml rename to jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/module2/module2.iml diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java b/jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/module2/src/JSecond.java similarity index 100% rename from jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/JSecond.java rename to jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/module2/src/JSecond.java diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt b/jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/module2/src/kt1.kt similarity index 100% rename from jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/module2/src/kt1.kt rename to jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/module2/src/kt1.kt diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java b/jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/src/JFirst.java similarity index 100% rename from jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/JFirst.java rename to jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/src/JFirst.java diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt b/jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/src/kt2.kt similarity index 100% rename from jps/jps-plugin/testData/general/CircularDependenciesWithKotlinFilesDifferentPackages/src/kt2.kt rename to jps/jps-plugin/testData/general/CircularDependenciesDifferentPackages/src/kt2.kt From 292a3ca2054168ed2ae5bb1d7e3c9c66c7753765 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Jun 2014 21:51:46 +0400 Subject: [PATCH 0073/1557] Corrected and simplified compilation of module chunk. Original commit: 601a691e18f3d454bdb5122c811a9efd541d28b9 --- .../jet/jps/build/KotlinJpsBuildTest.java | 34 +++++++++++++++++++ .../kotlinProject.ipr | 32 +++++++++++++++++ .../module1/module1.iml | 14 ++++++++ .../module1/src/a.kt | 7 ++++ .../module2/module2.iml | 14 ++++++++ .../module2/src/b.kt | 7 ++++ 6 files changed, 108 insertions(+) create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackage/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index b96c5356fbb..ac2b7d2e6c5 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -29,9 +29,15 @@ import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaExtensionService; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.org.objectweb.asm.ClassReader; +import org.jetbrains.org.objectweb.asm.ClassVisitor; +import org.jetbrains.org.objectweb.asm.MethodVisitor; +import org.jetbrains.org.objectweb.asm.Opcodes; import java.io.File; import java.io.IOException; +import java.util.Set; +import java.util.TreeSet; public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final String PROJECT_NAME = "kotlinProject"; @@ -204,6 +210,34 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module2", "module2/src/kt1.kt", "kt1.Kt1Package"); } + public void testCircularDependenciesSamePackage() throws IOException { + initProject(); + BuildResult result = makeAll(); + result.assertSuccessful(); + + // Check that outputs are located properly + File facadeWithA = findFileInOutputDir(findModule("module1"), "test/TestPackage.class"); + File facadeWithB = findFileInOutputDir(findModule("module2"), "test/TestPackage.class"); + assertSameElements(getMethodsOfClass(facadeWithA), "a", "getA"); + assertSameElements(getMethodsOfClass(facadeWithB), "b", "getB", "setB"); + + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module1", "module1/src/a.kt", "test.TestPackage"); + checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module2", "module2/src/b.kt", "test.TestPackage"); + } + + @NotNull + private static Set getMethodsOfClass(@NotNull File classFile) throws IOException { + final Set result = new TreeSet(); + new ClassReader(FileUtil.loadFileBytes(classFile)).accept(new ClassVisitor(Opcodes.ASM5) { + @Override + public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { + result.add(name); + return null; + } + }, 0); + return result; + } + public void testReexportedDependency() { initProject(); addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/kotlinProject.ipr b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/module1.iml b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/module1.iml new file mode 100644 index 00000000000..b86ce213a79 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/module1.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt new file mode 100644 index 00000000000..4987d3f36ec --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt @@ -0,0 +1,7 @@ +package test + +fun a() { + +} + +val a = "" \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/module2.iml new file mode 100644 index 00000000000..ecdc9e147ae --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt new file mode 100644 index 00000000000..1dcef1df913 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt @@ -0,0 +1,7 @@ +package test + +fun b() { + +} + +var b = "" \ No newline at end of file From 7e115bd4406310283bd2691d05c87b3044ed99a8 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 4 Jun 2014 19:25:59 +0400 Subject: [PATCH 0074/1557] Saving module XMLs in temp directory instead of output. Original commit: 3a2a3e7cd51e6b48d24adf94927e247c9d48d816 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 1 + .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index ae45d220ab5..d5ef4398b14 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -179,6 +179,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector); + moduleFile.delete(); } // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index ae00121e279..0ae30acd43f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -16,7 +16,9 @@ package org.jetbrains.jet.jps.build; +import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -98,7 +100,9 @@ public class KotlinBuilderModuleScriptGenerator { if (noSources) return null; - File scriptFile = new File(getOutputDir(chunk.representativeTarget()), "script." + FACTORY.getFileExtension()); + String scriptFilename = context.getProjectDescriptor().dataManager.getDataPaths().getDataStorageRoot().getName() + + "#" + StringUtil.sanitizeJavaIdentifier(chunk.getName()); + File scriptFile = new File(PathManager.getTempPath() + File.separator + scriptFilename + ".script." + FACTORY.getFileExtension()); writeScriptToFile(context, builder.asText(), scriptFile); From 9676e8327d34c9bef19568e9b218e0649a0f71cd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 5 Jun 2014 18:11:41 +0400 Subject: [PATCH 0075/1557] Don't report Kotlin JPS versions for modules without Kotlin. Original commit: 2568bf609111ab784a0608b3c161df9ab4b439d9 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index d5ef4398b14..b0410f9e7e0 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -99,7 +99,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION); + if (hasKotlinFiles(chunk)) { + messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION); + } ModuleBuildTarget representativeTarget = chunk.representativeTarget(); From 6a0e54896d8d32f7318d1f2e53e53e345aa48d7a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 11 Apr 2014 20:44:59 +0400 Subject: [PATCH 0076/1557] Extracted PackagePartClassUtils. Original commit: 381e8bb2055b3123faa10ad04b2d0c3148cddaba --- .../org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index ac2b7d2e6c5..e78331d65bf 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -22,7 +22,9 @@ import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.codegen.AsmUtil; import org.jetbrains.jet.codegen.PackageCodegen; +import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; @@ -368,7 +370,9 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { return super.getPath().substring(1); } }; - return PackageCodegen.getPackagePartType(new FqName(packageClassFqName), fakeVirtualFile).getInternalName(); + + FqName packagePartFqName = PackagePartClassUtils.getPackagePartFqName(new FqName(packageClassFqName), fakeVirtualFile); + return AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName); } private static enum Operation { From e6366e41e48085b45581e016254c25dc2d248a9d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 16 Jun 2014 22:45:22 +0400 Subject: [PATCH 0077/1557] KT-5244 Crash from Kotlin JPS plugin when creating module script #KT-5244 fixed Original commit: 976d5df1ebcbe9a185f7f8898e734983e26b5fc5 --- .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 0ae30acd43f..be296f8b5d9 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.jps.build; -import com.intellij.openapi.application.PathManager; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; @@ -100,9 +99,7 @@ public class KotlinBuilderModuleScriptGenerator { if (noSources) return null; - String scriptFilename = context.getProjectDescriptor().dataManager.getDataPaths().getDataStorageRoot().getName() - + "#" + StringUtil.sanitizeJavaIdentifier(chunk.getName()); - File scriptFile = new File(PathManager.getTempPath() + File.separator + scriptFilename + ".script." + FACTORY.getFileExtension()); + File scriptFile = File.createTempFile("kjps", StringUtil.sanitizeJavaIdentifier(chunk.getName()) + ".script.xml"); writeScriptToFile(context, builder.asText(), scriptFile); From 2eb051dbc21eac75d5f67e955fcd6f921b6840b6 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 14 May 2014 20:39:15 +0400 Subject: [PATCH 0078/1557] Loading descriptors from incremental cache instead of package classes. Original commit: ca1ee69e4cd784a44a0f894bd00c8a457dfb573b --- jps/jps-plugin/jps-plugin.iml | 4 +- .../jet/jps/build/KotlinBuilder.java | 64 +++++++++++-------- .../KotlinBuilderModuleScriptGenerator.java | 5 ++ .../topLevelMembersInTwoPackages/build.log | 2 + 4 files changed, 46 insertions(+), 29 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 1b4d326d32d..a7f222b8c6d 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -15,8 +15,8 @@ - - + + diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index b0410f9e7e0..801220bb004 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -37,6 +37,7 @@ import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.compiler.runner.SimpleOutputItem; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; +import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.BuildTarget; @@ -194,38 +195,47 @@ public class KotlinBuilder extends ModuleLevelBuilder { } } - for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { - if (IncrementalCompilation.ENABLED) { - // TODO this is a hack: we don't remove - if (outputItem.getOutputFile().getName().endsWith("Package.class")) { - continue; + IncrementalCache cache = new IncrementalCache(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); + + try { + for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { + BuildTarget target = null; + Collection sourceFiles = outputItem.getSourceFiles(); + if (sourceFiles != null && !sourceFiles.isEmpty()) { + target = sourceToTarget.get(sourceFiles.iterator().next()); } + else { + messageCollector.report(EXCEPTION, "KotlinBuilder: outputItem.sourceFiles is null or empty, outputItem = " + outputItem, NO_LOCATION); + } + + if (target == null) { + target = representativeTarget; + } + + File outputFile = outputItem.getOutputFile(); + + if (IncrementalCompilation.ENABLED) { + cache.saveFileToCache(target.getId(), outputFile); + } + + outputConsumer.registerOutputFile(target, outputFile, paths(sourceFiles)); } - BuildTarget target = null; - Collection sourceFiles = outputItem.getSourceFiles(); - if (sourceFiles != null && !sourceFiles.isEmpty()) { - target = sourceToTarget.get(sourceFiles.iterator().next()); + + if (IncrementalCompilation.ENABLED) { + // TODO should mark dependencies as dirty, as well + FSOperations.markDirty(context, chunk, new FileFilter() { + @Override + public boolean accept(@NotNull File file) { + return !allCompiledFiles.contains(file); + } + }); + return ExitCode.ADDITIONAL_PASS_REQUIRED; } else { - messageCollector.report(EXCEPTION, "KotlinBuilder: outputItem.sourceFiles is null or empty, outputItem = " + outputItem, NO_LOCATION); + return ExitCode.OK; } - - outputConsumer.registerOutputFile(target != null ? target : representativeTarget, outputItem.getOutputFile(), - paths(sourceFiles)); - } - - if (IncrementalCompilation.ENABLED) { - // TODO should mark dependencies as dirty, as well - FSOperations.markDirty(context, chunk, new FileFilter() { - @Override - public boolean accept(@NotNull File file) { - return !allCompiledFiles.contains(file); - } - }); - return ExitCode.ADDITIONAL_PASS_REQUIRED; - } - else { - return ExitCode.OK; + } finally { + cache.close(); } } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 0ae30acd43f..0adc2694d14 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -90,6 +90,7 @@ public class KotlinBuilderModuleScriptGenerator { builder.addModule( target.getId(), outputDir.getAbsolutePath(), + getIncrementalCacheDir(context).getAbsolutePath(), getKotlinModuleDependencies(context, target), sourceFiles, target.isTests(), @@ -109,6 +110,10 @@ public class KotlinBuilderModuleScriptGenerator { return scriptFile; } + public static File getIncrementalCacheDir(CompileContext context) { + return new File(context.getProjectDescriptor().dataManager.getDataPaths().getDataStorageRoot(), "kotlin"); + } + @NotNull private static File getOutputDir(@NotNull ModuleBuildTarget target) { File outputDir = target.getOutputDir(); diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log index 37736142dc4..08cb50b84f3 100644 --- a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log @@ -1,11 +1,13 @@ Cleaning output files: out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt From 0188b0294652fdab793a8e85401cfd02e0eebc5a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 15 May 2014 16:47:52 +0400 Subject: [PATCH 0079/1557] Rebuild only if proto changed. Original commit: 018b58b51fe0c3068f31ff3d4de906b1367e9b46 --- .../jet/jps/build/KotlinBuilder.java | 23 ++++++++++++------- .../jet/jps/build/IncrementalJpsTest.kt | 8 +++++++ .../incremental/independentClasses/build.log | 8 +------ .../incremental/returnTypeChanged/build.log | 14 +++++++++++ .../incremental/returnTypeChanged/fun.kt | 4 ++++ .../incremental/returnTypeChanged/fun.kt.new | 3 +++ .../incremental/returnTypeChanged/usage.kt | 5 ++++ .../simpleClassDependency/build.log | 6 ----- .../topLevelFunctionSameSignature/build.log | 7 ++++++ .../topLevelFunctionSameSignature/fun.kt | 4 ++++ .../topLevelFunctionSameSignature/fun.kt.new | 5 ++++ .../topLevelFunctionSameSignature/usage.kt | 5 ++++ .../topLevelMembersInTwoPackages/build.log | 9 +------- 13 files changed, 72 insertions(+), 29 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/returnTypeChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/returnTypeChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/build.log create mode 100644 jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/usage.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 801220bb004..3469225ec74 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -198,6 +198,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { IncrementalCache cache = new IncrementalCache(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); try { + boolean significantChanges = false; + for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { BuildTarget target = null; Collection sourceFiles = outputItem.getSourceFiles(); @@ -215,7 +217,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputFile = outputItem.getOutputFile(); if (IncrementalCompilation.ENABLED) { - cache.saveFileToCache(target.getId(), outputFile); + if (cache.saveFileToCache(target.getId(), outputFile)) { + significantChanges = true; + } } outputConsumer.registerOutputFile(target, outputFile, paths(sourceFiles)); @@ -223,18 +227,21 @@ public class KotlinBuilder extends ModuleLevelBuilder { if (IncrementalCompilation.ENABLED) { // TODO should mark dependencies as dirty, as well - FSOperations.markDirty(context, chunk, new FileFilter() { - @Override - public boolean accept(@NotNull File file) { - return !allCompiledFiles.contains(file); - } - }); + if (significantChanges) { + FSOperations.markDirty(context, chunk, new FileFilter() { + @Override + public boolean accept(@NotNull File file) { + return !allCompiledFiles.contains(file); + } + }); + } return ExitCode.ADDITIONAL_PASS_REQUIRED; } else { return ExitCode.OK; } - } finally { + } + finally { cache.close(); } } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index 26b23e69b33..b456e666d29 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -108,6 +108,14 @@ public class IncrementalJpsTest : JpsBuildTestCase() { doTest() } + fun testReturnTypeChanged() { + doTest() + } + + fun testTopLevelFunctionSameSignature() { + doTest() + } + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String diff --git a/jps/jps-plugin/testData/incremental/independentClasses/build.log b/jps/jps-plugin/testData/incremental/independentClasses/build.log index 0d52aa1b838..b33bb4d2a49 100644 --- a/jps/jps-plugin/testData/incremental/independentClasses/build.log +++ b/jps/jps-plugin/testData/incremental/independentClasses/build.log @@ -3,10 +3,4 @@ out/production/module/test/Foo.class End of files Compiling files: src/Foo.kt -End of files -Cleaning output files: -out/production/module/test/Bar.class -End of files -Compiling files: -src/Bar.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/returnTypeChanged/build.log new file mode 100644 index 00000000000..22b74887df0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/returnTypeChanged/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/TestPackage-fun-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files +Cleaning output files: +out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt b/jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt new file mode 100644 index 00000000000..8387e08ec93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt @@ -0,0 +1,4 @@ +package test + +fun foo() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt.new b/jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt.new new file mode 100644 index 00000000000..059cb5d8478 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt.new @@ -0,0 +1,3 @@ +package test + +fun foo(): String = ":)" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/returnTypeChanged/usage.kt b/jps/jps-plugin/testData/incremental/returnTypeChanged/usage.kt new file mode 100644 index 00000000000..ce711cd81b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/returnTypeChanged/usage.kt @@ -0,0 +1,5 @@ +package test + +fun usage() { + foo() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/build.log b/jps/jps-plugin/testData/incremental/simpleClassDependency/build.log index 6c95f57482f..2cfeb2be275 100644 --- a/jps/jps-plugin/testData/incremental/simpleClassDependency/build.log +++ b/jps/jps-plugin/testData/incremental/simpleClassDependency/build.log @@ -4,10 +4,4 @@ out/production/module/test/Foo.class End of files Compiling files: src/Foo.kt -End of files -Cleaning output files: -out/production/module/test/Bar.class -End of files -Compiling files: -src/Bar.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/build.log new file mode 100644 index 00000000000..4a956843b6d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage-fun-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt b/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt new file mode 100644 index 00000000000..8387e08ec93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt @@ -0,0 +1,4 @@ +package test + +fun foo() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt.new new file mode 100644 index 00000000000..9c3c1518d9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt.new @@ -0,0 +1,5 @@ +package test + +fun foo() { + println("body is changed, but it doesn't matter, we won't rebuild dependencies") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/usage.kt b/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/usage.kt new file mode 100644 index 00000000000..ce711cd81b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/usage.kt @@ -0,0 +1,5 @@ +package test + +fun usage() { + foo() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log index 08cb50b84f3..6e7a5e35e00 100644 --- a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log +++ b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log @@ -4,11 +4,4 @@ out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files -Cleaning output files: -out/production/module/test/TestPackage-b-*.class -out/production/module/test/TestPackage.class -End of files -Compiling files: -src/b.kt -End of files +End of files \ No newline at end of file From 375354e5eeff5f7ef94c7645b7313f51db3abc85 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 16 May 2014 23:06:46 +0400 Subject: [PATCH 0080/1557] Checking for changes in class proto. Original commit: c4e167d7bc67b268e021f45261cb1abe34d33496 --- .../jetbrains/jet/jps/build/IncrementalJpsTest.kt | 6 +++++- .../incremental/classSignatureChanged/build.log | 13 +++++++++++++ .../incremental/classSignatureChanged/class.kt | 5 +++++ .../incremental/classSignatureChanged/class.kt.new | 5 +++++ .../incremental/classSignatureChanged/usage.kt | 5 +++++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/classSignatureChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt create mode 100644 jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classSignatureChanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index b456e666d29..6b47071ae27 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -116,6 +116,10 @@ public class IncrementalJpsTest : JpsBuildTestCase() { doTest() } + fun testClassSignatureChanged() { + doTest() + } + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String @@ -127,7 +131,7 @@ public class IncrementalJpsTest : JpsBuildTestCase() { fun String.replaceHashWithStar(): String { val lastHyphen = this.lastIndexOf('-') - if (lastHyphen != -1 && substring(lastHyphen + 1).matches("[0-9a-f]{8}\\.class")) { + if (lastHyphen != -1 && substring(lastHyphen + 1).matches("[0-9a-f]{1,8}\\.class")) { return substring(0, lastHyphen) + "-*.class" } return this diff --git a/jps/jps-plugin/testData/incremental/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/classSignatureChanged/build.log new file mode 100644 index 00000000000..03df388cc2b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classSignatureChanged/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/test/Klass.class +End of files +Compiling files: +src/class.kt +End of files +Cleaning output files: +out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt b/jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt new file mode 100644 index 00000000000..207a0d6ff20 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt @@ -0,0 +1,5 @@ +package test + +class Klass { + fun foo() = ":)" +} diff --git a/jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt.new b/jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt.new new file mode 100644 index 00000000000..7100d314c78 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt.new @@ -0,0 +1,5 @@ +package test + +class Klass { + fun foo() = 123 +} diff --git a/jps/jps-plugin/testData/incremental/classSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/classSignatureChanged/usage.kt new file mode 100644 index 00000000000..316732663ce --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classSignatureChanged/usage.kt @@ -0,0 +1,5 @@ +package test + +fun usage(a: Klass) { + a.foo() +} From a36e100d01cfcfb9127f6f2e891c34f50375cd66 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 21 May 2014 22:21:35 +0400 Subject: [PATCH 0081/1557] Checking for constants values in incremental compiler. Original commit: e89b59a74589682fd594e2d0e79bd5842151d049 --- .../jetbrains/jet/jps/build/IncrementalJpsTest.kt | 10 ++++++++-- .../incremental/constantUnchanged/build.log | 7 +++++++ .../testData/incremental/constantUnchanged/const.kt | 3 +++ .../incremental/constantUnchanged/const.kt.new | 3 +++ .../testData/incremental/constantUnchanged/usage.kt | 4 ++++ .../testData/incremental/constantValue/build.log | 13 +++++++++++++ .../testData/incremental/constantValue/const.kt | 3 +++ .../testData/incremental/constantValue/const.kt.new | 3 +++ .../testData/incremental/constantValue/usage.kt | 4 ++++ 9 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/constantUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/constantUnchanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/constantValue/build.log create mode 100644 jps/jps-plugin/testData/incremental/constantValue/const.kt create mode 100644 jps/jps-plugin/testData/incremental/constantValue/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/constantValue/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index 6b47071ae27..343e814fa96 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -16,13 +16,11 @@ package org.jetbrains.jet.jps.build -import org.jetbrains.ether.IncrementalTestCase import org.jetbrains.jps.builders.JpsBuildTestCase import kotlin.properties.Delegates import com.intellij.openapi.util.io.FileUtil import java.io.File import org.jetbrains.jps.builders.CompileScopeTestBuilder -import org.jetbrains.jps.builders.BuildResult import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.model.java.JpsJavaExtensionService @@ -120,6 +118,14 @@ public class IncrementalJpsTest : JpsBuildTestCase() { doTest() } + fun testConstantValue() { + doTest() + } + + fun testConstantUnchanged() { + doTest() + } + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/constantUnchanged/build.log new file mode 100644 index 00000000000..dad2c9128da --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantUnchanged/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/const.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt new file mode 100644 index 00000000000..1572968f89f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt @@ -0,0 +1,3 @@ +package test + +val CONST = "foo" diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new new file mode 100644 index 00000000000..1572968f89f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new @@ -0,0 +1,3 @@ +package test + +val CONST = "foo" diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt new file mode 100644 index 00000000000..cb0f4ce8687 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated(CONST + CONST) +class Usage diff --git a/jps/jps-plugin/testData/incremental/constantValue/build.log b/jps/jps-plugin/testData/incremental/constantValue/build.log new file mode 100644 index 00000000000..dbdb31fbbf0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantValue/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/test/Usage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/constantValue/const.kt b/jps/jps-plugin/testData/incremental/constantValue/const.kt new file mode 100644 index 00000000000..1572968f89f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantValue/const.kt @@ -0,0 +1,3 @@ +package test + +val CONST = "foo" diff --git a/jps/jps-plugin/testData/incremental/constantValue/const.kt.new b/jps/jps-plugin/testData/incremental/constantValue/const.kt.new new file mode 100644 index 00000000000..c94f1955d6d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantValue/const.kt.new @@ -0,0 +1,3 @@ +package test + +val CONST = "bar" diff --git a/jps/jps-plugin/testData/incremental/constantValue/usage.kt b/jps/jps-plugin/testData/incremental/constantValue/usage.kt new file mode 100644 index 00000000000..cb0f4ce8687 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantValue/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated(CONST + CONST) +class Usage From 48c842b9313e05d54b3eff711c74793c27b69a64 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 22 May 2014 12:32:56 +0400 Subject: [PATCH 0082/1557] Don't report package facade classes as output of sources without top-level members. Original commit: b9f01a6397e5cb5ab0d73e43a60b395ba139284d --- .../test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index e78331d65bf..92ed4cf7664 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -154,7 +154,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/main.kt", "foo.FooPackage"); checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/boo.kt", "boo.BooPackage"); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/Bar.kt", "foo.Bar", "foo.FooPackage"); + checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/Bar.kt", "foo.Bar"); checkPackageDeletedFromOutputWhen(Operation.DELETE, "kotlinProject", "src/main.kt", "foo.FooPackage"); assertFilesNotExistInOutput(module, "foo/FooPackage.class"); From cbffb4062a4bd4cf151fc2e112efa79beb0f9f4c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 28 May 2014 18:47:20 +0400 Subject: [PATCH 0083/1557] Supported multiple make iterations in incremental tests. Original commit: 2a9721daf364fa8bfd1ee6928d20223abc6c0508 --- .../jet/jps/build/IncrementalJpsTest.kt | 77 ++++++++++++++++--- 1 file changed, 68 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index 343e814fa96..8097ad37a89 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -27,6 +27,8 @@ import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil import com.intellij.testFramework.UsefulTestCase import org.jetbrains.jet.config.IncrementalCompilation +import java.util.ArrayList +import kotlin.test.fail public class IncrementalJpsTest : JpsBuildTestCase() { private val testDataDir: File @@ -62,26 +64,62 @@ public class IncrementalJpsTest : JpsBuildTestCase() { } } + private fun getModificationsToPerform(): List> { + + fun getModificationsForIteration(newSuffix: String, deleteSuffix: String): List { + val modifications = ArrayList() + for (file in testDataDir.listFiles()!!) { + if (file.getName().endsWith(newSuffix)) { + modifications.add(ModifyContent(file.getName().trimTrailing(newSuffix), file)) + } + if (file.getName().endsWith(deleteSuffix)) { + modifications.add(DeleteFile(file.getName().trimTrailing(deleteSuffix))) + } + } + return modifications + } + + val haveFilesWithoutNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)$") }?.isNotEmpty() ?: false + val haveFilesWithNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)\\.\\d+$") }?.isNotEmpty() ?: false + + if (haveFilesWithoutNumbers && haveFilesWithNumbers) { + fail("Bad test data format: no files ending with \".new\" or \".delete\" found") + } + if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { + fail("Bad test data format: files ending with both unnumbered and numbered \".new\"/\".delete\" were found") + } + + if (haveFilesWithoutNumbers) { + return listOf(getModificationsForIteration(".new", ".delete")) + } + else { + return (1..10) + .map { getModificationsForIteration(".new.$it", ".delete.$it") } + .filter { it.isNotEmpty() } + } + } + private fun doTest() { if (!IncrementalCompilation.ENABLED) { return } - addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) + addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject!!) buildGetLog() - FileUtil.processFilesRecursively(testDataDir, { - if (it!!.getName().endsWith(".new")) { - it.copyTo(File(workDir, "src/" + it.getName().trimTrailing(".new"))) - } + val modifications = getModificationsToPerform() + val logs = ArrayList() - true - }) + for (step in modifications) { + step.forEach { it.perform(workDir) } - val log = buildGetLog() - UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), log) + val log = buildGetLog() + logs.add(log) + } + + UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), logs.makeString("\n\n")) val outDir = File(getAbsolutePath("out")) val outAfterMake = File(getAbsolutePath("out-after-make")) @@ -146,4 +184,25 @@ public class IncrementalJpsTest : JpsBuildTestCase() { logBuf.append(message!!.trimLeading(rootPath + "/").replaceHashWithStar()).append('\n') } } + + private abstract class Modification(val name: String) { + abstract fun perform(workDir: File) + + override fun toString(): String = "${javaClass.getSimpleName()} $name" + } + + private class ModifyContent(name: String, val dataFile: File) : Modification(name) { + override fun perform(workDir: File) { + dataFile.copyTo(File(workDir, "src/$name")) + } + } + + private class DeleteFile(name: String) : Modification(name) { + override fun perform(workDir: File) { + val fileToDelete = File(workDir, "src/$name") + if (!fileToDelete.delete()) { + throw AssertionError("Couldn't delete $fileToDelete") + } + } + } } From 570e2c0a7ea0df11f101fdd7673c2330efd44592 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 28 May 2014 18:53:26 +0400 Subject: [PATCH 0084/1557] Added tests for removing files from package. Original commit: f62842343db597907b3b036b61947ff2e574f650 --- .../jet/jps/build/IncrementalJpsTest.kt | 20 +++++++++++++++ .../incremental/packageFileAdded/a.kt | 3 +++ .../incremental/packageFileAdded/b.kt.new | 3 +++ .../incremental/packageFileAdded/build.log | 10 ++++++++ .../packageFileChangedPackage/a.kt | 3 +++ .../packageFileChangedPackage/b.kt | 3 +++ .../packageFileChangedPackage/b.kt.new | 3 +++ .../packageFileChangedPackage/build.log | 14 +++++++++++ .../packageFileChangedThenOtherRemoved/a.kt | 3 +++ .../a.kt.new.1 | 3 +++ .../packageFileChangedThenOtherRemoved/b.kt | 3 +++ .../b.kt.delete.2 | 0 .../build.log | 22 ++++++++++++++++ .../incremental/packageFileRemoved/a.kt | 3 +++ .../incremental/packageFileRemoved/b.kt | 3 +++ .../packageFileRemoved/b.kt.delete.1 | 0 .../incremental/packageFileRemoved/build.log | 25 +++++++++++++++++++ .../incremental/packageFileRemoved/other.kt | 3 +++ .../packageFileRemoved/other.kt.new.2 | 3 +++ .../packageFilesChangedInTurn/a.kt | 3 +++ .../packageFilesChangedInTurn/a.kt.new.1 | 3 +++ .../packageFilesChangedInTurn/b.kt | 3 +++ .../packageFilesChangedInTurn/b.kt.new.2 | 3 +++ .../packageFilesChangedInTurn/build.log | 16 ++++++++++++ 24 files changed, 155 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/packageFileAdded/a.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/packageFileAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/packageFileRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt create mode 100644 jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt index 8097ad37a89..68b1abcd906 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt @@ -164,6 +164,26 @@ public class IncrementalJpsTest : JpsBuildTestCase() { doTest() } + fun testPackageFileAdded() { + doTest() + } + + fun testPackageFileRemoved() { + doTest() + } + + fun testPackageFilesChangedInTurn() { + doTest() + } + + fun testPackageFileChangedThenOtherRemoved() { + doTest() + } + + fun testPackageFileChangedPackage() { + doTest() + } + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/a.kt b/jps/jps-plugin/testData/incremental/packageFileAdded/a.kt new file mode 100644 index 00000000000..30ca24b5576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileAdded/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new b/jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new new file mode 100644 index 00000000000..5c782f47a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new @@ -0,0 +1,3 @@ +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/packageFileAdded/build.log new file mode 100644 index 00000000000..f729fb6d124 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileAdded/build.log @@ -0,0 +1,10 @@ +Compiling files: +src/b.kt +End of files +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt new file mode 100644 index 00000000000..30ca24b5576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt new file mode 100644 index 00000000000..5c782f47a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt @@ -0,0 +1,3 @@ +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new new file mode 100644 index 00000000000..7a4e3e2d245 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new @@ -0,0 +1,3 @@ +package newName + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log new file mode 100644 index 00000000000..076add162ad --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/b.kt +End of files +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt new file mode 100644 index 00000000000..30ca24b5576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1 b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1 new file mode 100644 index 00000000000..a36b6841040 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1 @@ -0,0 +1,3 @@ +package test + +fun a() = "aa" diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt new file mode 100644 index 00000000000..5c782f47a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt @@ -0,0 +1,3 @@ +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt.delete.2 b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log new file mode 100644 index 00000000000..cd5cce6af7e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log @@ -0,0 +1,22 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files + + +Cleaning output files: +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +End of files +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt b/jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt new file mode 100644 index 00000000000..30ca24b5576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt b/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt new file mode 100644 index 00000000000..5c782f47a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt @@ -0,0 +1,3 @@ +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt.delete.1 b/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/packageFileRemoved/build.log new file mode 100644 index 00000000000..7be687a676c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/build.log @@ -0,0 +1,25 @@ +Cleaning output files: +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +End of files +Cleaning output files: +out/production/module/other/OtherPackage-other-*.class +out/production/module/other/OtherPackage.class +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +src/other.kt +End of files + + +Cleaning output files: +out/production/module/other/OtherPackage-other-*.class +out/production/module/other/OtherPackage.class +End of files +Compiling files: +src/other.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt b/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt new file mode 100644 index 00000000000..0444e2a6b41 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt @@ -0,0 +1,3 @@ +package other + +fun imInOtherPackage() = ":)" diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2 b/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2 new file mode 100644 index 00000000000..7d0038f7762 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2 @@ -0,0 +1,3 @@ +package other + +fun imInOtherPackage() = ":))" diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt new file mode 100644 index 00000000000..30ca24b5576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1 b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1 new file mode 100644 index 00000000000..a36b6841040 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1 @@ -0,0 +1,3 @@ +package test + +fun a() = "aa" diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt new file mode 100644 index 00000000000..5c782f47a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt @@ -0,0 +1,3 @@ +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2 b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2 new file mode 100644 index 00000000000..0099182b31f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2 @@ -0,0 +1,3 @@ +package test + +fun b() = "bb" diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log new file mode 100644 index 00000000000..87d1614e2f1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files + + +Cleaning output files: +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/b.kt +End of files From 8a67920c25b6f23f4154ebd1f92ec5d2427b1fcd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 29 May 2014 18:30:34 +0400 Subject: [PATCH 0085/1557] Made incremental compilation test auto-generated. Original commit: 205f99bf60e2cd38e8e42f04a8cfed09729a723a --- ...sTest.kt => AbstractIncrementalJpsTest.kt} | 74 ++----------- .../build/IncrementalJpsTestGenerated.java | 104 ++++++++++++++++++ 2 files changed, 115 insertions(+), 63 deletions(-) rename jps/jps-plugin/test/org/jetbrains/jet/jps/build/{IncrementalJpsTest.kt => AbstractIncrementalJpsTest.kt} (86%) create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt similarity index 86% rename from jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt rename to jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 68b1abcd906..02ac07e068a 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -30,22 +30,14 @@ import org.jetbrains.jet.config.IncrementalCompilation import java.util.ArrayList import kotlin.test.fail -public class IncrementalJpsTest : JpsBuildTestCase() { - private val testDataDir: File - get() = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "incremental/" + getTestName(true)) +public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { + private var testDataDir: File by Delegates.notNull() var workDir: File by Delegates.notNull() override fun setUp() { super.setUp() System.setProperty("kotlin.jps.tests", "true") - - workDir = FileUtil.createTempDirectory("jps-build", null) - - FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) - - JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject!!) - .setOutputUrl(JpsPathUtil.pathToUrl(getAbsolutePath("out"))) } override fun tearDown() { @@ -99,11 +91,19 @@ public class IncrementalJpsTest : JpsBuildTestCase() { } } - private fun doTest() { + protected fun doTest(testDataPath: String) { if (!IncrementalCompilation.ENABLED) { return } + testDataDir = File(testDataPath) + workDir = FileUtil.createTempDirectory("jps-build", null) + + FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) + + JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject!!) + .setOutputUrl(JpsPathUtil.pathToUrl(getAbsolutePath("out"))) + addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject!!) @@ -132,58 +132,6 @@ public class IncrementalJpsTest : JpsBuildTestCase() { override fun doGetProjectDir(): File? = workDir - fun testIndependentClasses() { - doTest() - } - - fun testSimpleClassDependency() { - doTest() - } - - fun testTopLevelMembersInTwoPackages() { - doTest() - } - - fun testReturnTypeChanged() { - doTest() - } - - fun testTopLevelFunctionSameSignature() { - doTest() - } - - fun testClassSignatureChanged() { - doTest() - } - - fun testConstantValue() { - doTest() - } - - fun testConstantUnchanged() { - doTest() - } - - fun testPackageFileAdded() { - doTest() - } - - fun testPackageFileRemoved() { - doTest() - } - - fun testPackageFilesChangedInTurn() { - doTest() - } - - fun testPackageFileChangedThenOtherRemoved() { - doTest() - } - - fun testPackageFileChangedPackage() { - doTest() - } - private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java new file mode 100644 index 00000000000..f0c282265d5 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -0,0 +1,104 @@ +/* + * Copyright 2010-2014 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.jps.build; + +import junit.framework.Assert; +import junit.framework.Test; +import junit.framework.TestSuite; + +import java.io.File; +import java.util.regex.Pattern; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; + +import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest; + +/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental") +public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInIncremental() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), false); + } + + @TestMetadata("classSignatureChanged") + public void testClassSignatureChanged() throws Exception { + doTest("jps-plugin/testData/incremental/classSignatureChanged/"); + } + + @TestMetadata("constantUnchanged") + public void testConstantUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/constantUnchanged/"); + } + + @TestMetadata("constantValue") + public void testConstantValue() throws Exception { + doTest("jps-plugin/testData/incremental/constantValue/"); + } + + @TestMetadata("independentClasses") + public void testIndependentClasses() throws Exception { + doTest("jps-plugin/testData/incremental/independentClasses/"); + } + + @TestMetadata("packageFileAdded") + public void testPackageFileAdded() throws Exception { + doTest("jps-plugin/testData/incremental/packageFileAdded/"); + } + + @TestMetadata("packageFileChangedPackage") + public void testPackageFileChangedPackage() throws Exception { + doTest("jps-plugin/testData/incremental/packageFileChangedPackage/"); + } + + @TestMetadata("packageFileChangedThenOtherRemoved") + public void testPackageFileChangedThenOtherRemoved() throws Exception { + doTest("jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/"); + } + + @TestMetadata("packageFileRemoved") + public void testPackageFileRemoved() throws Exception { + doTest("jps-plugin/testData/incremental/packageFileRemoved/"); + } + + @TestMetadata("packageFilesChangedInTurn") + public void testPackageFilesChangedInTurn() throws Exception { + doTest("jps-plugin/testData/incremental/packageFilesChangedInTurn/"); + } + + @TestMetadata("returnTypeChanged") + public void testReturnTypeChanged() throws Exception { + doTest("jps-plugin/testData/incremental/returnTypeChanged/"); + } + + @TestMetadata("simpleClassDependency") + public void testSimpleClassDependency() throws Exception { + doTest("jps-plugin/testData/incremental/simpleClassDependency/"); + } + + @TestMetadata("topLevelFunctionSameSignature") + public void testTopLevelFunctionSameSignature() throws Exception { + doTest("jps-plugin/testData/incremental/topLevelFunctionSameSignature/"); + } + + @TestMetadata("topLevelMembersInTwoPackages") + public void testTopLevelMembersInTwoPackages() throws Exception { + doTest("jps-plugin/testData/incremental/topLevelMembersInTwoPackages/"); + } + +} From 21ac2b80f59b152c4b6cd247f66781158a91a120 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 29 May 2014 19:47:38 +0400 Subject: [PATCH 0086/1557] Removing caches and rebuilding again in tests. It helps to find cases when stuck data spoils compilation output. Original commit: fddc8edc03d91ffc0e5b409c303ee75130b6014e --- .../jps/build/AbstractIncrementalJpsTest.kt | 40 ++++++++++++++----- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 02ac07e068a..4094f1db569 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -28,6 +28,7 @@ import org.jetbrains.jps.util.JpsPathUtil import com.intellij.testFramework.UsefulTestCase import org.jetbrains.jet.config.IncrementalCompilation import java.util.ArrayList +import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import kotlin.test.fail public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { @@ -56,6 +57,14 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } } + private fun make(): String { + return buildGetLog() + } + + private fun rebuild() { + buildGetLog(CompileScopeTestBuilder.rebuild().allModules()) + } + private fun getModificationsToPerform(): List> { fun getModificationsForIteration(newSuffix: String, deleteSuffix: String): List { @@ -91,6 +100,24 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } } + private fun rebuildAndCheckOutput() { + val outDir = File(getAbsolutePath("out")) + val outAfterMake = File(getAbsolutePath("out-after-make")) + FileUtil.copyDir(outDir, outAfterMake) + + rebuild() + + assertEqualDirectories(outDir, outAfterMake, { it.name == "script.xml" }) + + FileUtil.delete(outAfterMake) + } + + private fun clearCachesRebuildAndCheckOutput() { + FileUtil.delete(BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot()!!) + + rebuildAndCheckOutput() + } + protected fun doTest(testDataPath: String) { if (!IncrementalCompilation.ENABLED) { return @@ -107,7 +134,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject!!) - buildGetLog() + make() val modifications = getModificationsToPerform() val logs = ArrayList() @@ -115,19 +142,14 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { for (step in modifications) { step.forEach { it.perform(workDir) } - val log = buildGetLog() + val log = make() logs.add(log) } UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), logs.makeString("\n\n")) - val outDir = File(getAbsolutePath("out")) - val outAfterMake = File(getAbsolutePath("out-after-make")) - FileUtil.copyDir(outDir, outAfterMake) - - buildGetLog(CompileScopeTestBuilder.rebuild().allModules()) - - assertEqualDirectories(outDir, outAfterMake, { it.name == "script.xml" }) + rebuildAndCheckOutput() + clearCachesRebuildAndCheckOutput() } override fun doGetProjectDir(): File? = workDir From f6147fcbcde3d154ccd8e24f248a11448eed5295 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 5 Jun 2014 17:54:43 +0400 Subject: [PATCH 0087/1557] Supported cases of removing source files from package fragment. Original commit: 820bd911fb8ebee5f71d24aabb5653b3fdc9105a --- .../jet/jps/build/KotlinBuilder.java | 38 ++++++++++++++++--- .../KotlinBuilderModuleScriptGenerator.java | 5 ++- 2 files changed, 35 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 3469225ec74..2091b635e95 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -65,6 +65,7 @@ import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCom public class KotlinBuilder extends ModuleLevelBuilder { private static final Key> ALL_COMPILED_FILES_KEY = Key.create("_all_kotlin_compiled_files_"); + private static final Key> PROCESSED_TARGETS_WITH_REMOVED_FILES = Key.create("_processed_targets_with_removed_files_"); public static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; private static final List COMPILABLE_FILE_EXTENSIONS = Collections.singletonList("kt"); @@ -172,7 +173,20 @@ public class KotlinBuilder extends ModuleLevelBuilder { filesToCompile.removeAll(allCompiledFiles); allCompiledFiles.addAll(filesToCompile); - File moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile); + Set processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context); + + boolean haveRemovedFiles = false; + for (ModuleBuildTarget target : chunk.getTargets()) { + if (processedTargetsWithRemoved.add(target)) { + if (!dirtyFilesHolder.getRemovedFiles(target).isEmpty()) { + haveRemovedFiles = true; + break; + } + } + } + + File moduleFile = KotlinBuilderModuleScriptGenerator + .generateModuleDescription(context, chunk, filesToCompile, haveRemovedFiles); if (moduleFile == null) { // No Kotlin sources found return ExitCode.NOTHING_DONE; @@ -198,17 +212,20 @@ public class KotlinBuilder extends ModuleLevelBuilder { IncrementalCache cache = new IncrementalCache(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); try { + for (ModuleBuildTarget target : chunk.getTargets()) { + for (String file : dirtyFilesHolder.getRemovedFiles(target)) { + cache.clearPackagePartSourceData(target.getId(), new File(file)); + } + } + boolean significantChanges = false; for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { BuildTarget target = null; Collection sourceFiles = outputItem.getSourceFiles(); - if (sourceFiles != null && !sourceFiles.isEmpty()) { + if (!sourceFiles.isEmpty()) { target = sourceToTarget.get(sourceFiles.iterator().next()); } - else { - messageCollector.report(EXCEPTION, "KotlinBuilder: outputItem.sourceFiles is null or empty, outputItem = " + outputItem, NO_LOCATION); - } if (target == null) { target = representativeTarget; @@ -217,7 +234,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputFile = outputItem.getOutputFile(); if (IncrementalCompilation.ENABLED) { - if (cache.saveFileToCache(target.getId(), outputFile)) { + if (cache.saveFileToCache(target.getId(), sourceFiles, outputFile)) { significantChanges = true; } } @@ -255,6 +272,15 @@ public class KotlinBuilder extends ModuleLevelBuilder { return allCompiledFiles; } + private static Set getProcessedTargetsWithRemovedFilesContainer(CompileContext context) { + Set set = PROCESSED_TARGETS_WITH_REMOVED_FILES.get(context); + if (set == null) { + set = new HashSet(); + PROCESSED_TARGETS_WITH_REMOVED_FILES.set(context, set); + } + return set; + } + private static boolean hasKotlinFiles(@NotNull ModuleChunk chunk) { boolean hasKotlinFiles = false; for (ModuleBuildTarget target : chunk.getTargets()) { diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 0adc2694d14..4604f978def 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -59,7 +59,8 @@ public class KotlinBuilderModuleScriptGenerator { public static File generateModuleDescription( CompileContext context, ModuleChunk chunk, - List sourceFiles // ignored for non-incremental compilation + List sourceFiles, // ignored for non-incremental compilation + boolean hasRemovedFiles ) throws IOException { @@ -79,7 +80,7 @@ public class KotlinBuilderModuleScriptGenerator { sourceFiles = new ArrayList(KotlinSourceFileCollector.getAllKotlinSourceFiles(target)); } - if (sourceFiles.size() > 0) { + if (sourceFiles.size() > 0 || hasRemovedFiles) { noSources = false; if (logger.isEnabled()) { From 18c00c7b5e2941529b0662268b66bed901817574 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 6 Jun 2014 19:18:55 +0400 Subject: [PATCH 0088/1557] Extracted interface and moved implementation of IncrementalCache to jps-plugin, accessing cache via Java service loader. Original commit: 07365dca1ddfe275cb8ea5059cad8037bd6af0ea --- jps/jps-plugin/jps-plugin.iml | 4 +- ...otlin.incremental.IncrementalCacheProvider | 1 + .../jet/jps/build/KotlinBuilder.java | 4 +- .../jps/incremental/IncrementalCacheImpl.kt | 219 ++++++++++++++++++ .../IncrementlaCacheProviderImpl.kt | 27 +++ 5 files changed, 251 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/src/META-INF/services/org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index a7f222b8c6d..5ccd205933f 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -17,8 +17,8 @@ - - + + diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider new file mode 100644 index 00000000000..eadf409aee9 --- /dev/null +++ b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider @@ -0,0 +1 @@ +org.jetbrains.jet.jps.incremental.IncrementalCacheProviderImpl \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 2091b635e95..da5842fa0f1 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.compiler.runner.SimpleOutputItem; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache; +import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.BuildTarget; @@ -209,7 +209,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { } } - IncrementalCache cache = new IncrementalCache(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); + IncrementalCacheImpl cache = new IncrementalCacheImpl(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); try { for (ModuleBuildTarget target : chunk.getTargets()) { diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt new file mode 100644 index 00000000000..083e5b46c6c --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -0,0 +1,219 @@ +/* + * Copyright 2010-2014 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.jps.incremental + +import java.io.File +import com.intellij.util.io.PersistentMap +import com.intellij.util.io.PersistentHashMap +import com.intellij.util.io.KeyDescriptor +import java.io.DataOutput +import com.intellij.util.io.IOUtil +import java.io.DataInput +import org.jetbrains.jet.lang.resolve.name.FqName +import com.intellij.util.io.DataExternalizer +import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.jet.descriptors.serialization.BitEncoding +import org.jetbrains.jet.utils.intellij.* +import java.util.Arrays +import com.intellij.util.io.IntInlineKeyDescriptor +import org.jetbrains.org.objectweb.asm.* +import com.intellij.util.io.EnumeratorStringDescriptor +import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames +import org.jetbrains.jet.lang.resolve.java.JvmClassName +import java.util.TreeMap +import java.util.HashSet +import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache + +public class IncrementalCacheImpl(baseDir: File): IncrementalCache { + class object { + val PROTO_MAP = "proto.tab" + val CONSTANTS_MAP = "constants.tab" + val PACKAGE_SOURCES = "package-sources.tab" + + private fun getConstantsHash(bytes: ByteArray): Int { + val result = TreeMap() // keys order should defined to check hash of a map + + ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { + override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? { + if (value != null) { + result[name] = value + } + return null + } + }, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES) + + return result.hashCode() + } + } + + private val protoData: PersistentMap + private val constantsData: PersistentHashMap + = PersistentHashMap(File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), IntInlineKeyDescriptor()) + + // Format of serialization to string: --> + private val packageSourcesData: PersistentHashMap + = PersistentHashMap(File(baseDir, PACKAGE_SOURCES), EnumeratorStringDescriptor(), EnumeratorStringDescriptor()) + + ;{ + protoData = PersistentHashMap(File(baseDir, PROTO_MAP), object : KeyDescriptor { + override fun save(out: DataOutput, value: ClassOrPackageId?) { + IOUtil.writeString(value!!.moduleId, out) + IOUtil.writeString(value.fqName.asString(), out) + } + + override fun read(`in`: DataInput): ClassOrPackageId { + val module = IOUtil.readString(`in`)!! + val fqName = FqName(IOUtil.readString(`in`)!!) + return ClassOrPackageId(module, fqName) + } + + override fun getHashCode(value: ClassOrPackageId?): Int { + return value?.hashCode() ?: -1 + } + + override fun isEqual(val1: ClassOrPackageId?, val2: ClassOrPackageId?): Boolean { + return val1 == val2 + } + }, object : DataExternalizer { + override fun save(out: DataOutput, value: ByteArray?) { + out.writeInt(value!!.size) + out.write(value) + } + + override fun read(`in`: DataInput): ByteArray { + val length = `in`.readInt() + val buf = ByteArray(length) + `in`.readFully(buf) + return buf + } + }) + } + + public fun saveFileToCache(moduleId: String, sourceFiles: Collection, file: File): Boolean { + val fileBytes = file.readBytes() + val classNameAndHeader = VirtualFileKotlinClass.readClassNameAndHeader(fileBytes) + if (classNameAndHeader == null) return false + + val (className, header) = classNameAndHeader + val classFqName = className.getFqNameForClassNameWithoutDollars() + val annotationDataEncoded = header.annotationData + if (annotationDataEncoded != null) { + val data = BitEncoding.decodeBytes(annotationDataEncoded) + when (header.kind) { + KotlinClassHeader.Kind.PACKAGE_FACADE -> { + return putData(moduleId, classFqName.parent(), data) + } + KotlinClassHeader.Kind.CLASS -> { + return putData(moduleId, classFqName, data) + } + } + } + if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { + assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } + putPackagePartSourceData(moduleId, sourceFiles.first(), className) + return putConstantsData(className, getConstantsHash(fileBytes)) + } + + return false + } + + private fun putData(moduleId: String, fqName: FqName, data: ByteArray): Boolean { + val id = ClassOrPackageId(moduleId, fqName) + val oldData = protoData[id] + if (Arrays.equals(data, oldData)) { + return false + } + protoData.put(id, data) + return true + } + + private fun putConstantsData(packagePartClass: JvmClassName, constantsHash: Int): Boolean { + val key = packagePartClass.getInternalName() + + val oldHash = constantsData[key] + if (oldHash == constantsHash) { + return false + } + constantsData.put(key, constantsHash) + return true + } + + private fun putPackagePartSourceData(moduleId: String, sourceFile: File, className: JvmClassName?) { + val key = moduleId + File.pathSeparator + sourceFile.getAbsolutePath() + + if (className != null) { + packageSourcesData.put(key, className.getInternalName()) + } + else { + packageSourcesData.remove(key) + } + } + + public fun clearPackagePartSourceData(moduleId: String, sourceFile: File) { + putPackagePartSourceData(moduleId, sourceFile, null) + } + + public override fun getPackagesWithRemovedFiles(moduleId: String, compiledSourceFiles: Collection): Collection { + return getRemovedPackageParts(moduleId, compiledSourceFiles).map { it.getFqNameForClassNameWithoutDollars().parent() } + } + + public override fun getRemovedPackageParts(moduleId: String, compiledSourceFiles: Collection): Collection { + val sourceFileToCurrentFqNameMap = HashMap() + for (sourceFile in compiledSourceFiles) { + sourceFileToCurrentFqNameMap[File(sourceFile.getVirtualFile()!!.getPath())] = sourceFile.getPackageFqName() + } + + val result = HashSet() + + packageSourcesData.processKeysWithExistingMapping { key -> + if (key!!.startsWith(moduleId + File.pathSeparator)) { + val indexOf = key.indexOf(File.pathSeparator) + val sourceFile = File(key.substring(indexOf + 1)) + + val packagePartClassName = JvmClassName.byInternalName(packageSourcesData[key]!!) + if (!sourceFile.exists()) { + result.add(packagePartClassName) + } + else { + val previousPackageFqName = packagePartClassName.getFqNameForClassNameWithoutDollars().parent() + val currentPackageFqName = sourceFileToCurrentFqNameMap[sourceFile] + if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName) { + result.add(packagePartClassName) + } + } + } + + true + } + + return result + } + + public override fun getPackageData(moduleId: String, fqName: FqName): ByteArray? { + return protoData[ClassOrPackageId(moduleId, fqName)] + } + + public fun close() { + protoData.close() + constantsData.close() + packageSourcesData.close() + } + + private data class ClassOrPackageId(val moduleId: String, val fqName: FqName) { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt new file mode 100644 index 00000000000..5b94b207b71 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt @@ -0,0 +1,27 @@ +/* + * Copyright 2010-2014 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.jps.incremental + +import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider +import java.io.File +import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache + +public class IncrementalCacheProviderImpl: IncrementalCacheProvider { + override fun getIncrementalCache(baseDir: File): IncrementalCache { + return IncrementalCacheImpl(baseDir) + } +} \ No newline at end of file From 06a2d64247c6f71497209393d5d37a14f6c270e7 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 6 Jun 2014 19:43:31 +0400 Subject: [PATCH 0089/1557] Simplified interface of IncrementalCache (depending on JDK only). Original commit: 04f7ad450fdb4186acf5adfa80b77ab2fe785a5d --- .../jps/incremental/IncrementalCacheImpl.kt | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 083e5b46c6c..50e94b82945 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -168,31 +168,22 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { putPackagePartSourceData(moduleId, sourceFile, null) } - public override fun getPackagesWithRemovedFiles(moduleId: String, compiledSourceFiles: Collection): Collection { - return getRemovedPackageParts(moduleId, compiledSourceFiles).map { it.getFqNameForClassNameWithoutDollars().parent() } - } - - public override fun getRemovedPackageParts(moduleId: String, compiledSourceFiles: Collection): Collection { - val sourceFileToCurrentFqNameMap = HashMap() - for (sourceFile in compiledSourceFiles) { - sourceFileToCurrentFqNameMap[File(sourceFile.getVirtualFile()!!.getPath())] = sourceFile.getPackageFqName() - } - - val result = HashSet() + public override fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map): Collection { + val result = HashSet() packageSourcesData.processKeysWithExistingMapping { key -> if (key!!.startsWith(moduleId + File.pathSeparator)) { val indexOf = key.indexOf(File.pathSeparator) val sourceFile = File(key.substring(indexOf + 1)) - val packagePartClassName = JvmClassName.byInternalName(packageSourcesData[key]!!) + val packagePartClassName = packageSourcesData[key]!! if (!sourceFile.exists()) { result.add(packagePartClassName) } else { - val previousPackageFqName = packagePartClassName.getFqNameForClassNameWithoutDollars().parent() - val currentPackageFqName = sourceFileToCurrentFqNameMap[sourceFile] - if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName) { + val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] + if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { result.add(packagePartClassName) } } @@ -204,8 +195,8 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { return result } - public override fun getPackageData(moduleId: String, fqName: FqName): ByteArray? { - return protoData[ClassOrPackageId(moduleId, fqName)] + public override fun getPackageData(moduleId: String, fqName: String): ByteArray? { + return protoData[ClassOrPackageId(moduleId, FqName(fqName))] } public fun close() { From 4134b94c354692c9c8887b177d82425e705cc324 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 9 Jun 2014 20:50:51 +0400 Subject: [PATCH 0090/1557] Passing custom class loader for loading incremental cache implementation. Original commit: d3e5790674ecaf6102c5214945a735da663317a9 --- .../jet/jps/build/KotlinBuilder.java | 58 ++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index da5842fa0f1..ef37d49ae46 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -18,6 +18,7 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.io.StreamUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; @@ -38,6 +39,7 @@ import org.jetbrains.jet.compiler.runner.SimpleOutputItem; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl; +import org.jetbrains.jet.preloading.ClassLoaderFactory; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.BuildTarget; @@ -53,8 +55,10 @@ import org.jetbrains.jps.model.module.JpsModule; import java.io.File; import java.io.FileFilter; import java.io.IOException; +import java.io.InputStream; import java.lang.reflect.Field; import java.lang.reflect.Modifier; +import java.net.URL; import java.util.*; import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; @@ -114,7 +118,14 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputDir = representativeTarget.getOutputDir(); - CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir); + CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor( + PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, new ClassLoaderFactory() { + @Override + public ClassLoader create(ClassLoader compilerClassLoader) { + return new MyClassLoader(compilerClassLoader); + } + } + ); if (!environment.success()) { if (!hasKotlinFiles(chunk)) { // Configuration is bad, but there's nothing to compile anyways @@ -374,4 +385,49 @@ public class KotlinBuilder extends ModuleLevelBuilder { public List getCompilableFileExtensions() { return COMPILABLE_FILE_EXTENSIONS; } + + private class MyClassLoader extends ClassLoader { + private final ClassLoader compilerClassLoader; + private final ClassLoader jpsPluginClassLoader = KotlinBuilder.this.getClass().getClassLoader(); + + private MyClassLoader(ClassLoader compilerClassLoader) { + this.compilerClassLoader = compilerClassLoader; + } + + @NotNull + @Override + public Enumeration getResources(String name) throws IOException { + return jpsPluginClassLoader.getResources(name); + } + + @Override + public Class loadClass(@NotNull String name) throws ClassNotFoundException { + if (name.startsWith("org.jetbrains.jet.jps.incremental.")) { + return loadClassFromBytes(name); + } + else if (name.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.")) { + return compilerClassLoader.loadClass(name); + } + else { + return jpsPluginClassLoader.loadClass(name); + } + } + + private Class loadClassFromBytes(String name) throws ClassNotFoundException { + String classResource = name.replace('.', '/') + ".class"; + InputStream resource = jpsPluginClassLoader.getResourceAsStream(classResource); + if (resource == null) { + return null; + } + byte[] bytes; + try { + bytes = StreamUtil.loadFromStream(resource); + } + catch (IOException e) { + throw new ClassNotFoundException("Couldn't load class " + name, e); + } + + return defineClass(name, bytes, 0, bytes.length); + } + } } From 88d9c5e328ef3c1fc235da9ee27061806ce7d776 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 18 Jun 2014 17:05:49 +0400 Subject: [PATCH 0091/1557] Writing incrementalCache attribute to element of xml module script Original commit: f6129732a2b1aad7c40a606fbc410069db7ee0d5 --- .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 4604f978def..7fbfdd5568a 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -64,7 +64,7 @@ public class KotlinBuilderModuleScriptGenerator { ) throws IOException { - KotlinModuleDescriptionBuilder builder = FACTORY.create(); + KotlinModuleDescriptionBuilder builder = FACTORY.create(getIncrementalCacheDir(context).getAbsolutePath()); boolean noSources = true; @@ -91,7 +91,6 @@ public class KotlinBuilderModuleScriptGenerator { builder.addModule( target.getId(), outputDir.getAbsolutePath(), - getIncrementalCacheDir(context).getAbsolutePath(), getKotlinModuleDependencies(context, target), sourceFiles, target.isTests(), From 7c4fb68bad132fd367d93c5669310b7acfea80ff Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 14:22:43 +0400 Subject: [PATCH 0092/1557] Minor. Regenerated tests. Original commit: 15d95494772fa986e2779a200ad8ba6b483c07d2 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 6 +++--- .../a.kt | 0 .../a.kt.new | 0 .../b.kt | 0 .../build.log | 0 5 files changed, 3 insertions(+), 3 deletions(-) rename jps/jps-plugin/testData/incremental/{topLevelMembersInTwoPackages => topLevelMembersInTwoFiles}/a.kt (100%) rename jps/jps-plugin/testData/incremental/{topLevelMembersInTwoPackages => topLevelMembersInTwoFiles}/a.kt.new (100%) rename jps/jps-plugin/testData/incremental/{topLevelMembersInTwoPackages => topLevelMembersInTwoFiles}/b.kt (100%) rename jps/jps-plugin/testData/incremental/{topLevelMembersInTwoPackages => topLevelMembersInTwoFiles}/build.log (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index f0c282265d5..97888252581 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -96,9 +96,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/topLevelFunctionSameSignature/"); } - @TestMetadata("topLevelMembersInTwoPackages") - public void testTopLevelMembersInTwoPackages() throws Exception { - doTest("jps-plugin/testData/incremental/topLevelMembersInTwoPackages/"); + @TestMetadata("topLevelMembersInTwoFiles") + public void testTopLevelMembersInTwoFiles() throws Exception { + doTest("jps-plugin/testData/incremental/topLevelMembersInTwoFiles/"); } } diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt rename to jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/a.kt diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/a.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/a.kt.new rename to jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/a.kt.new diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/b.kt rename to jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/b.kt diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log b/jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelMembersInTwoPackages/build.log rename to jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/build.log From 06a5282da874ac6b49fb8ecbda9fa6347c28975c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 14:37:08 +0400 Subject: [PATCH 0093/1557] Added test with class signature unchanged. Original commit: 7f1e99ecfdbd32aca453247dc452b12910ee1cd8 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 5 +++++ .../incremental/classSignatureUnchanged/build.log | 6 ++++++ .../testData/incremental/classSignatureUnchanged/class.kt | 7 +++++++ .../incremental/classSignatureUnchanged/class.kt.new | 8 ++++++++ .../testData/incremental/classSignatureUnchanged/usage.kt | 6 ++++++ 5 files changed, 32 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/classSignatureUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt create mode 100644 jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classSignatureUnchanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 97888252581..c8359bf9773 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -41,6 +41,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/classSignatureChanged/"); } + @TestMetadata("classSignatureUnchanged") + public void testClassSignatureUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/classSignatureUnchanged/"); + } + @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { doTest("jps-plugin/testData/incremental/constantUnchanged/"); diff --git a/jps/jps-plugin/testData/incremental/classSignatureUnchanged/build.log b/jps/jps-plugin/testData/incremental/classSignatureUnchanged/build.log new file mode 100644 index 00000000000..cc8924d4caa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classSignatureUnchanged/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/Klass.class +End of files +Compiling files: +src/class.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt b/jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt new file mode 100644 index 00000000000..3f1b899222d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt @@ -0,0 +1,7 @@ +package test + +class Klass { + fun foo() = ":)" + + fun bar() = ":(" +} diff --git a/jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt.new b/jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt.new new file mode 100644 index 00000000000..8ac6fd17f05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt.new @@ -0,0 +1,8 @@ +package test + +// swapped functions +class Klass { + fun bar() = ":(" + + fun foo() = ":)" +} diff --git a/jps/jps-plugin/testData/incremental/classSignatureUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/classSignatureUnchanged/usage.kt new file mode 100644 index 00000000000..2ee98c0e4be --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classSignatureUnchanged/usage.kt @@ -0,0 +1,6 @@ +package test + +fun usage(a: Klass) { + a.foo() + a.bar() +} From 93af794841717ae2593c9aac0fc0e453f60a8e7b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 14:37:55 +0400 Subject: [PATCH 0094/1557] Minor. Replaced first invocation of make() with initialMake() (for clearer stack trace). Original commit: 6809befa3a0ec3e636006718dba56b8e277543bd --- .../jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 4094f1db569..1879580f7d1 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -57,6 +57,10 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } } + private fun initialMake(): String { + return buildGetLog() + } + private fun make(): String { return buildGetLog() } @@ -134,7 +138,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject!!) - make() + initialMake() val modifications = getModificationsToPerform() val logs = ArrayList() From 1308dd234a5fad1cb72be7874d69af1be7292bce Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 14:49:16 +0400 Subject: [PATCH 0095/1557] Processing all targets with removed files in chunk at once. Original commit: 219475be71e817817711e8878c22a5f34f649650 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index ef37d49ae46..b11eea61ddb 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -188,10 +188,9 @@ public class KotlinBuilder extends ModuleLevelBuilder { boolean haveRemovedFiles = false; for (ModuleBuildTarget target : chunk.getTargets()) { - if (processedTargetsWithRemoved.add(target)) { - if (!dirtyFilesHolder.getRemovedFiles(target).isEmpty()) { + if (!dirtyFilesHolder.getRemovedFiles(target).isEmpty()) { + if (processedTargetsWithRemoved.add(target)) { haveRemovedFiles = true; - break; } } } From fe3a02e750adf3990f6df4cb0745d7e8fb102012 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 14:53:13 +0400 Subject: [PATCH 0096/1557] Minor cleanup Original commit: 54f140e9e41e8f1050e2aac5197584f667d79455 --- .../jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 50e94b82945..6bdbf71c17b 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -121,6 +121,9 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { KotlinClassHeader.Kind.CLASS -> { return putData(moduleId, classFqName, data) } + else -> { + throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}") + } } } if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { @@ -173,8 +176,7 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { packageSourcesData.processKeysWithExistingMapping { key -> if (key!!.startsWith(moduleId + File.pathSeparator)) { - val indexOf = key.indexOf(File.pathSeparator) - val sourceFile = File(key.substring(indexOf + 1)) + val sourceFile = File(key.substring(moduleId.length + 1)) val packagePartClassName = packageSourcesData[key]!! if (!sourceFile.exists()) { From e6f2f892558aaa650f1dece9a1743c2878e881c3 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 15:47:22 +0400 Subject: [PATCH 0097/1557] Generalized method name. Original commit: 9f86441f9571cf00f4f4a026767fb82e3d175116 --- .../jet/jps/build/KotlinBuilder.java | 2 +- .../jps/incremental/IncrementalCacheImpl.kt | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index b11eea61ddb..8faa3f15c23 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -224,7 +224,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { try { for (ModuleBuildTarget target : chunk.getTargets()) { for (String file : dirtyFilesHolder.getRemovedFiles(target)) { - cache.clearPackagePartSourceData(target.getId(), new File(file)); + cache.clearCacheForRemovedFile(target.getId(), new File(file)); } } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 6bdbf71c17b..b7915b9faca 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -135,6 +135,10 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { return false } + public fun clearCacheForRemovedFile(moduleId: String, sourceFile: File) { + packageSourcesData.remove(getKeyForPackagePart(moduleId, sourceFile)) + } + private fun putData(moduleId: String, fqName: FqName, data: ByteArray): Boolean { val id = ClassOrPackageId(moduleId, fqName) val oldData = protoData[id] @@ -156,19 +160,12 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { return true } - private fun putPackagePartSourceData(moduleId: String, sourceFile: File, className: JvmClassName?) { - val key = moduleId + File.pathSeparator + sourceFile.getAbsolutePath() - - if (className != null) { - packageSourcesData.put(key, className.getInternalName()) - } - else { - packageSourcesData.remove(key) - } + private fun getKeyForPackagePart(moduleId: String, sourceFile: File): String { + return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() } - public fun clearPackagePartSourceData(moduleId: String, sourceFile: File) { - putPackagePartSourceData(moduleId, sourceFile, null) + private fun putPackagePartSourceData(moduleId: String, sourceFile: File, className: JvmClassName) { + packageSourcesData.put(getKeyForPackagePart(moduleId, sourceFile), className.getInternalName()) } public override fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map): Collection { From ca6e2cbf90cd77aa2b9cb23cfd48eeba515f3d64 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 19:25:30 +0400 Subject: [PATCH 0098/1557] Writing/reading constants map fully to avoid hash collisions. Original commit: e1f6fc55c5d853a245351951e44d6deabb62eb43 --- .../jps/incremental/IncrementalCacheImpl.kt | 81 ++++++++++++++++--- .../incremental/constantValue/const.kt | 3 +- .../incremental/constantValue/const.kt.new | 3 +- 3 files changed, 73 insertions(+), 14 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index b7915b9faca..6f2513718df 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -30,14 +30,13 @@ import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader import org.jetbrains.jet.descriptors.serialization.BitEncoding import org.jetbrains.jet.utils.intellij.* import java.util.Arrays -import com.intellij.util.io.IntInlineKeyDescriptor import org.jetbrains.org.objectweb.asm.* import com.intellij.util.io.EnumeratorStringDescriptor import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames import org.jetbrains.jet.lang.resolve.java.JvmClassName -import java.util.TreeMap import java.util.HashSet import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache +import java.util.HashMap public class IncrementalCacheImpl(baseDir: File): IncrementalCache { class object { @@ -45,8 +44,8 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { val CONSTANTS_MAP = "constants.tab" val PACKAGE_SOURCES = "package-sources.tab" - private fun getConstantsHash(bytes: ByteArray): Int { - val result = TreeMap() // keys order should defined to check hash of a map + private fun getConstantsMap(bytes: ByteArray): Map { + val result = HashMap() ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? { @@ -57,13 +56,13 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { } }, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES) - return result.hashCode() + return result } } private val protoData: PersistentMap - private val constantsData: PersistentHashMap - = PersistentHashMap(File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), IntInlineKeyDescriptor()) + private val constantsData: PersistentHashMap> + = PersistentHashMap(File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), ConstantsMapExternalizer()) // Format of serialization to string: --> private val packageSourcesData: PersistentHashMap @@ -129,7 +128,7 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } putPackagePartSourceData(moduleId, sourceFiles.first(), className) - return putConstantsData(className, getConstantsHash(fileBytes)) + return putConstantsData(className, getConstantsMap(fileBytes)) } return false @@ -149,14 +148,14 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { return true } - private fun putConstantsData(packagePartClass: JvmClassName, constantsHash: Int): Boolean { + private fun putConstantsData(packagePartClass: JvmClassName, constantsMap: Map): Boolean { val key = packagePartClass.getInternalName() - val oldHash = constantsData[key] - if (oldHash == constantsHash) { + val oldMap = constantsData[key] + if (oldMap == constantsMap) { return false } - constantsData.put(key, constantsHash) + constantsData.put(key, constantsMap) return true } @@ -206,4 +205,62 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { private data class ClassOrPackageId(val moduleId: String, val fqName: FqName) { } + + private class ConstantsMapExternalizer: DataExternalizer> { + override fun save(out: DataOutput, map: Map?) { + out.writeInt(map!!.size) + for (name in map.keySet().toSortedList()) { + IOUtil.writeString(name, out) + val value = map[name]!! + when (value) { + is Int -> { + out.writeByte(Kind.INT.ordinal()) + out.writeInt(value) + } + is Float -> { + out.writeByte(Kind.FLOAT.ordinal()) + out.writeFloat(value) + } + is Long -> { + out.writeByte(Kind.LONG.ordinal()) + out.writeLong(value) + } + is Double -> { + out.writeByte(Kind.DOUBLE.ordinal()) + out.writeDouble(value) + } + is String -> { + out.writeByte(Kind.STRING.ordinal()) + IOUtil.writeString(value, out) + } + else -> throw IllegalStateException("Unexpected constant class: ${value.javaClass}") + } + } + } + + override fun read(`in`: DataInput): Map? { + val size = `in`.readInt() + val map = HashMap(size) + + for (i in size.indices) { + val name = IOUtil.readString(`in`)!! + + val kind = Kind.values()[`in`.readByte().toInt()] + val value = when (kind) { + Kind.INT -> `in`.readInt() + Kind.FLOAT -> `in`.readFloat() + Kind.LONG -> `in`.readLong() + Kind.DOUBLE -> `in`.readDouble() + Kind.STRING -> IOUtil.readString(`in`)!! + } + map[name] = value + } + + return map + } + + private enum class Kind { + INT FLOAT LONG DOUBLE STRING + } + } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/constantValue/const.kt b/jps/jps-plugin/testData/incremental/constantValue/const.kt index 1572968f89f..62b4a2d0b23 100644 --- a/jps/jps-plugin/testData/incremental/constantValue/const.kt +++ b/jps/jps-plugin/testData/incremental/constantValue/const.kt @@ -1,3 +1,4 @@ package test -val CONST = "foo" +// Old and new constant values are different, but their hashes are the same +val CONST = "BF" diff --git a/jps/jps-plugin/testData/incremental/constantValue/const.kt.new b/jps/jps-plugin/testData/incremental/constantValue/const.kt.new index c94f1955d6d..bf471bbe0da 100644 --- a/jps/jps-plugin/testData/incremental/constantValue/const.kt.new +++ b/jps/jps-plugin/testData/incremental/constantValue/const.kt.new @@ -1,3 +1,4 @@ package test -val CONST = "bar" +// Old and new constant values are different, but their hashes are the same +val CONST = "Ae" From b218e9cc3d86daec15eb4fc0a160c524643cdefb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 19:56:21 +0400 Subject: [PATCH 0099/1557] Extracted proto map implementation to inner class and simplified. Original commit: 4e00df1fb481387f011ecece38aad2c1b53b648e --- .../jps/incremental/IncrementalCacheImpl.kt | 102 +++++++++--------- 1 file changed, 49 insertions(+), 53 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 6f2513718df..243073627bd 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -38,7 +38,7 @@ import java.util.HashSet import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache import java.util.HashMap -public class IncrementalCacheImpl(baseDir: File): IncrementalCache { +public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { class object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" @@ -60,7 +60,7 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { } } - private val protoData: PersistentMap + private val protoMap = ProtoMap() private val constantsData: PersistentHashMap> = PersistentHashMap(File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), ConstantsMapExternalizer()) @@ -68,41 +68,6 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { private val packageSourcesData: PersistentHashMap = PersistentHashMap(File(baseDir, PACKAGE_SOURCES), EnumeratorStringDescriptor(), EnumeratorStringDescriptor()) - ;{ - protoData = PersistentHashMap(File(baseDir, PROTO_MAP), object : KeyDescriptor { - override fun save(out: DataOutput, value: ClassOrPackageId?) { - IOUtil.writeString(value!!.moduleId, out) - IOUtil.writeString(value.fqName.asString(), out) - } - - override fun read(`in`: DataInput): ClassOrPackageId { - val module = IOUtil.readString(`in`)!! - val fqName = FqName(IOUtil.readString(`in`)!!) - return ClassOrPackageId(module, fqName) - } - - override fun getHashCode(value: ClassOrPackageId?): Int { - return value?.hashCode() ?: -1 - } - - override fun isEqual(val1: ClassOrPackageId?, val2: ClassOrPackageId?): Boolean { - return val1 == val2 - } - }, object : DataExternalizer { - override fun save(out: DataOutput, value: ByteArray?) { - out.writeInt(value!!.size) - out.write(value) - } - - override fun read(`in`: DataInput): ByteArray { - val length = `in`.readInt() - val buf = ByteArray(length) - `in`.readFully(buf) - return buf - } - }) - } - public fun saveFileToCache(moduleId: String, sourceFiles: Collection, file: File): Boolean { val fileBytes = file.readBytes() val classNameAndHeader = VirtualFileKotlinClass.readClassNameAndHeader(fileBytes) @@ -115,10 +80,10 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { val data = BitEncoding.decodeBytes(annotationDataEncoded) when (header.kind) { KotlinClassHeader.Kind.PACKAGE_FACADE -> { - return putData(moduleId, classFqName.parent(), data) + return protoMap.put(moduleId, classFqName.parent(), data) } KotlinClassHeader.Kind.CLASS -> { - return putData(moduleId, classFqName, data) + return protoMap.put(moduleId, classFqName, data) } else -> { throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}") @@ -138,16 +103,6 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { packageSourcesData.remove(getKeyForPackagePart(moduleId, sourceFile)) } - private fun putData(moduleId: String, fqName: FqName, data: ByteArray): Boolean { - val id = ClassOrPackageId(moduleId, fqName) - val oldData = protoData[id] - if (Arrays.equals(data, oldData)) { - return false - } - protoData.put(id, data) - return true - } - private fun putConstantsData(packagePartClass: JvmClassName, constantsMap: Map): Boolean { val key = packagePartClass.getInternalName() @@ -194,16 +149,43 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { } public override fun getPackageData(moduleId: String, fqName: String): ByteArray? { - return protoData[ClassOrPackageId(moduleId, FqName(fqName))] + return protoMap[moduleId, fqName] } public fun close() { - protoData.close() + protoMap.close() constantsData.close() packageSourcesData.close() } - private data class ClassOrPackageId(val moduleId: String, val fqName: FqName) { + private inner class ProtoMap { + private val map: PersistentMap = PersistentHashMap( + File(baseDir, PROTO_MAP), + EnumeratorStringDescriptor(), + ByteArrayExternalizer + ) + + private fun getKeyString(moduleId: String, fqName: FqName): String { + return moduleId + ":" + fqName + } + + public fun put(moduleId: String, fqName: FqName, data: ByteArray): Boolean { + val key = getKeyString(moduleId, fqName) + val oldData = map[key] + if (Arrays.equals(data, oldData)) { + return false + } + map.put(key, data) + return true + } + + public fun get(moduleId: String, fqName: String): ByteArray? { + return map[getKeyString(moduleId, FqName(fqName))] + } + + public fun close() { + map.close() + } } private class ConstantsMapExternalizer: DataExternalizer> { @@ -263,4 +245,18 @@ public class IncrementalCacheImpl(baseDir: File): IncrementalCache { INT FLOAT LONG DOUBLE STRING } } -} \ No newline at end of file +} + +private object ByteArrayExternalizer: DataExternalizer { + override fun save(out: DataOutput, value: ByteArray?) { + out.writeInt(value!!.size) + out.write(value) + } + + override fun read(`in`: DataInput): ByteArray { + val length = `in`.readInt() + val buf = ByteArray(length) + `in`.readFully(buf) + return buf + } +} From c73cf30ca76643d61b7919698bd0048e6d551959 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 20:02:41 +0400 Subject: [PATCH 0100/1557] Extracted constants map implementation to inner class. Original commit: 214c0fe4be9e2fd07c022ca470eefd5ffb81f538 --- .../jps/incremental/IncrementalCacheImpl.kt | 79 +++++++++++-------- 1 file changed, 47 insertions(+), 32 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 243073627bd..745c538685f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -43,26 +43,10 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" val PACKAGE_SOURCES = "package-sources.tab" - - private fun getConstantsMap(bytes: ByteArray): Map { - val result = HashMap() - - ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { - override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? { - if (value != null) { - result[name] = value - } - return null - } - }, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES) - - return result - } } private val protoMap = ProtoMap() - private val constantsData: PersistentHashMap> - = PersistentHashMap(File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), ConstantsMapExternalizer()) + private val constantsMap = ConstantsMap() // Format of serialization to string: --> private val packageSourcesData: PersistentHashMap @@ -93,7 +77,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } putPackagePartSourceData(moduleId, sourceFiles.first(), className) - return putConstantsData(className, getConstantsMap(fileBytes)) + return constantsMap.process(className, fileBytes) } return false @@ -103,17 +87,6 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { packageSourcesData.remove(getKeyForPackagePart(moduleId, sourceFile)) } - private fun putConstantsData(packagePartClass: JvmClassName, constantsMap: Map): Boolean { - val key = packagePartClass.getInternalName() - - val oldMap = constantsData[key] - if (oldMap == constantsMap) { - return false - } - constantsData.put(key, constantsMap) - return true - } - private fun getKeyForPackagePart(moduleId: String, sourceFile: File): String { return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() } @@ -154,7 +127,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { public fun close() { protoMap.close() - constantsData.close() + constantsMap.close() packageSourcesData.close() } @@ -188,7 +161,49 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } } - private class ConstantsMapExternalizer: DataExternalizer> { + private inner class ConstantsMap { + private val map: PersistentHashMap> = PersistentHashMap( + File(baseDir, CONSTANTS_MAP), + EnumeratorStringDescriptor(), + ConstantsMapExternalizer + ) + + private fun getConstantsMap(bytes: ByteArray): Map { + val result = HashMap() + + ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { + override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? { + if (value != null) { + result[name] = value + } + return null + } + }, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES) + + return result + } + + public fun process(packagePartClass: JvmClassName, bytes: ByteArray): Boolean { + return put(packagePartClass, getConstantsMap(bytes)) + } + + private fun put(packagePartClass: JvmClassName, constantsMap: Map): Boolean { + val key = packagePartClass.getInternalName() + + val oldMap = map[key] + if (oldMap == constantsMap) { + return false + } + map.put(key, constantsMap) + return true + } + + public fun close() { + map.close() + } + } + + private object ConstantsMapExternalizer: DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size) for (name in map.keySet().toSortedList()) { @@ -244,7 +259,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { private enum class Kind { INT FLOAT LONG DOUBLE STRING } - } + } } private object ByteArrayExternalizer: DataExternalizer { From 523e4d0294c67c73bc6cd992008fbcd68c09aa99 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 19 Jun 2014 20:12:04 +0400 Subject: [PATCH 0101/1557] Extracted package part map implementation to inner class. Original commit: 27273deeda74ae0737c67a0f5ad94aa33ff697b4 --- .../jps/incremental/IncrementalCacheImpl.kt | 97 +++++++++++-------- 1 file changed, 57 insertions(+), 40 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 745c538685f..e06193a161d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -19,7 +19,6 @@ package org.jetbrains.jet.jps.incremental import java.io.File import com.intellij.util.io.PersistentMap import com.intellij.util.io.PersistentHashMap -import com.intellij.util.io.KeyDescriptor import java.io.DataOutput import com.intellij.util.io.IOUtil import java.io.DataInput @@ -42,15 +41,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { class object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" - val PACKAGE_SOURCES = "package-sources.tab" + val PACKAGE_PARTS = "package-parts.tab" } private val protoMap = ProtoMap() private val constantsMap = ConstantsMap() - - // Format of serialization to string: --> - private val packageSourcesData: PersistentHashMap - = PersistentHashMap(File(baseDir, PACKAGE_SOURCES), EnumeratorStringDescriptor(), EnumeratorStringDescriptor()) + private val packagePartMap = PackagePartMap() public fun saveFileToCache(moduleId: String, sourceFiles: Collection, file: File): Boolean { val fileBytes = file.readBytes() @@ -76,7 +72,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } - putPackagePartSourceData(moduleId, sourceFiles.first(), className) + packagePartMap.putPackagePartSourceData(moduleId, sourceFiles.first(), className) return constantsMap.process(className, fileBytes) } @@ -84,41 +80,11 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } public fun clearCacheForRemovedFile(moduleId: String, sourceFile: File) { - packageSourcesData.remove(getKeyForPackagePart(moduleId, sourceFile)) - } - - private fun getKeyForPackagePart(moduleId: String, sourceFile: File): String { - return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() - } - - private fun putPackagePartSourceData(moduleId: String, sourceFile: File, className: JvmClassName) { - packageSourcesData.put(getKeyForPackagePart(moduleId, sourceFile), className.getInternalName()) + packagePartMap.remove(moduleId, sourceFile) } public override fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map): Collection { - val result = HashSet() - - packageSourcesData.processKeysWithExistingMapping { key -> - if (key!!.startsWith(moduleId + File.pathSeparator)) { - val sourceFile = File(key.substring(moduleId.length + 1)) - - val packagePartClassName = packageSourcesData[key]!! - if (!sourceFile.exists()) { - result.add(packagePartClassName) - } - else { - val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() - val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] - if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { - result.add(packagePartClassName) - } - } - } - - true - } - - return result + return packagePartMap.getRemovedPackageParts(moduleId, compiledSourceFilesToFqName) } public override fun getPackageData(moduleId: String, fqName: String): ByteArray? { @@ -128,7 +94,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { public fun close() { protoMap.close() constantsMap.close() - packageSourcesData.close() + packagePartMap.close() } private inner class ProtoMap { @@ -260,6 +226,57 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { INT FLOAT LONG DOUBLE STRING } } + + private inner class PackagePartMap { + // Format of serialization to string: --> + private val map: PersistentHashMap = PersistentHashMap( + File(baseDir, PACKAGE_PARTS), + EnumeratorStringDescriptor(), + EnumeratorStringDescriptor() + ) + + private fun getKey(moduleId: String, sourceFile: File): String { + return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() + } + + public fun putPackagePartSourceData(moduleId: String, sourceFile: File, className: JvmClassName) { + map.put(getKey(moduleId, sourceFile), className.getInternalName()) + } + + public fun remove(moduleId: String, sourceFile: File) { + map.remove(getKey(moduleId, sourceFile)) + } + + public fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map): Collection { + val result = HashSet() + + map.processKeysWithExistingMapping { key -> + if (key!!.startsWith(moduleId + File.pathSeparator)) { + val sourceFile = File(key.substring(moduleId.length + 1)) + + val packagePartClassName = map[key]!! + if (!sourceFile.exists()) { + result.add(packagePartClassName) + } + else { + val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] + if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { + result.add(packagePartClassName) + } + } + } + + true + } + + return result + } + + public fun close() { + map.close() + } + } } private object ByteArrayExternalizer: DataExternalizer { From b9aefafa67769aa17981a5ef8b5ea66723b1a760 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 4 Jun 2014 02:09:54 +0400 Subject: [PATCH 0102/1557] Change jps testing framework Original commit: 5f0bfa8c564207cf13d95eb93a3c54956f09c4b8 --- .../jet/jps/build/KotlinJpsBuildTest.java | 163 +++++++++--------- 1 file changed, 83 insertions(+), 80 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 92ed4cf7664..f143abfa048 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -19,11 +19,10 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightVirtualFile; -import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.AsmUtil; -import org.jetbrains.jet.codegen.PackageCodegen; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jps.builders.BuildResult; @@ -86,7 +85,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { public void testKotlinProject() { doTest(); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test1.kt", "_DefaultPackage"); + checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")); } public void testExcludeFolderInSourceRoot() { @@ -96,7 +95,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertFilesExistInOutput(module, "Foo.class"); assertFilesNotExistInOutput(module, EXCLUDE_FILES); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); + checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); } public void testExcludeModuleFolderInSourceRootOfAnotherModule() { @@ -106,8 +105,8 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertFilesExistInOutput(module, "Foo.class"); } - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "module2", "src/module2/src/foo.kt", "Foo"); + checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); + checkWhen(touch("src/module2/src/foo.kt"), null, new String[] {klass("module2", "Foo")}); } public void testExcludeFileUsingCompilerSettings() { @@ -117,8 +116,9 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertFilesExistInOutput(module, "Foo.class", "Bar.class"); assertFilesNotExistInOutput(module, EXCLUDE_FILES); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); - checkExcludesNotAffectedToOutput("kotlinProject", "src/Excluded.kt", "src/dir/YetAnotherExcluded.kt"); + checkWhen(touch("src/foo.kt"), null, new String[] { klass("kotlinProject", "Foo")} ); + checkWhen(touch("src/Excluded.kt"), null, NOTHING ); + checkWhen(touch("src/dir/YetAnotherExcluded.kt"), null, NOTHING); } public void testExcludeFolderNonRecursivelyUsingCompilerSettings() { @@ -128,9 +128,11 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertFilesExistInOutput(module, "Foo.class", "Bar.class"); assertFilesNotExistInOutput(module, EXCLUDE_FILES); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/dir/subdir/bar.kt", "Bar"); - checkExcludesNotAffectedToOutput("kotlinProject", "src/dir/Excluded.kt", "src/dir/subdir/YetAnotherExcluded.kt"); + checkWhen(touch("src/foo.kt"), null, new String[] { klass("kotlinProject", "Foo")} ); + checkWhen(touch("src/dir/subdir/bar.kt"), null, new String[] { klass("kotlinProject", "Bar")} ); + + checkWhen(touch("src/dir/Excluded.kt"), null, NOTHING ); + checkWhen(touch("src/dir/subdir/YetAnotherExcluded.kt"), null, NOTHING); } public void testExcludeFolderRecursivelyUsingCompilerSettings() { @@ -140,10 +142,12 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertFilesExistInOutput(module, "Foo.class", "Bar.class"); assertFilesNotExistInOutput(module, EXCLUDE_FILES); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/foo.kt", "Foo"); - checkExcludesNotAffectedToOutput("kotlinProject", - "src/exclude/Excluded.kt", "src/exclude/YetAnotherExcluded.kt", - "src/exclude/subdir/Excluded.kt", "src/exclude/subdir/YetAnotherExcluded.kt"); + checkWhen(touch("src/foo.kt"), null, new String[] { klass("kotlinProject", "Foo")} ); + + checkWhen(touch("src/exclude/Excluded.kt"), null, NOTHING); + checkWhen(touch("src/exclude/YetAnotherExcluded.kt"), null, NOTHING); + checkWhen(touch("src/exclude/subdir/Excluded.kt"), null, NOTHING); + checkWhen(touch("src/exclude/subdir/YetAnotherExcluded.kt"), null, NOTHING); } public void testManyFiles() { @@ -152,22 +156,22 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { JpsModule module = myProject.getModules().get(0); assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class"); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/main.kt", "foo.FooPackage"); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/boo.kt", "boo.BooPackage"); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/Bar.kt", "foo.Bar"); + checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); + checkWhen(touch("src/Bar.kt"), null, new String[] {klass("kotlinProject", "foo.Bar")}); - checkPackageDeletedFromOutputWhen(Operation.DELETE, "kotlinProject", "src/main.kt", "foo.FooPackage"); + checkWhen(del("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); assertFilesNotExistInOutput(module, "foo/FooPackage.class"); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/boo.kt", "boo.BooPackage"); - checkClassesDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/Bar.kt", "foo.Bar"); + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); + checkWhen(touch("src/Bar.kt"), null, new String[] {klass("kotlinProject", "foo.Bar")}); } public void testKotlinProjectTwoFilesInOnePackage() { doTest(); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test1.kt", "_DefaultPackage"); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/test2.kt", "_DefaultPackage"); + checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")); + checkWhen(touch("src/test2.kt"), null, packageClasses("kotlinProject", "src/test2.kt", "_DefaultPackage")); } public void testKotlinJavaProject() { @@ -208,8 +212,8 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { result.assertSuccessful(); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "kotlinProject", "src/kt2.kt", "kt2.Kt2Package"); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module2", "module2/src/kt1.kt", "kt1.Kt1Package"); + checkWhen(touch("src/kt2.kt"), null, packageClasses("kotlinProject", "src/kt2.kt", "kt2.Kt2Package")); + checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Package")); } public void testCircularDependenciesSamePackage() throws IOException { @@ -223,8 +227,8 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertSameElements(getMethodsOfClass(facadeWithA), "a", "getA"); assertSameElements(getMethodsOfClass(facadeWithB), "b", "getB", "setB"); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module1", "module1/src/a.kt", "test.TestPackage"); - checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module2", "module2/src/b.kt", "test.TestPackage"); + checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage")); + checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")); } @NotNull @@ -232,7 +236,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { final Set result = new TreeSet(); new ClassReader(FileUtil.loadFileBytes(classFile)).accept(new ClassVisitor(Opcodes.ASM5) { @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { + public MethodVisitor visitMethod(int access, @NotNull String name, @NotNull String desc, String signature, String[] exceptions) { result.add(name); return null; } @@ -281,11 +285,6 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { return new File(outputDir, relativePath); } - private void checkExcludesNotAffectedToOutput(String module, String... excludeRelativePaths) { - for (String path : excludeRelativePaths) { - checkClassesDeletedFromOutputWhen(Operation.CHANGE, module, path, NOTHING); - } - } private static void assertFilesNotExistInOutput(JpsModule module, String... relativePaths) { String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false); @@ -310,60 +309,32 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { return builder.toString(); } - private void checkPackageDeletedFromOutputWhen( - Operation operation, - String moduleName, - String sourceFileName, - String packageClassFqNamesToDelete - ) { - File file = new File(workDir, sourceFileName); - String[] packageClasses = { packageClassFqNamesToDelete, getInternalNameForPackagePartClass(file, packageClassFqNamesToDelete) }; - - checkClassesDeletedFromOutputWhen(operation, moduleName, sourceFileName, packageClasses); - } - - private void checkClassesDeletedFromOutputWhen( - Operation operation, - final String moduleName, - String sourceFileName, - String... classFqNamesToDelete - ) { - String[] paths = ContainerUtil.map2Array(classFqNamesToDelete, String.class, new Function() { - @Override - public String fun(String classFqName) { - return outputPathInModuleByClassFqName(moduleName, classFqName); - } - }); - - checkFilesDeletedFromOutputWhen(operation, sourceFileName, paths); - } - - private void checkFilesDeletedFromOutputWhen(Operation operation, String sourceFileName, String... pathsToDelete) { - File file = new File(workDir, sourceFileName); - - if (operation == Operation.CHANGE) { - change(file.getAbsolutePath()); - } - else if(operation == Operation.DELETE) { - assertTrue("Can not delete file \"" + file.getAbsolutePath() + "\"", - file.delete()); - } - else { - fail("Unknown operation"); - } - + private void checkWhen(Action action, @Nullable String[] pathsToCompile, @Nullable String[] pathsToDelete) { + action.apply(); makeAll().assertSuccessful(); - assertDeleted(pathsToDelete); + if (pathsToCompile != null) { + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, pathsToCompile); + } + + if (pathsToDelete != null) { + assertDeleted(pathsToDelete); + } } - private static String outputPathInModuleByClassFqName(String moduleName, String classFqName) { + private static String klass(String moduleName, String classFqName) { String outputDirPrefix = "out/production/" + moduleName + "/"; return outputDirPrefix + classFqName.replace('.', '/') + ".class"; } - private static String getInternalNameForPackagePartClass(File sourceFile, String packageClassFqName) { - LightVirtualFile fakeVirtualFile = new LightVirtualFile(sourceFile.getPath()) { + private String[] packageClasses(String moduleName, String fileName, String packageClassFqName) { + return new String[] {klass(moduleName, packageClassFqName), packagePartClass(moduleName, fileName, packageClassFqName)}; + } + + private String packagePartClass(String moduleName, String fileName, String packageClassFqName) { + File file = new File(workDir, fileName); + LightVirtualFile fakeVirtualFile = new LightVirtualFile(file.getPath()) { + @NotNull @Override public String getPath() { // strip extra "/" from the beginning @@ -372,10 +343,42 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { }; FqName packagePartFqName = PackagePartClassUtils.getPackagePartFqName(new FqName(packageClassFqName), fakeVirtualFile); - return AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName); + return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName)); } private static enum Operation { CHANGE, DELETE } + + protected Action touch(String path) { + return new Action(Operation.CHANGE, path); + } + + protected Action del(String path) { + return new Action(Operation.DELETE, path); + } + + protected class Action { + private final Operation operation; + private final String path; + + protected Action(Operation operation, String path) { + this.operation = operation; + this.path = path; + } + + protected void apply() { + File file = new File(workDir, path); + + if (operation == Operation.CHANGE) { + change(file.getAbsolutePath()); + } + else if(operation == Operation.DELETE) { + assertTrue("Can not delete file \"" + file.getAbsolutePath() + "\"", file.delete()); + } + else { + fail("Unknown operation"); + } + } + } } From 2795640c6bfbd62c457e8634360b2eacd24c8f7f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 4 Jun 2014 02:29:17 +0400 Subject: [PATCH 0103/1557] Test package facade recompile after removing several files Original commit: 2f776affb35f537a301533f246fe58ae44697ad5 --- .../jet/jps/build/KotlinJpsBuildTest.java | 56 ++++++++++++++++++- .../ManyFilesForPackage/kotlinProject.iml | 12 ++++ .../ManyFilesForPackage/kotlinProject.ipr | 14 +++++ .../general/ManyFilesForPackage/src/Bar.kt | 5 ++ .../general/ManyFilesForPackage/src/boo.kt | 6 ++ .../general/ManyFilesForPackage/src/main.kt | 8 +++ 6 files changed, 98 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/testData/general/ManyFilesForPackage/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/ManyFilesForPackage/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/ManyFilesForPackage/src/Bar.kt create mode 100644 jps/jps-plugin/testData/general/ManyFilesForPackage/src/boo.kt create mode 100644 jps/jps-plugin/testData/general/ManyFilesForPackage/src/main.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index f143abfa048..ec46b8e1073 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -158,20 +158,63 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); - checkWhen(touch("src/Bar.kt"), null, new String[] {klass("kotlinProject", "foo.Bar")}); + checkWhen(touch("src/Bar.kt"), + new String[] {"src/Bar.kt", "src/boo.kt", "src/main.kt"}, + new String[] {klass("kotlinProject", "foo.Bar")}); - checkWhen(del("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); + checkWhen(del("src/main.kt"), + new String[] {"src/Bar.kt", "src/boo.kt"}, + packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); + assertFilesExistInOutput(module, "boo/BooPackage.class", "foo/Bar.class"); assertFilesNotExistInOutput(module, "foo/FooPackage.class"); checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); checkWhen(touch("src/Bar.kt"), null, new String[] {klass("kotlinProject", "foo.Bar")}); } + public void testManyFilesForPackage() { + doTest(); + + JpsModule module = myProject.getModules().get(0); + assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class"); + + checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); + checkWhen(touch("src/Bar.kt"), + new String[] {"src/Bar.kt", "src/boo.kt", "src/main.kt"}, + new String[] { + klass("kotlinProject", "foo.Bar"), + klass("kotlinProject", "foo.FooPackage"), + packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage")}); + + checkWhen(del("src/main.kt"), + new String[] {"src/Bar.kt", "src/boo.kt"}, + packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); + assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class"); + + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); + checkWhen(touch("src/Bar.kt"), null, + new String[] { + klass("kotlinProject", "foo.Bar"), + klass("kotlinProject", "foo.FooPackage"), + packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage") + }); + } + public void testKotlinProjectTwoFilesInOnePackage() { doTest(); checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")); checkWhen(touch("src/test2.kt"), null, packageClasses("kotlinProject", "src/test2.kt", "_DefaultPackage")); + + checkWhen(new Action[]{ del("src/test1.kt"), del("src/test2.kt") }, NOTHING, + new String[] { + packagePartClass("kotlinProject", "src/test1.kt", "_DefaultPackage"), + packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"), + klass("kotlinProject", "_DefaultPackage") + }); + + assertFilesNotExistInOutput(myProject.getModules().get(0), "_DefaultPackage.class"); } public void testKotlinJavaProject() { @@ -310,7 +353,14 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { } private void checkWhen(Action action, @Nullable String[] pathsToCompile, @Nullable String[] pathsToDelete) { - action.apply(); + checkWhen(new Action[]{action}, pathsToCompile, pathsToDelete); + } + + private void checkWhen(Action[] actions, @Nullable String[] pathsToCompile, @Nullable String[] pathsToDelete) { + for (Action action : actions) { + action.apply(); + } + makeAll().assertSuccessful(); if (pathsToCompile != null) { diff --git a/jps/jps-plugin/testData/general/ManyFilesForPackage/kotlinProject.iml b/jps/jps-plugin/testData/general/ManyFilesForPackage/kotlinProject.iml new file mode 100644 index 00000000000..0c4fb67a3d4 --- /dev/null +++ b/jps/jps-plugin/testData/general/ManyFilesForPackage/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/ManyFilesForPackage/kotlinProject.ipr b/jps/jps-plugin/testData/general/ManyFilesForPackage/kotlinProject.ipr new file mode 100644 index 00000000000..8226e21ade3 --- /dev/null +++ b/jps/jps-plugin/testData/general/ManyFilesForPackage/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/ManyFilesForPackage/src/Bar.kt b/jps/jps-plugin/testData/general/ManyFilesForPackage/src/Bar.kt new file mode 100644 index 00000000000..ae9e0be1836 --- /dev/null +++ b/jps/jps-plugin/testData/general/ManyFilesForPackage/src/Bar.kt @@ -0,0 +1,5 @@ +package foo + +class Bar + +fun other() {} diff --git a/jps/jps-plugin/testData/general/ManyFilesForPackage/src/boo.kt b/jps/jps-plugin/testData/general/ManyFilesForPackage/src/boo.kt new file mode 100644 index 00000000000..e9a050624da --- /dev/null +++ b/jps/jps-plugin/testData/general/ManyFilesForPackage/src/boo.kt @@ -0,0 +1,6 @@ +package boo + +import foo.Bar + +fun boo(bar: Bar) { +} diff --git a/jps/jps-plugin/testData/general/ManyFilesForPackage/src/main.kt b/jps/jps-plugin/testData/general/ManyFilesForPackage/src/main.kt new file mode 100644 index 00000000000..cfcbc18690b --- /dev/null +++ b/jps/jps-plugin/testData/general/ManyFilesForPackage/src/main.kt @@ -0,0 +1,8 @@ +package foo + +import boo.boo + +fun main(args: Array) { + val bar = Bar() + boo(bar) +} From 29920360c1195c6084d7b5a3aec0228e5aee5cbb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 14:30:46 +0400 Subject: [PATCH 0104/1557] Minor. Correct map with expected size creation. Original commit: 7742755de44f1c3c969588f90db29d7fd99cee45 --- .../org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index e06193a161d..fb71bfd94b5 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -36,6 +36,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName import java.util.HashSet import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache import java.util.HashMap +import com.google.common.collect.Maps public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { class object { @@ -203,7 +204,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { override fun read(`in`: DataInput): Map? { val size = `in`.readInt() - val map = HashMap(size) + val map = Maps.newHashMapWithExpectedSize(size)!! for (i in size.indices) { val name = IOUtil.readString(`in`)!! From 4c8ff1616e0137f80a072ed7526d678c1ded6cbf Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 14:33:47 +0400 Subject: [PATCH 0105/1557] Added tests with removing files and changing packages. Original commit: 111feb257451c204e52065788d5e7dd68ad47872 --- .../build/IncrementalJpsTestGenerated.java | 20 +++++++++++++++++++ .../incremental/filesExchangePackages/a.kt | 3 +++ .../incremental/filesExchangePackages/b.kt | 3 +++ .../filesExchangePackages/b.kt.new | 3 +++ .../filesExchangePackages/build.log | 17 ++++++++++++++++ .../incremental/filesExchangePackages/c.kt | 3 +++ .../filesExchangePackages/c.kt.new | 3 +++ .../multiplePackagesModified/a1.kt | 3 +++ .../multiplePackagesModified/a2.kt.new | 3 +++ .../multiplePackagesModified/b1.kt | 3 +++ .../multiplePackagesModified/b2.kt | 3 +++ .../multiplePackagesModified/b2.kt.delete | 0 .../multiplePackagesModified/build.log | 17 ++++++++++++++++ .../testData/incremental/packageRemoved/a.kt | 3 +++ .../incremental/packageRemoved/a.kt.delete | 0 .../testData/incremental/packageRemoved/b.kt | 3 +++ .../incremental/packageRemoved/b.kt.delete | 0 .../incremental/packageRemoved/build.log | 9 +++++++++ .../incremental/soleFileChangesPackage/a.kt | 3 +++ .../soleFileChangesPackage/a.kt.new | 4 ++++ .../soleFileChangesPackage/build.log | 7 +++++++ 21 files changed, 110 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/filesExchangePackages/a.kt create mode 100644 jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt create mode 100644 jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/filesExchangePackages/build.log create mode 100644 jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt create mode 100644 jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt create mode 100644 jps/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt create mode 100644 jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt create mode 100644 jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/multiplePackagesModified/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageRemoved/a.kt create mode 100644 jps/jps-plugin/testData/incremental/packageRemoved/a.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/packageRemoved/b.kt create mode 100644 jps/jps-plugin/testData/incremental/packageRemoved/b.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/packageRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt create mode 100644 jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/soleFileChangesPackage/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index c8359bf9773..8ac2e37fa69 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -56,11 +56,21 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/constantValue/"); } + @TestMetadata("filesExchangePackages") + public void testFilesExchangePackages() throws Exception { + doTest("jps-plugin/testData/incremental/filesExchangePackages/"); + } + @TestMetadata("independentClasses") public void testIndependentClasses() throws Exception { doTest("jps-plugin/testData/incremental/independentClasses/"); } + @TestMetadata("multiplePackagesModified") + public void testMultiplePackagesModified() throws Exception { + doTest("jps-plugin/testData/incremental/multiplePackagesModified/"); + } + @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { doTest("jps-plugin/testData/incremental/packageFileAdded/"); @@ -86,6 +96,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/packageFilesChangedInTurn/"); } + @TestMetadata("packageRemoved") + public void testPackageRemoved() throws Exception { + doTest("jps-plugin/testData/incremental/packageRemoved/"); + } + @TestMetadata("returnTypeChanged") public void testReturnTypeChanged() throws Exception { doTest("jps-plugin/testData/incremental/returnTypeChanged/"); @@ -96,6 +111,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/simpleClassDependency/"); } + @TestMetadata("soleFileChangesPackage") + public void testSoleFileChangesPackage() throws Exception { + doTest("jps-plugin/testData/incremental/soleFileChangesPackage/"); + } + @TestMetadata("topLevelFunctionSameSignature") public void testTopLevelFunctionSameSignature() throws Exception { doTest("jps-plugin/testData/incremental/topLevelFunctionSameSignature/"); diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/a.kt b/jps/jps-plugin/testData/incremental/filesExchangePackages/a.kt new file mode 100644 index 00000000000..058137655b8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/filesExchangePackages/a.kt @@ -0,0 +1,3 @@ +package foo + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt b/jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt new file mode 100644 index 00000000000..d838bdff1a4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt @@ -0,0 +1,3 @@ +package foo + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new b/jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new new file mode 100644 index 00000000000..75675fcebb4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new @@ -0,0 +1,3 @@ +package bar + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/filesExchangePackages/build.log new file mode 100644 index 00000000000..492218cc4a6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/filesExchangePackages/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/bar/BarPackage-c-*.class +out/production/module/bar/BarPackage.class +out/production/module/foo/FooPackage-b-*.class +out/production/module/foo/FooPackage.class +End of files +Compiling files: +src/b.kt +src/c.kt +End of files +Cleaning output files: +out/production/module/foo/FooPackage-a-*.class +out/production/module/foo/FooPackage.class +End of files +Compiling files: +src/a.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt b/jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt new file mode 100644 index 00000000000..ba081bb0bbd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt @@ -0,0 +1,3 @@ +package bar + +fun c() = "c" diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new b/jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new new file mode 100644 index 00000000000..e51d910bb9d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new @@ -0,0 +1,3 @@ +package foo + +fun c() = "c" diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt b/jps/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt new file mode 100644 index 00000000000..2bd705934bc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt @@ -0,0 +1,3 @@ +package a + +fun a1() = ":)" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new b/jps/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new new file mode 100644 index 00000000000..4e46bd9087f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new @@ -0,0 +1,3 @@ +package a + +fun a2() = ":))" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt b/jps/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt new file mode 100644 index 00000000000..21999b4bfe6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt @@ -0,0 +1,3 @@ +package b + +fun b1() = ":(" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt b/jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt new file mode 100644 index 00000000000..d2f49a90033 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt @@ -0,0 +1,3 @@ +package b + +fun b2() = ":((" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt.delete b/jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/multiplePackagesModified/build.log new file mode 100644 index 00000000000..914a8b69528 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiplePackagesModified/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/b/BPackage-b2-*.class +out/production/module/b/BPackage.class +End of files +Compiling files: +src/a2.kt +End of files +Cleaning output files: +out/production/module/a/APackage-a1-*.class +out/production/module/a/APackage.class +out/production/module/b/BPackage-b1-*.class +out/production/module/b/BPackage.class +End of files +Compiling files: +src/a1.kt +src/b1.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/a.kt b/jps/jps-plugin/testData/incremental/packageRemoved/a.kt new file mode 100644 index 00000000000..30ca24b5576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRemoved/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/a.kt.delete b/jps/jps-plugin/testData/incremental/packageRemoved/a.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/b.kt b/jps/jps-plugin/testData/incremental/packageRemoved/b.kt new file mode 100644 index 00000000000..5c782f47a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRemoved/b.kt @@ -0,0 +1,3 @@ +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/b.kt.delete b/jps/jps-plugin/testData/incremental/packageRemoved/b.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/packageRemoved/build.log new file mode 100644 index 00000000000..c307a197264 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRemoved/build.log @@ -0,0 +1,9 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Cleaning output files: +out/production/module/test/TestPackage-b-*.class +End of files +Compiling files: +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt b/jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt new file mode 100644 index 00000000000..058137655b8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt @@ -0,0 +1,3 @@ +package foo + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new b/jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new new file mode 100644 index 00000000000..eb3b7b757d2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new @@ -0,0 +1,4 @@ +package bar + +fun a() = "a" +fun aa() = "aa" diff --git a/jps/jps-plugin/testData/incremental/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/soleFileChangesPackage/build.log new file mode 100644 index 00000000000..3c8fdd9ea17 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/soleFileChangesPackage/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/foo/FooPackage-a-*.class +out/production/module/foo/FooPackage.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file From ab55592b5e683e583fb2d0231177474c92403a60 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 17:50:26 +0400 Subject: [PATCH 0106/1557] Added test with all types of constants. Original commit: 3ee92da6f0fe46c7203de1676259ca4bbff0022f --- .../build/IncrementalJpsTestGenerated.java | 5 +++++ .../incremental/allConstants/build.log | 22 +++++++++++++++++++ .../incremental/allConstants/const.kt | 12 ++++++++++ .../incremental/allConstants/const.kt.new.1 | 12 ++++++++++ .../incremental/allConstants/const.kt.new.2 | 12 ++++++++++ .../incremental/allConstants/usage.kt | 4 ++++ 6 files changed, 67 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/allConstants/build.log create mode 100644 jps/jps-plugin/testData/incremental/allConstants/const.kt create mode 100644 jps/jps-plugin/testData/incremental/allConstants/const.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/allConstants/const.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/allConstants/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 8ac2e37fa69..d91f934ed53 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -32,6 +32,11 @@ import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest; @SuppressWarnings("all") @TestMetadata("jps-plugin/testData/incremental") public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { + @TestMetadata("allConstants") + public void testAllConstants() throws Exception { + doTest("jps-plugin/testData/incremental/allConstants/"); + } + public void testAllFilesPresentInIncremental() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), false); } diff --git a/jps/jps-plugin/testData/incremental/allConstants/build.log b/jps/jps-plugin/testData/incremental/allConstants/build.log new file mode 100644 index 00000000000..22f4d62f635 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/allConstants/build.log @@ -0,0 +1,22 @@ +Cleaning output files: +out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/const.kt +End of files + + +Cleaning output files: +out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/test/Usage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/allConstants/const.kt b/jps/jps-plugin/testData/incremental/allConstants/const.kt new file mode 100644 index 00000000000..d0d300c1312 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/allConstants/const.kt @@ -0,0 +1,12 @@ +package test + +val b: Byte = 100 +val s: Short = 20000 +val i: Int = 2000000 +val l: Long = 2000000000000L +val f: Float = 3.14f +val d: Double = 3.14 +val bb: Boolean = true +val c: Char = '\u03c0' // pi symbol + +val str: String = ":)" diff --git a/jps/jps-plugin/testData/incremental/allConstants/const.kt.new.1 b/jps/jps-plugin/testData/incremental/allConstants/const.kt.new.1 new file mode 100644 index 00000000000..26796869ddc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/allConstants/const.kt.new.1 @@ -0,0 +1,12 @@ +package test + +val b: Byte = 50 + 50 +val s: Short = 10000 + 10000 +val i: Int = 1000000 + 1000000 +val l: Long = 1000000000000L + 1000000000000L +val f: Float = 0.0f + 3.14f +val d: Double = 0.0 + 3.14 +val bb: Boolean = !false +val c: Char = '\u03c0' // pi symbol + +val str: String = ":)" diff --git a/jps/jps-plugin/testData/incremental/allConstants/const.kt.new.2 b/jps/jps-plugin/testData/incremental/allConstants/const.kt.new.2 new file mode 100644 index 00000000000..668b4009dce --- /dev/null +++ b/jps/jps-plugin/testData/incremental/allConstants/const.kt.new.2 @@ -0,0 +1,12 @@ +package test + +val b: Byte = 0 +val s: Short = 0 +val i: Int = 0 +val l: Long = 0 +val f: Float = 0.0f +val d: Double = 0.0 +val bb: Boolean = false +val c: Char = 'x' + +val str: String = ":(" diff --git a/jps/jps-plugin/testData/incremental/allConstants/usage.kt b/jps/jps-plugin/testData/incremental/allConstants/usage.kt new file mode 100644 index 00000000000..a52256d1a83 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/allConstants/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated("$b $s $i $l $f $d $bb $c $str") +class Usage From 42ad41f4d55b2f36cf1b309da0fbfadbb8285e43 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 17:48:47 +0400 Subject: [PATCH 0107/1557] Changing lastModified manually in case when it wasn't changed after file overwriting. Original commit: ab442754d6bf2eb27e0ffbba3646254a26ffe48f --- .../jet/jps/build/AbstractIncrementalJpsTest.kt | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 1879580f7d1..edd44cf39c1 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -187,7 +187,16 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { private class ModifyContent(name: String, val dataFile: File) : Modification(name) { override fun perform(workDir: File) { - dataFile.copyTo(File(workDir, "src/$name")) + val file = File(workDir, "src/$name") + + val oldLastModified = file.lastModified() + dataFile.copyTo(file) + + val newLastModified = file.lastModified() + if (newLastModified <= oldLastModified) { + //Mac OS and some versions of Linux truncate timestamp to nearest second + file.setLastModified(oldLastModified + 1000) + } } } From 851a500b88c1ecd8d2d4d46dea028f01b76d2675 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 19:01:47 +0400 Subject: [PATCH 0108/1557] Removed ingoring files facility from incremental tests. It is not necessary since script.xml are not generated in out directory anymore. Original commit: 9dd627a23db033c5c01ec7c33bd08c9e2aabd603 --- .../jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../jet/jps/build/classFilesComparison.kt | 20 ++++++++----------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index edd44cf39c1..1878b410108 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -111,7 +111,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { rebuild() - assertEqualDirectories(outDir, outAfterMake, { it.name == "script.xml" }) + assertEqualDirectories(outDir, outAfterMake) FileUtil.delete(outAfterMake) } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index d5cf4a3667e..1811f5ed2d4 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass fun File.hash() = Files.hash(this, Hashing.crc32()) -fun getDirectoryString(dir: File, interestingPaths: List, ignore: (File) -> Boolean): String { +fun getDirectoryString(dir: File, interestingPaths: List): String { val buf = StringBuilder() val p = Printer(buf) @@ -52,10 +52,6 @@ fun getDirectoryString(dir: File, interestingPaths: List, ignore: (File) val children = listFiles!!.toList().sortBy { it.getName() }.sortBy { it.isDirectory() } for (child in children) { - if (ignore(child)) { - continue - } - if (child.isDirectory()) { p.println(child.name) addDirContent(child) @@ -82,10 +78,10 @@ fun getDirectoryString(dir: File, interestingPaths: List, ignore: (File) return buf.toString() } -fun getAllRelativePaths(dir: File, ignore: (File) -> Boolean): Set { +fun getAllRelativePaths(dir: File): Set { val result = HashSet() FileUtil.processFilesRecursively(dir) { - if (it!!.isFile() && !ignore(it)) { + if (it!!.isFile()) { result.add(FileUtil.getRelativePath(dir, it)!!) } @@ -95,16 +91,16 @@ fun getAllRelativePaths(dir: File, ignore: (File) -> Boolean): Set { return result } -fun assertEqualDirectories(expected: File, actual: File, ignore: (File) -> Boolean) { - val pathsInExpected = getAllRelativePaths(expected, ignore) - val pathsInActual = getAllRelativePaths(actual, ignore) +fun assertEqualDirectories(expected: File, actual: File) { + val pathsInExpected = getAllRelativePaths(expected) + val pathsInActual = getAllRelativePaths(actual) val changedPaths = Sets.intersection(pathsInExpected, pathsInActual) .filter { !Arrays.equals(File(expected, it).readBytes(), File(actual, it).readBytes()) } .sort() - val expectedString = getDirectoryString(expected, changedPaths, ignore) - val actualString = getDirectoryString(actual, changedPaths, ignore) + val expectedString = getDirectoryString(expected, changedPaths) + val actualString = getDirectoryString(actual, changedPaths) assertEquals(expectedString, actualString) } From 703972b02016f2901fbe3a1c0a790f47958d8523 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 20:52:28 +0400 Subject: [PATCH 0109/1557] Clearing constants data when removing file. Original commit: fc7dceba5ad3acc42f87246ae03f872c74ce9c29 --- .../jps/incremental/IncrementalCacheImpl.kt | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index fb71bfd94b5..5a42f4e58bb 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -74,13 +74,14 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.putPackagePartSourceData(moduleId, sourceFiles.first(), className) - return constantsMap.process(className, fileBytes) + return constantsMap.process(moduleId, sourceFiles.first(), fileBytes) } return false } public fun clearCacheForRemovedFile(moduleId: String, sourceFile: File) { + constantsMap.remove(moduleId, sourceFile) packagePartMap.remove(moduleId, sourceFile) } @@ -135,6 +136,10 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { ConstantsMapExternalizer ) + private fun getKey(moduleId: String, sourceFile: File): String { + return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() + } + private fun getConstantsMap(bytes: ByteArray): Map { val result = HashMap() @@ -150,12 +155,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return result } - public fun process(packagePartClass: JvmClassName, bytes: ByteArray): Boolean { - return put(packagePartClass, getConstantsMap(bytes)) + public fun process(moduleId: String, file: File, bytes: ByteArray): Boolean { + return put(moduleId, file, getConstantsMap(bytes)) } - private fun put(packagePartClass: JvmClassName, constantsMap: Map): Boolean { - val key = packagePartClass.getInternalName() + private fun put(moduleId: String, file: File, constantsMap: Map): Boolean { + val key = getKey(moduleId, file) val oldMap = map[key] if (oldMap == constantsMap) { @@ -165,6 +170,10 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return true } + public fun remove(moduleId: String, file: File) { + map.remove(getKey(moduleId, file)) + } + public fun close() { map.close() } From ed03bec629186d63ddd75c13284c91b2e0f2978c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 21:32:15 +0400 Subject: [PATCH 0110/1557] Writing class names in proto map (to avoid ambiguities) Original commit: 5c49eb0a540482caef80629746740faa5fe50006 --- .../jps/incremental/IncrementalCacheImpl.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 5a42f4e58bb..6a4e2c54947 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -37,6 +37,7 @@ import java.util.HashSet import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache import java.util.HashMap import com.google.common.collect.Maps +import org.jetbrains.jet.lang.resolve.java.PackageClassUtils public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { class object { @@ -55,16 +56,15 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { if (classNameAndHeader == null) return false val (className, header) = classNameAndHeader - val classFqName = className.getFqNameForClassNameWithoutDollars() val annotationDataEncoded = header.annotationData if (annotationDataEncoded != null) { val data = BitEncoding.decodeBytes(annotationDataEncoded) when (header.kind) { KotlinClassHeader.Kind.PACKAGE_FACADE -> { - return protoMap.put(moduleId, classFqName.parent(), data) + return protoMap.put(moduleId, className, data) } KotlinClassHeader.Kind.CLASS -> { - return protoMap.put(moduleId, classFqName, data) + return protoMap.put(moduleId, className, data) } else -> { throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}") @@ -90,7 +90,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } public override fun getPackageData(moduleId: String, fqName: String): ByteArray? { - return protoMap[moduleId, fqName] + return protoMap[moduleId, JvmClassName.byFqNameWithoutInnerClasses(PackageClassUtils.getPackageClassFqName(FqName(fqName)))] } public fun close() { @@ -106,12 +106,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { ByteArrayExternalizer ) - private fun getKeyString(moduleId: String, fqName: FqName): String { - return moduleId + ":" + fqName + private fun getKeyString(moduleId: String, className: JvmClassName): String { + return moduleId + ":" + className.getInternalName() } - public fun put(moduleId: String, fqName: FqName, data: ByteArray): Boolean { - val key = getKeyString(moduleId, fqName) + public fun put(moduleId: String, className: JvmClassName, data: ByteArray): Boolean { + val key = getKeyString(moduleId, className) val oldData = map[key] if (Arrays.equals(data, oldData)) { return false @@ -120,8 +120,8 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return true } - public fun get(moduleId: String, fqName: String): ByteArray? { - return map[getKeyString(moduleId, FqName(fqName))] + public fun get(moduleId: String, className: JvmClassName): ByteArray? { + return map[getKeyString(moduleId, className)] } public fun close() { From 4462ad48eed50a49bec40d7246e3f49a31d0a98b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 21:49:20 +0400 Subject: [PATCH 0111/1557] Minor. Fixed mixed up error messages in test. Original commit: 471e3e80f29653a37aa1a8b0532b845c84bec7e3 --- .../org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 1878b410108..3fb918b3e7e 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -88,10 +88,10 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val haveFilesWithNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)\\.\\d+$") }?.isNotEmpty() ?: false if (haveFilesWithoutNumbers && haveFilesWithNumbers) { - fail("Bad test data format: no files ending with \".new\" or \".delete\" found") + fail("Bad test data format: files ending with both unnumbered and numbered \".new\"/\".delete\" were found") } if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { - fail("Bad test data format: files ending with both unnumbered and numbered \".new\"/\".delete\" were found") + fail("Bad test data format: no files ending with \".new\" or \".delete\" found") } if (haveFilesWithoutNumbers) { From 18113ed61a87529b77c9d65e2ba386ebea15b66f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 20 Jun 2014 21:51:27 +0400 Subject: [PATCH 0112/1557] Added clearing proto data in incremental cache. Original commit: 8479ca76b0e815cc104ca7143a2b355dc45a7a77 --- .../jet/jps/build/KotlinBuilder.java | 11 +++- .../jps/incremental/IncrementalCacheImpl.kt | 59 +++++++++++++++++-- .../build/IncrementalJpsTestGenerated.java | 15 +++++ .../incremental/classRecreated/A.kt.new.2 | 3 + .../testData/incremental/classRecreated/a.kt | 3 + .../incremental/classRecreated/a.kt.delete.1 | 1 + .../incremental/classRecreated/build.log | 17 ++++++ .../incremental/classRecreated/other.kt | 4 ++ .../incremental/packageRecreated/a.kt | 3 + .../packageRecreated/a.kt.delete.1 | 1 + .../incremental/packageRecreated/b.kt.new.2 | 3 + .../incremental/packageRecreated/build.log | 11 ++++ .../packageRecreatedAfterRenaming/a.kt | 3 + .../packageRecreatedAfterRenaming/a.kt.new.1 | 3 + .../packageRecreatedAfterRenaming/b.kt.new.2 | 3 + .../packageRecreatedAfterRenaming/build.log | 19 ++++++ 16 files changed, 153 insertions(+), 6 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classRecreated/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classRecreated/a.kt create mode 100644 jps/jps-plugin/testData/incremental/classRecreated/a.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/classRecreated/build.log create mode 100644 jps/jps-plugin/testData/incremental/classRecreated/other.kt create mode 100644 jps/jps-plugin/testData/incremental/packageRecreated/a.kt create mode 100644 jps/jps-plugin/testData/incremental/packageRecreated/a.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/packageRecreated/b.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/packageRecreated/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt create mode 100644 jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/b.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/build.log diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 8faa3f15c23..853be538fc2 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.jps.build; +import com.google.common.collect.Lists; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.StreamUtil; @@ -23,6 +24,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; +import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.KotlinVersion; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; @@ -222,11 +224,18 @@ public class KotlinBuilder extends ModuleLevelBuilder { IncrementalCacheImpl cache = new IncrementalCacheImpl(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); try { + List> moduleIdsAndFiles = Lists.newArrayList(); + Map outDirectories = new HashMap(); + for (ModuleBuildTarget target : chunk.getTargets()) { + String targetId = target.getId(); + outDirectories.put(targetId, target.getOutputDir()); + for (String file : dirtyFilesHolder.getRemovedFiles(target)) { - cache.clearCacheForRemovedFile(target.getId(), new File(file)); + moduleIdsAndFiles.add(new Pair(targetId, new File(file))); } } + cache.clearCacheForRemovedFiles(moduleIdsAndFiles, outDirectories); boolean significantChanges = false; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 6a4e2c54947..56a64060821 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -17,7 +17,6 @@ package org.jetbrains.jet.jps.incremental import java.io.File -import com.intellij.util.io.PersistentMap import com.intellij.util.io.PersistentHashMap import java.io.DataOutput import com.intellij.util.io.IOUtil @@ -38,6 +37,8 @@ import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache import java.util.HashMap import com.google.common.collect.Maps import org.jetbrains.jet.lang.resolve.java.PackageClassUtils +import com.intellij.util.containers.MultiMap +import com.intellij.openapi.util.io.FileUtil public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { class object { @@ -80,9 +81,13 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return false } - public fun clearCacheForRemovedFile(moduleId: String, sourceFile: File) { - constantsMap.remove(moduleId, sourceFile) - packagePartMap.remove(moduleId, sourceFile) + public fun clearCacheForRemovedFiles(moduleIdsAndFiles: Collection>, outDirectories: Map) { + for ((moduleId, sourceFile) in moduleIdsAndFiles) { + constantsMap.remove(moduleId, sourceFile) + packagePartMap.remove(moduleId, sourceFile) + } + + protoMap.clearOutdated(outDirectories) } public override fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map): Collection { @@ -100,7 +105,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } private inner class ProtoMap { - private val map: PersistentMap = PersistentHashMap( + private val map: PersistentHashMap = PersistentHashMap( File(baseDir, PROTO_MAP), EnumeratorStringDescriptor(), ByteArrayExternalizer @@ -110,6 +115,11 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return moduleId + ":" + className.getInternalName() } + private fun parseKeyString(key: String): Pair { + val colon = key.lastIndexOf(":") + return Pair(key.substring(0, colon), JvmClassName.byInternalName(key.substring(colon + 1))) + } + public fun put(moduleId: String, className: JvmClassName, data: ByteArray): Boolean { val key = getKeyString(moduleId, className) val oldData = map[key] @@ -124,6 +134,27 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return map[getKeyString(moduleId, className)] } + public fun clearOutdated(outDirectories: Map) { + val keysToRemove = HashSet() + + map.processKeys { key -> + val (moduleId, className) = parseKeyString(key!!) + val outDir = outDirectories[moduleId] + if (outDir != null) { + val classFile = File(outDir, FileUtil.toSystemDependentName(className.getInternalName()) + ".class") + if (!classFile.exists()) { + keysToRemove.add(key) + } + } + + true + } + + for (key in keysToRemove) { + map.remove(key) + } + } + public fun close() { map.close() } @@ -283,6 +314,24 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return result } + public fun getModulesToPackages(): MultiMap { + val result = MultiMap.createSet() + + map.processKeysWithExistingMapping { key -> + val indexOf = key!!.indexOf(File.pathSeparator) + val moduleId = key.substring(0, indexOf) + val packagePartClassName = map[key]!! + + val packageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + + result.putValue(moduleId, packageFqName) + + true + } + + return result + } + public fun close() { map.close() } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index d91f934ed53..c475e1dda7a 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -41,6 +41,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), false); } + @TestMetadata("classRecreated") + public void testClassRecreated() throws Exception { + doTest("jps-plugin/testData/incremental/classRecreated/"); + } + @TestMetadata("classSignatureChanged") public void testClassSignatureChanged() throws Exception { doTest("jps-plugin/testData/incremental/classSignatureChanged/"); @@ -101,6 +106,16 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/packageFilesChangedInTurn/"); } + @TestMetadata("packageRecreated") + public void testPackageRecreated() throws Exception { + doTest("jps-plugin/testData/incremental/packageRecreated/"); + } + + @TestMetadata("packageRecreatedAfterRenaming") + public void testPackageRecreatedAfterRenaming() throws Exception { + doTest("jps-plugin/testData/incremental/packageRecreatedAfterRenaming/"); + } + @TestMetadata("packageRemoved") public void testPackageRemoved() throws Exception { doTest("jps-plugin/testData/incremental/packageRemoved/"); diff --git a/jps/jps-plugin/testData/incremental/classRecreated/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classRecreated/A.kt.new.2 new file mode 100644 index 00000000000..1b0178fd9be --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classRecreated/A.kt.new.2 @@ -0,0 +1,3 @@ +package test + +class A diff --git a/jps/jps-plugin/testData/incremental/classRecreated/a.kt b/jps/jps-plugin/testData/incremental/classRecreated/a.kt new file mode 100644 index 00000000000..1b0178fd9be --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classRecreated/a.kt @@ -0,0 +1,3 @@ +package test + +class A diff --git a/jps/jps-plugin/testData/incremental/classRecreated/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/classRecreated/a.kt.delete.1 new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classRecreated/a.kt.delete.1 @@ -0,0 +1 @@ + diff --git a/jps/jps-plugin/testData/incremental/classRecreated/build.log b/jps/jps-plugin/testData/incremental/classRecreated/build.log new file mode 100644 index 00000000000..d59630c7ce7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classRecreated/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/test/A.class +End of files +Compiling files: +End of files + + +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/test/TestPackage-other-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/other.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classRecreated/other.kt b/jps/jps-plugin/testData/incremental/classRecreated/other.kt new file mode 100644 index 00000000000..dc156549ce5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classRecreated/other.kt @@ -0,0 +1,4 @@ +package test + +fun other() { +} diff --git a/jps/jps-plugin/testData/incremental/packageRecreated/a.kt b/jps/jps-plugin/testData/incremental/packageRecreated/a.kt new file mode 100644 index 00000000000..30ca24b5576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRecreated/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageRecreated/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/packageRecreated/a.kt.delete.1 new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRecreated/a.kt.delete.1 @@ -0,0 +1 @@ + diff --git a/jps/jps-plugin/testData/incremental/packageRecreated/b.kt.new.2 b/jps/jps-plugin/testData/incremental/packageRecreated/b.kt.new.2 new file mode 100644 index 00000000000..5c782f47a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRecreated/b.kt.new.2 @@ -0,0 +1,3 @@ +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/packageRecreated/build.log new file mode 100644 index 00000000000..73408189236 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRecreated/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +End of files + + +Compiling files: +src/b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt b/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt new file mode 100644 index 00000000000..30ca24b5576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt.new.1 b/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt.new.1 new file mode 100644 index 00000000000..9d39f81713e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt.new.1 @@ -0,0 +1,3 @@ +package test2 + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/b.kt.new.2 b/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/b.kt.new.2 new file mode 100644 index 00000000000..5c782f47a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/b.kt.new.2 @@ -0,0 +1,3 @@ +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/build.log new file mode 100644 index 00000000000..7cb5ae7d3e1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/build.log @@ -0,0 +1,19 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files + + +Compiling files: +src/b.kt +End of files +Cleaning output files: +out/production/module/test2/Test2Package-a-*.class +out/production/module/test2/Test2Package.class +End of files +Compiling files: +src/a.kt +End of files From bdc735f48f7c295af6fc02687e669ac73d852155 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 23 Jun 2014 14:23:26 +0400 Subject: [PATCH 0113/1557] Added tests with class referenced from proto. Original commit: ca4ac43add86c8718e1c04a01c700d977662fa03 --- .../jps/build/IncrementalJpsTestGenerated.java | 10 ++++++++++ .../incremental/dependencyClassReferenced/a.kt | 6 ++++++ .../dependencyClassReferenced/a.kt.new | 6 ++++++ .../incremental/dependencyClassReferenced/b.kt | 6 ++++++ .../dependencyClassReferenced/build.log | 7 +++++++ .../incremental/ourClassReferenced/Klass.kt | 3 +++ .../ourClassReferenced/Klass.kt.new.2 | 3 +++ .../incremental/ourClassReferenced/a.kt | 8 ++++++++ .../incremental/ourClassReferenced/a.kt.new.1 | 8 ++++++++ .../incremental/ourClassReferenced/a.kt.new.2 | 8 ++++++++ .../incremental/ourClassReferenced/b.kt | 8 ++++++++ .../incremental/ourClassReferenced/build.log | 18 ++++++++++++++++++ 12 files changed, 91 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt create mode 100644 jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt create mode 100644 jps/jps-plugin/testData/incremental/dependencyClassReferenced/build.log create mode 100644 jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt create mode 100644 jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt create mode 100644 jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/ourClassReferenced/b.kt create mode 100644 jps/jps-plugin/testData/incremental/ourClassReferenced/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index c475e1dda7a..487dbaee338 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -66,6 +66,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/constantValue/"); } + @TestMetadata("dependencyClassReferenced") + public void testDependencyClassReferenced() throws Exception { + doTest("jps-plugin/testData/incremental/dependencyClassReferenced/"); + } + @TestMetadata("filesExchangePackages") public void testFilesExchangePackages() throws Exception { doTest("jps-plugin/testData/incremental/filesExchangePackages/"); @@ -81,6 +86,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/multiplePackagesModified/"); } + @TestMetadata("ourClassReferenced") + public void testOurClassReferenced() throws Exception { + doTest("jps-plugin/testData/incremental/ourClassReferenced/"); + } + @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { doTest("jps-plugin/testData/incremental/packageFileAdded/"); diff --git a/jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt b/jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt new file mode 100644 index 00000000000..89692d95832 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt @@ -0,0 +1,6 @@ +package test + +fun a(ref: kotlin.test.Asserter) { + b(ref) + println(":)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new b/jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new new file mode 100644 index 00000000000..89692d95832 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new @@ -0,0 +1,6 @@ +package test + +fun a(ref: kotlin.test.Asserter) { + b(ref) + println(":)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt b/jps/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt new file mode 100644 index 00000000000..9addb367f04 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt @@ -0,0 +1,6 @@ +package test + +fun b(ref: kotlin.test.Asserter) { + a(ref) + println(":)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/dependencyClassReferenced/build.log new file mode 100644 index 00000000000..37112dda098 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/dependencyClassReferenced/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt b/jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt new file mode 100644 index 00000000000..a8ac38430eb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt @@ -0,0 +1,3 @@ +package klass + +class Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2 b/jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2 new file mode 100644 index 00000000000..a8ac38430eb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2 @@ -0,0 +1,3 @@ +package klass + +class Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt b/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt new file mode 100644 index 00000000000..3682a9d2913 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt @@ -0,0 +1,8 @@ +package test + +import klass.* + +fun a(klass: Klass) { + b(klass) + println(":)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1 b/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1 new file mode 100644 index 00000000000..3682a9d2913 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1 @@ -0,0 +1,8 @@ +package test + +import klass.* + +fun a(klass: Klass) { + b(klass) + println(":)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2 b/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2 new file mode 100644 index 00000000000..3682a9d2913 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2 @@ -0,0 +1,8 @@ +package test + +import klass.* + +fun a(klass: Klass) { + b(klass) + println(":)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/b.kt b/jps/jps-plugin/testData/incremental/ourClassReferenced/b.kt new file mode 100644 index 00000000000..0d41f8e3417 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/ourClassReferenced/b.kt @@ -0,0 +1,8 @@ +package test + +import klass.* + +fun b(klass: Klass) { + a(klass) + println(":)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/ourClassReferenced/build.log new file mode 100644 index 00000000000..ccf56d9e65b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/ourClassReferenced/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files + + +Cleaning output files: +out/production/module/klass/Klass.class +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/Klass.kt +src/a.kt +End of files From df1a3f7a55c7d055cf8b478b39600fe9dc945bb7 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 24 Jun 2014 16:29:00 +0400 Subject: [PATCH 0114/1557] Added exceptions for proguard: constants are used in JPS plugin. Original commit: 1ce0e6cd3e7d2934f04fba1ddae41657a972484c --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 853be538fc2..7df7be35870 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -224,7 +224,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { IncrementalCacheImpl cache = new IncrementalCacheImpl(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); try { - List> moduleIdsAndFiles = Lists.newArrayList(); + List> moduleIdsAndFiles = new ArrayList>(); Map outDirectories = new HashMap(); for (ModuleBuildTarget target : chunk.getTargets()) { From ac3cbf547c259275ce6acfbea23a11740ccddf8b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 20 May 2014 20:20:53 +0400 Subject: [PATCH 0115/1557] Generate "$kotlinClass"/"$kotlinPackage" reflection fields to every class Some seemingly irrelevant tests were changed because now there's in almost every class and class initialization begins with executing it Original commit: 59777e7df641b962ca50285b5d92f72202b2ead2 --- .../test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 4 ++-- .../general/CircularDependenciesSamePackage/module1/src/a.kt | 2 +- .../general/CircularDependenciesSamePackage/module2/src/b.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 92ed4cf7664..695ef09e8c5 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -220,8 +220,8 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { // Check that outputs are located properly File facadeWithA = findFileInOutputDir(findModule("module1"), "test/TestPackage.class"); File facadeWithB = findFileInOutputDir(findModule("module2"), "test/TestPackage.class"); - assertSameElements(getMethodsOfClass(facadeWithA), "a", "getA"); - assertSameElements(getMethodsOfClass(facadeWithB), "b", "getB", "setB"); + assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "getA"); + assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "getB", "setB"); checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module1", "module1/src/a.kt", "test.TestPackage"); checkPackageDeletedFromOutputWhen(Operation.CHANGE, "module2", "module2/src/b.kt", "test.TestPackage"); diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt index 4987d3f36ec..8311da66012 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/src/a.kt @@ -4,4 +4,4 @@ fun a() { } -val a = "" \ No newline at end of file +val a = "" diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt index 1dcef1df913..b04c387135d 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module2/src/b.kt @@ -4,4 +4,4 @@ fun b() { } -var b = "" \ No newline at end of file +var b = b() From 0d7b31df2b6aaf7bf573fea53baddb1399fd1b2d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 25 Jun 2014 18:10:18 +0400 Subject: [PATCH 0116/1557] Added debug flag for class files comparison. Original commit: 55a2e8edf849025ab1948d02ea7de8d107412b22 --- .../jetbrains/jet/jps/build/classFilesComparison.kt | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index 1811f5ed2d4..1bc2940535e 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -37,6 +37,9 @@ import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf import java.util.Arrays import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass +// Set this to true if you want to dump all bytecode (test will fail in this case) +val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" + fun File.hash() = Files.hash(this, Hashing.crc32()) fun getDirectoryString(dir: File, interestingPaths: List): String { @@ -95,13 +98,18 @@ fun assertEqualDirectories(expected: File, actual: File) { val pathsInExpected = getAllRelativePaths(expected) val pathsInActual = getAllRelativePaths(actual) - val changedPaths = Sets.intersection(pathsInExpected, pathsInActual) - .filter { !Arrays.equals(File(expected, it).readBytes(), File(actual, it).readBytes()) } + val commonPaths = Sets.intersection(pathsInExpected, pathsInActual) + val changedPaths = commonPaths + .filter { DUMP_ALL || !Arrays.equals(File(expected, it).readBytes(), File(actual, it).readBytes()) } .sort() val expectedString = getDirectoryString(expected, changedPaths) val actualString = getDirectoryString(actual, changedPaths) + if (DUMP_ALL) { + assertEquals(expectedString, actualString + " ") + } + assertEquals(expectedString, actualString) } From b86d7668b05011d11e5a67087896fb8286428aad Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 30 Jun 2014 21:50:34 +0400 Subject: [PATCH 0117/1557] Added hacky checks for accessing compiled functions from our module via package part instead of facade. #KT-4590 fixed Original commit: 65010662742bb8313c047e1d4a1eb73d5dc9c5b7 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 10 ++++++++++ .../incremental/accessingFunctionsViaPackagePart/a.kt | 3 +++ .../incremental/accessingFunctionsViaPackagePart/b.kt | 3 +++ .../accessingFunctionsViaPackagePart/b.kt.new | 3 +++ .../accessingFunctionsViaPackagePart/build.log | 9 +++++++++ .../accessingFunctionsViaPackagePart/other.kt | 3 +++ .../accessingFunctionsViaPackagePart/usage.kt | 5 +++++ .../accessingFunctionsViaPackagePart/usage.kt.new | 5 +++++ .../incremental/accessingPropertiesViaField/a.kt | 3 +++ .../incremental/accessingPropertiesViaField/b.kt | 4 ++++ .../incremental/accessingPropertiesViaField/b.kt.new | 3 +++ .../incremental/accessingPropertiesViaField/build.log | 9 +++++++++ .../incremental/accessingPropertiesViaField/other.kt | 3 +++ .../incremental/accessingPropertiesViaField/usage.kt | 8 ++++++++ .../accessingPropertiesViaField/usage.kt.new | 8 ++++++++ 15 files changed, 79 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 487dbaee338..cc039994a2f 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -32,6 +32,16 @@ import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest; @SuppressWarnings("all") @TestMetadata("jps-plugin/testData/incremental") public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { + @TestMetadata("accessingFunctionsViaPackagePart") + public void testAccessingFunctionsViaPackagePart() throws Exception { + doTest("jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/"); + } + + @TestMetadata("accessingPropertiesViaField") + public void testAccessingPropertiesViaField() throws Exception { + doTest("jps-plugin/testData/incremental/accessingPropertiesViaField/"); + } + @TestMetadata("allConstants") public void testAllConstants() throws Exception { doTest("jps-plugin/testData/incremental/allConstants/"); diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt new file mode 100644 index 00000000000..0228de5e71d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt new file mode 100644 index 00000000000..f3809d03866 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt @@ -0,0 +1,3 @@ +package test + +fun b() = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new new file mode 100644 index 00000000000..f3809d03866 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new @@ -0,0 +1,3 @@ +package test + +fun b() = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log new file mode 100644 index 00000000000..ee902811972 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log @@ -0,0 +1,9 @@ +Cleaning output files: +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/b.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt new file mode 100644 index 00000000000..2ff821a2d52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() = "other" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt new file mode 100644 index 00000000000..db702d74fea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + println(a() + b() + other.other()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new new file mode 100644 index 00000000000..db702d74fea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + println(a() + b() + other.other()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt new file mode 100644 index 00000000000..14b203d66ae --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt @@ -0,0 +1,3 @@ +package test + +var a = "a" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt new file mode 100644 index 00000000000..ac2faa5147e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt @@ -0,0 +1,4 @@ +// TODO add var +package test + +var b = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new new file mode 100644 index 00000000000..43cf69057ff --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new @@ -0,0 +1,3 @@ +package test + +var b = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log new file mode 100644 index 00000000000..5e565b356f6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log @@ -0,0 +1,9 @@ + Cleaning output files: +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/b.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt new file mode 100644 index 00000000000..aeb30beb244 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt @@ -0,0 +1,3 @@ +package other + +var other = "other" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt new file mode 100644 index 00000000000..024de4a9c42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt @@ -0,0 +1,8 @@ +package test + +fun main(args: Array) { + val x = a + b + other.other + a = "aa" + b = "bb" + other.other = "other.other" +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new new file mode 100644 index 00000000000..024de4a9c42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new @@ -0,0 +1,8 @@ +package test + +fun main(args: Array) { + val x = a + b + other.other + a = "aa" + b = "bb" + other.other = "other.other" +} \ No newline at end of file From bf5c65bef68ec2b8e7e43da5ea27fbc6fad76349 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 1 Jul 2014 15:59:48 +0400 Subject: [PATCH 0118/1557] Basic detection for bytecode of inline functions in incremental compilation. Basic rule is: bytecode of inline function changed -> recompile everything. Original commit: 6c8a9ba378332db7c373e2a4cd10be70de030302 --- .../jps/incremental/IncrementalCacheImpl.kt | 108 +++++++++++++++++- .../build/IncrementalJpsTestGenerated.java | 27 ++++- .../classInlineFunctionChanged/build.log | 13 +++ .../classInlineFunctionChanged/inline.kt | 8 ++ .../classInlineFunctionChanged/inline.kt.new | 8 ++ .../classInlineFunctionChanged/usage.kt | 5 + .../classInlineFunctionUnchanged/build.log | 6 + .../classInlineFunctionUnchanged/inline.kt | 8 ++ .../inline.kt.new | 8 ++ .../classInlineFunctionUnchanged/usage.kt | 5 + .../packageInlineFunctionChanged/build.log | 14 +++ .../packageInlineFunctionChanged/inline.kt | 6 + .../inline.kt.new | 6 + .../packageInlineFunctionChanged/usage.kt | 5 + .../build.log | 7 ++ .../inline.kt | 6 + .../usage.kt | 5 + .../usage.kt.new | 5 + .../packageInlineFunctionUnchanged/build.log | 7 ++ .../packageInlineFunctionUnchanged/inline.kt | 6 + .../inline.kt.new | 6 + .../packageInlineFunctionUnchanged/usage.kt | 5 + 22 files changed, 269 insertions(+), 5 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 56a64060821..4250d96496d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -39,20 +39,25 @@ import com.google.common.collect.Maps import org.jetbrains.jet.lang.resolve.java.PackageClassUtils import com.intellij.util.containers.MultiMap import com.intellij.openapi.util.io.FileUtil +import com.google.common.hash.Hashing + +val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { class object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" + val INLINE_FUNCTIONS = "inline-functions.tab" val PACKAGE_PARTS = "package-parts.tab" } private val protoMap = ProtoMap() private val constantsMap = ConstantsMap() + private val inlineFunctionsMap = InlineFunctionsMap() private val packagePartMap = PackagePartMap() - public fun saveFileToCache(moduleId: String, sourceFiles: Collection, file: File): Boolean { - val fileBytes = file.readBytes() + public fun saveFileToCache(moduleId: String, sourceFiles: Collection, classFile: File): Boolean { + val fileBytes = classFile.readBytes() val classNameAndHeader = VirtualFileKotlinClass.readClassNameAndHeader(fileBytes) if (classNameAndHeader == null) return false @@ -65,7 +70,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return protoMap.put(moduleId, className, data) } KotlinClassHeader.Kind.CLASS -> { - return protoMap.put(moduleId, className, data) + return inlineFunctionsMap.process(moduleId, sourceFiles.first(), fileBytes) or protoMap.put(moduleId, className, data) } else -> { throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}") @@ -75,7 +80,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.putPackagePartSourceData(moduleId, sourceFiles.first(), className) - return constantsMap.process(moduleId, sourceFiles.first(), fileBytes) + return inlineFunctionsMap.process(moduleId, sourceFiles.first(), fileBytes) or constantsMap.process(moduleId, sourceFiles.first(), fileBytes) } return false @@ -84,6 +89,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { public fun clearCacheForRemovedFiles(moduleIdsAndFiles: Collection>, outDirectories: Map) { for ((moduleId, sourceFile) in moduleIdsAndFiles) { constantsMap.remove(moduleId, sourceFile) + inlineFunctionsMap.remove(moduleId, sourceFile) packagePartMap.remove(moduleId, sourceFile) } @@ -101,6 +107,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { public fun close() { protoMap.close() constantsMap.close() + inlineFunctionsMap.close() packagePartMap.close() } @@ -268,6 +275,99 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } } + private inner class InlineFunctionsMap { + private val map: PersistentHashMap> = PersistentHashMap( + File(baseDir, INLINE_FUNCTIONS), + EnumeratorStringDescriptor(), + InlineFunctionsMapExternalizer + ) + + private fun getKey(moduleId: String, sourceFile: File): String { + return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() + } + + private fun getInlineFunctionsMap(bytes: ByteArray): Map { + val result = HashMap() + + ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { + override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { + val dummyClassWriter = ClassWriter(Opcodes.ASM5) + return object : MethodVisitor(Opcodes.ASM5, dummyClassWriter.visitMethod(0, name, desc, null, exceptions)) { + var hasInlineAnnotation = false + + override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? { + if (desc == INLINE_ANNOTATION_DESC) { + hasInlineAnnotation = true + } + return null + } + + override fun visitEnd() { + if (hasInlineAnnotation) { + val dummyBytes = dummyClassWriter.toByteArray()!! + val hash = Hashing.md5()!!.hashBytes(dummyBytes)!!.asLong() + + result[name + desc] = hash + } + } + } + } + + }, 0) + + return result + } + + public fun process(moduleId: String, file: File, bytes: ByteArray): Boolean { + return put(moduleId, file, getInlineFunctionsMap(bytes)) + } + + private fun put(moduleId: String, file: File, inlineFunctionsMap: Map): Boolean { + val key = getKey(moduleId, file) + + val oldMap = map[key] + if (oldMap == inlineFunctionsMap) { + return false + } + map.put(key, inlineFunctionsMap) + return true + } + + public fun remove(moduleId: String, file: File) { + map.remove(getKey(moduleId, file)) + } + + public fun close() { + map.close() + } + } + + private object InlineFunctionsMapExternalizer: DataExternalizer> { + override fun save(out: DataOutput, map: Map?) { + out.writeInt(map!!.size) + for (name in map.keySet()) { + IOUtil.writeString(name, out) + out.writeLong(map[name]!!) + } + } + + override fun read(`in`: DataInput): Map? { + val size = `in`.readInt() + val map = Maps.newHashMapWithExpectedSize(size)!! + + for (i in size.indices) { + val name = IOUtil.readString(`in`)!! + val value = `in`.readLong() + + map[name] = value + } + + return map + } + + } + + private inner class PackagePartMap { // Format of serialization to string: --> private val map: PersistentHashMap = PersistentHashMap( diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index cc039994a2f..9ccc3cd59a1 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -51,6 +51,16 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), false); } + @TestMetadata("classInlineFunctionChanged") + public void testClassInlineFunctionChanged() throws Exception { + doTest("jps-plugin/testData/incremental/classInlineFunctionChanged/"); + } + + @TestMetadata("classInlineFunctionUnchanged") + public void testClassInlineFunctionUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/classInlineFunctionUnchanged/"); + } + @TestMetadata("classRecreated") public void testClassRecreated() throws Exception { doTest("jps-plugin/testData/incremental/classRecreated/"); @@ -90,7 +100,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public void testIndependentClasses() throws Exception { doTest("jps-plugin/testData/incremental/independentClasses/"); } - + @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { doTest("jps-plugin/testData/incremental/multiplePackagesModified/"); @@ -126,6 +136,21 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/packageFilesChangedInTurn/"); } + @TestMetadata("packageInlineFunctionChanged") + public void testPackageInlineFunctionChanged() throws Exception { + doTest("jps-plugin/testData/incremental/packageInlineFunctionChanged/"); + } + + @TestMetadata("packageInlineFunctionFromOurPackage") + public void testPackageInlineFunctionFromOurPackage() throws Exception { + doTest("jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/"); + } + + @TestMetadata("packageInlineFunctionUnchanged") + public void testPackageInlineFunctionUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/packageInlineFunctionUnchanged/"); + } + @TestMetadata("packageRecreated") public void testPackageRecreated() throws Exception { doTest("jps-plugin/testData/incremental/packageRecreated/"); diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log new file mode 100644 index 00000000000..dc4ee3554aa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/inline/Klass.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage-usage-*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt new file mode 100644 index 00000000000..4ac2a4efd18 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt @@ -0,0 +1,8 @@ +package inline + +class Klass { + inline fun f(body: () -> Unit) { + println("i'm inline function") + body() + } +} diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt.new new file mode 100644 index 00000000000..461d943cf4f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt.new @@ -0,0 +1,8 @@ +package inline + +class Klass { + inline fun f(body: () -> Unit) { + body() + println("i'm inline function") + } +} diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/usage.kt b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/usage.kt new file mode 100644 index 00000000000..204a8e2537f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + inline.Klass().f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log new file mode 100644 index 00000000000..ea54d90c2ed --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/inline/Klass.class +End of files +Compiling files: +src/inline.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt new file mode 100644 index 00000000000..4ac2a4efd18 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt @@ -0,0 +1,8 @@ +package inline + +class Klass { + inline fun f(body: () -> Unit) { + println("i'm inline function") + body() + } +} diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new new file mode 100644 index 00000000000..4ac2a4efd18 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new @@ -0,0 +1,8 @@ +package inline + +class Klass { + inline fun f(body: () -> Unit) { + println("i'm inline function") + body() + } +} diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt new file mode 100644 index 00000000000..204a8e2537f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + inline.Klass().f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log new file mode 100644 index 00000000000..341ab0b4fd2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage-usage-*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt.new new file mode 100644 index 00000000000..87422d45d88 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt.new @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + body() + println("i'm inline function") +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/usage.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/usage.kt new file mode 100644 index 00000000000..3f8161245b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + inline.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/build.log new file mode 100644 index 00000000000..7c79a56fe44 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/inline.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/inline.kt new file mode 100644 index 00000000000..fb5e59f5432 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/inline.kt @@ -0,0 +1,6 @@ +package test + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt new file mode 100644 index 00000000000..ee2e6216365 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt.new b/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt.new new file mode 100644 index 00000000000..ee2e6216365 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt.new @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log new file mode 100644 index 00000000000..b0e0bfb31e6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt new file mode 100644 index 00000000000..3f8161245b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + inline.f { println("to be inlined") } +} From 1f91c2b724d52138bf3263206d0a8eba9eece36b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 1 Jul 2014 19:57:36 +0400 Subject: [PATCH 0119/1557] Preserving annotations in incremental compilation. Original commit: 2259cc605f51cd623c3fce2929d8b05d176953e6 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 5 +++++ .../testData/incremental/annotations/annotations.kt | 13 +++++++++++++ .../testData/incremental/annotations/build.log | 7 +++++++ .../testData/incremental/annotations/other.kt | 4 ++++ .../testData/incremental/annotations/other.kt.new | 4 ++++ 5 files changed, 33 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/annotations/annotations.kt create mode 100644 jps/jps-plugin/testData/incremental/annotations/build.log create mode 100644 jps/jps-plugin/testData/incremental/annotations/other.kt create mode 100644 jps/jps-plugin/testData/incremental/annotations/other.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 9ccc3cd59a1..bb8c3735440 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -51,6 +51,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), false); } + @TestMetadata("annotations") + public void testAnnotations() throws Exception { + doTest("jps-plugin/testData/incremental/annotations/"); + } + @TestMetadata("classInlineFunctionChanged") public void testClassInlineFunctionChanged() throws Exception { doTest("jps-plugin/testData/incremental/classInlineFunctionChanged/"); diff --git a/jps/jps-plugin/testData/incremental/annotations/annotations.kt b/jps/jps-plugin/testData/incremental/annotations/annotations.kt new file mode 100644 index 00000000000..b3ba1990abf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/annotations/annotations.kt @@ -0,0 +1,13 @@ +package test + +annotation class Anno + +[Anno] fun f() { +} + +[Anno] val v1 = "" + +var v2: String + get() = "" + [Anno] set(value) { + } diff --git a/jps/jps-plugin/testData/incremental/annotations/build.log b/jps/jps-plugin/testData/incremental/annotations/build.log new file mode 100644 index 00000000000..3e90e7f7e51 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/annotations/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage-other-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/other.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/annotations/other.kt b/jps/jps-plugin/testData/incremental/annotations/other.kt new file mode 100644 index 00000000000..092462c70e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/annotations/other.kt @@ -0,0 +1,4 @@ +package test + +fun dummyFunction() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/annotations/other.kt.new b/jps/jps-plugin/testData/incremental/annotations/other.kt.new new file mode 100644 index 00000000000..092462c70e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/annotations/other.kt.new @@ -0,0 +1,4 @@ +package test + +fun dummyFunction() { +} \ No newline at end of file From 1e3b4ddc3262f5b401f74091014cbca526ba6ff5 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 1 Jul 2014 20:12:49 +0400 Subject: [PATCH 0120/1557] Supported inlining functions which access properties via field. Original commit: 7ef5c75f267155f43c2bf5eacab27514a8a25885 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 5 +++++ .../packageInlineFunctionAccessingField/build.log | 7 +++++++ .../packageInlineFunctionAccessingField/inline.kt | 8 ++++++++ .../packageInlineFunctionAccessingField/inlineOther.kt | 8 ++++++++ .../packageInlineFunctionAccessingField/usage.kt | 6 ++++++ .../packageInlineFunctionAccessingField/usage.kt.new | 6 ++++++ 6 files changed, 40 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/build.log create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inlineOther.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index bb8c3735440..1628024b0a6 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -141,6 +141,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/packageFilesChangedInTurn/"); } + @TestMetadata("packageInlineFunctionAccessingField") + public void testPackageInlineFunctionAccessingField() throws Exception { + doTest("jps-plugin/testData/incremental/packageInlineFunctionAccessingField/"); + } + @TestMetadata("packageInlineFunctionChanged") public void testPackageInlineFunctionChanged() throws Exception { doTest("jps-plugin/testData/incremental/packageInlineFunctionChanged/"); diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/build.log new file mode 100644 index 00000000000..7c79a56fe44 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inline.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inline.kt new file mode 100644 index 00000000000..9523df0da2c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inline.kt @@ -0,0 +1,8 @@ +package test + +val property = ":)" + +inline fun f(body: () -> Unit) { + println("i'm inline function" + property) + body() +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inlineOther.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inlineOther.kt new file mode 100644 index 00000000000..9c34b3337b9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inlineOther.kt @@ -0,0 +1,8 @@ +package other + +val property = ":)" + +inline fun f(body: () -> Unit) { + println("i'm inline function" + property) + body() +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt new file mode 100644 index 00000000000..e5bb1ff5213 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt @@ -0,0 +1,6 @@ +package test + +fun main(args: Array) { + f { println("to be inlined") } + other.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt.new b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt.new new file mode 100644 index 00000000000..e5bb1ff5213 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt.new @@ -0,0 +1,6 @@ +package test + +fun main(args: Array) { + f { println("to be inlined") } + other.f { println("to be inlined") } +} From 9d428dc2ede47ddecc5e8baba4940d6b8cd327d0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 1 Jul 2014 22:31:28 +0400 Subject: [PATCH 0121/1557] Minor. Reused join() instead of makeString() Original commit: 6f8d9f6ed998495ff7f29fee5966ece1a06cf6c9 --- .../org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 3fb918b3e7e..6f2585576ff 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -150,7 +150,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { logs.add(log) } - UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), logs.makeString("\n\n")) + UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), logs.join("\n\n")) rebuildAndCheckOutput() clearCachesRebuildAndCheckOutput() From 2f72958d2548c27531616094eee6e695fba99bc4 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 1 Jul 2014 22:38:35 +0400 Subject: [PATCH 0122/1557] =?UTF-8?q?Inline=20function=20changed=20?= =?UTF-8?q?=E2=80=93=C2=A0rebuild=20all=20chunk.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit: aa9f7a73c9992386b403b46b51a1c78fbd350f82 --- .../jet/jps/build/KotlinBuilder.java | 16 ++++---- .../jps/incremental/IncrementalCacheImpl.kt | 38 ++++++++++++++----- .../build/IncrementalJpsTestGenerated.java | 7 +++- .../classInlineFunctionChanged/build.log | 2 + .../inlineFunctionsCircularDependency/a.kt | 10 +++++ .../a.kt.new | 10 +++++ .../inlineFunctionsCircularDependency/b.kt | 7 ++++ .../build.log | 16 ++++++++ .../packageInlineFunctionChanged/build.log | 3 ++ 9 files changed, 91 insertions(+), 18 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/b.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/build.log diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 7df7be35870..24dcee1aa65 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.jps.build; -import com.google.common.collect.Lists; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.StreamUtil; @@ -237,7 +236,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { } cache.clearCacheForRemovedFiles(moduleIdsAndFiles, outDirectories); - boolean significantChanges = false; + IncrementalCacheImpl.RecompilationDecision recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING; for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { BuildTarget target = null; @@ -253,17 +252,20 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputFile = outputItem.getOutputFile(); if (IncrementalCompilation.ENABLED) { - if (cache.saveFileToCache(target.getId(), sourceFiles, outputFile)) { - significantChanges = true; - } + IncrementalCacheImpl.RecompilationDecision newDecision = cache.saveFileToCache(target.getId(), sourceFiles, outputFile); + recompilationDecision = recompilationDecision.merge(newDecision); } outputConsumer.registerOutputFile(target, outputFile, paths(sourceFiles)); } if (IncrementalCompilation.ENABLED) { - // TODO should mark dependencies as dirty, as well - if (significantChanges) { + if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { + allCompiledFiles.clear(); + return ExitCode.CHUNK_REBUILD_REQUIRED; + } + if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.COMPILE_OTHERS) { + // TODO should mark dependencies as dirty, as well FSOperations.markDirty(context, chunk, new FileFilter() { @Override public boolean accept(@NotNull File file) { diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 4250d96496d..c63fa5d1bf3 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -16,6 +16,7 @@ package org.jetbrains.jet.jps.incremental +import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl.RecompilationDecision.* import java.io.File import com.intellij.util.io.PersistentHashMap import java.io.DataOutput @@ -56,10 +57,10 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { private val inlineFunctionsMap = InlineFunctionsMap() private val packagePartMap = PackagePartMap() - public fun saveFileToCache(moduleId: String, sourceFiles: Collection, classFile: File): Boolean { + public fun saveFileToCache(moduleId: String, sourceFiles: Collection, classFile: File): RecompilationDecision { val fileBytes = classFile.readBytes() val classNameAndHeader = VirtualFileKotlinClass.readClassNameAndHeader(fileBytes) - if (classNameAndHeader == null) return false + if (classNameAndHeader == null) return RecompilationDecision.DO_NOTHING val (className, header) = classNameAndHeader val annotationDataEncoded = header.annotationData @@ -67,10 +68,13 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { val data = BitEncoding.decodeBytes(annotationDataEncoded) when (header.kind) { KotlinClassHeader.Kind.PACKAGE_FACADE -> { - return protoMap.put(moduleId, className, data) + return if (protoMap.put(moduleId, className, data)) COMPILE_OTHERS else DO_NOTHING } KotlinClassHeader.Kind.CLASS -> { - return inlineFunctionsMap.process(moduleId, sourceFiles.first(), fileBytes) or protoMap.put(moduleId, className, data) + val inlinesChanged = inlineFunctionsMap.process(moduleId, sourceFiles.first(), fileBytes) + val protoChanged = protoMap.put(moduleId, className, data) + + return if (inlinesChanged) RECOMPILE_ALL else if (protoChanged) COMPILE_OTHERS else DO_NOTHING } else -> { throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}") @@ -80,10 +84,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.putPackagePartSourceData(moduleId, sourceFiles.first(), className) - return inlineFunctionsMap.process(moduleId, sourceFiles.first(), fileBytes) or constantsMap.process(moduleId, sourceFiles.first(), fileBytes) + val inlinesChanged = inlineFunctionsMap.process(moduleId, sourceFiles.first(), fileBytes) + val constantsChanged = constantsMap.process(moduleId, sourceFiles.first(), fileBytes) + return if (inlinesChanged) RECOMPILE_ALL else if (constantsChanged) COMPILE_OTHERS else DO_NOTHING } - return false + return DO_NOTHING } public fun clearCacheForRemovedFiles(moduleIdsAndFiles: Collection>, outDirectories: Map) { @@ -286,7 +292,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() } - private fun getInlineFunctionsMap(bytes: ByteArray): Map { + private fun getInlineFunctionsMap(bytes: ByteArray): Map? { val result = HashMap() ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { @@ -315,21 +321,23 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { }, 0) - return result + return if (result.isEmpty()) null else result } public fun process(moduleId: String, file: File, bytes: ByteArray): Boolean { return put(moduleId, file, getInlineFunctionsMap(bytes)) } - private fun put(moduleId: String, file: File, inlineFunctionsMap: Map): Boolean { + private fun put(moduleId: String, file: File, inlineFunctionsMap: Map?): Boolean { val key = getKey(moduleId, file) val oldMap = map[key] if (oldMap == inlineFunctionsMap) { return false } - map.put(key, inlineFunctionsMap) + if (inlineFunctionsMap != null) { + map.put(key, inlineFunctionsMap) + } return true } @@ -436,6 +444,16 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { map.close() } } + + enum class RecompilationDecision { + DO_NOTHING + COMPILE_OTHERS + RECOMPILE_ALL + + fun merge(other: RecompilationDecision): RecompilationDecision { + return if (other.ordinal() > this.ordinal()) other else this + } + } } private object ByteArrayExternalizer: DataExternalizer { diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 1628024b0a6..40920fdd674 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -105,7 +105,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public void testIndependentClasses() throws Exception { doTest("jps-plugin/testData/incremental/independentClasses/"); } - + + @TestMetadata("inlineFunctionsCircularDependency") + public void testInlineFunctionsCircularDependency() throws Exception { + doTest("jps-plugin/testData/incremental/inlineFunctionsCircularDependency/"); + } + @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { doTest("jps-plugin/testData/incremental/multiplePackagesModified/"); diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log index dc4ee3554aa..41261841973 100644 --- a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log @@ -5,9 +5,11 @@ Compiling files: src/inline.kt End of files Cleaning output files: +out/production/module/inline/Klass.class out/production/module/usage/UsagePackage-usage-*.class out/production/module/usage/UsagePackage.class End of files Compiling files: +src/inline.kt src/usage.kt End of files diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt b/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt new file mode 100644 index 00000000000..8ebdd1cbc44 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt @@ -0,0 +1,10 @@ +package test + +inline fun a(body: () -> Unit) { + println("i'm inline function a") + body() +} + +fun main(args: Array) { + b { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt.new b/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt.new new file mode 100644 index 00000000000..b2916dd19e8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt.new @@ -0,0 +1,10 @@ +package test + +inline fun a(body: () -> Unit) { + body() + println("i'm inline function a") +} + +fun main(args: Array) { + b { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/b.kt b/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/b.kt new file mode 100644 index 00000000000..4f60bafa38c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/b.kt @@ -0,0 +1,7 @@ +package test + +inline fun b(body: () -> Unit) { + println("I'm inline function b") + body() + a { println("To be inlined from b") } +} diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/build.log new file mode 100644 index 00000000000..41097177bde --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files +Cleaning output files: +out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +src/b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log index 341ab0b4fd2..2b175459118 100644 --- a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log @@ -6,9 +6,12 @@ Compiling files: src/inline.kt End of files Cleaning output files: +out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage.class out/production/module/usage/UsagePackage-usage-*.class out/production/module/usage/UsagePackage.class End of files Compiling files: +src/inline.kt src/usage.kt End of files \ No newline at end of file From a482bd434101e7af1e696f486c7db90875481e9a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 7 Jul 2014 15:00:53 +0400 Subject: [PATCH 0123/1557] Minor. Renamed parameter and corresponding variable. Original commit: 2ac351928e5ab08a64974874d1a232563962ee07 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 6 +++--- .../jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 24dcee1aa65..09d31f3128d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -223,7 +223,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { IncrementalCacheImpl cache = new IncrementalCacheImpl(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); try { - List> moduleIdsAndFiles = new ArrayList>(); + List> moduleIdsAndSourceFiles = new ArrayList>(); Map outDirectories = new HashMap(); for (ModuleBuildTarget target : chunk.getTargets()) { @@ -231,10 +231,10 @@ public class KotlinBuilder extends ModuleLevelBuilder { outDirectories.put(targetId, target.getOutputDir()); for (String file : dirtyFilesHolder.getRemovedFiles(target)) { - moduleIdsAndFiles.add(new Pair(targetId, new File(file))); + moduleIdsAndSourceFiles.add(new Pair(targetId, new File(file))); } } - cache.clearCacheForRemovedFiles(moduleIdsAndFiles, outDirectories); + cache.clearCacheForRemovedFiles(moduleIdsAndSourceFiles, outDirectories); IncrementalCacheImpl.RecompilationDecision recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index c63fa5d1bf3..97941652d92 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -92,8 +92,8 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return DO_NOTHING } - public fun clearCacheForRemovedFiles(moduleIdsAndFiles: Collection>, outDirectories: Map) { - for ((moduleId, sourceFile) in moduleIdsAndFiles) { + public fun clearCacheForRemovedFiles(moduleIdsAndSourceFiles: Collection>, outDirectories: Map) { + for ((moduleId, sourceFile) in moduleIdsAndSourceFiles) { constantsMap.remove(moduleId, sourceFile) inlineFunctionsMap.remove(moduleId, sourceFile) packagePartMap.remove(moduleId, sourceFile) From 269ad88f78f20463b0821a9bb0e0dbd42c777e98 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 7 Jul 2014 15:03:18 +0400 Subject: [PATCH 0124/1557] Added test with constant in class object. Original commit: 11af8ed6160f9d60c80c1455d395a1e3e34e1837 --- .../jps/build/IncrementalJpsTestGenerated.java | 17 +++++++++++------ .../classObjectConstantChanged/build.log | 13 +++++++++++++ .../classObjectConstantChanged/const.kt | 8 ++++++++ .../classObjectConstantChanged/const.kt.new | 8 ++++++++ .../classObjectConstantChanged/usage.kt | 4 ++++ .../build.log | 0 .../const.kt | 0 .../const.kt.new | 0 .../usage.kt | 0 9 files changed, 44 insertions(+), 6 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classObjectConstantChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classObjectConstantChanged/usage.kt rename jps/jps-plugin/testData/incremental/{constantValue => packageConstantChanged}/build.log (100%) rename jps/jps-plugin/testData/incremental/{constantValue => packageConstantChanged}/const.kt (100%) rename jps/jps-plugin/testData/incremental/{constantValue => packageConstantChanged}/const.kt.new (100%) rename jps/jps-plugin/testData/incremental/{constantValue => packageConstantChanged}/usage.kt (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 40920fdd674..0ba2e825c09 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -66,6 +66,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/classInlineFunctionUnchanged/"); } + @TestMetadata("classObjectConstantChanged") + public void testClassObjectConstantChanged() throws Exception { + doTest("jps-plugin/testData/incremental/classObjectConstantChanged/"); + } + @TestMetadata("classRecreated") public void testClassRecreated() throws Exception { doTest("jps-plugin/testData/incremental/classRecreated/"); @@ -86,11 +91,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/constantUnchanged/"); } - @TestMetadata("constantValue") - public void testConstantValue() throws Exception { - doTest("jps-plugin/testData/incremental/constantValue/"); - } - @TestMetadata("dependencyClassReferenced") public void testDependencyClassReferenced() throws Exception { doTest("jps-plugin/testData/incremental/dependencyClassReferenced/"); @@ -121,6 +121,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/ourClassReferenced/"); } + @TestMetadata("packageConstantChanged") + public void testPackageConstantChanged() throws Exception { + doTest("jps-plugin/testData/incremental/packageConstantChanged/"); + } + @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { doTest("jps-plugin/testData/incremental/packageFileAdded/"); @@ -150,7 +155,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public void testPackageInlineFunctionAccessingField() throws Exception { doTest("jps-plugin/testData/incremental/packageInlineFunctionAccessingField/"); } - + @TestMetadata("packageInlineFunctionChanged") public void testPackageInlineFunctionChanged() throws Exception { doTest("jps-plugin/testData/incremental/packageInlineFunctionChanged/"); diff --git a/jps/jps-plugin/testData/incremental/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/classObjectConstantChanged/build.log new file mode 100644 index 00000000000..0d4503b9825 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classObjectConstantChanged/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/test/Klass$object.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/test/Usage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt new file mode 100644 index 00000000000..a3b30360e52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt @@ -0,0 +1,8 @@ +package test + +class Klass { + class object { + // Old and new constant values are different, but their hashes are the same + val CONST = "BF" + } +} diff --git a/jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt.new new file mode 100644 index 00000000000..8835b725265 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt.new @@ -0,0 +1,8 @@ +package test + +class Klass { + class object { + // Old and new constant values are different, but their hashes are the same + val CONST = "Ae" + } +} diff --git a/jps/jps-plugin/testData/incremental/classObjectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/classObjectConstantChanged/usage.kt new file mode 100644 index 00000000000..92fe20c977b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classObjectConstantChanged/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated(Klass.CONST + Klass.CONST) +class Usage diff --git a/jps/jps-plugin/testData/incremental/constantValue/build.log b/jps/jps-plugin/testData/incremental/packageConstantChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/constantValue/build.log rename to jps/jps-plugin/testData/incremental/packageConstantChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/constantValue/const.kt b/jps/jps-plugin/testData/incremental/packageConstantChanged/const.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/constantValue/const.kt rename to jps/jps-plugin/testData/incremental/packageConstantChanged/const.kt diff --git a/jps/jps-plugin/testData/incremental/constantValue/const.kt.new b/jps/jps-plugin/testData/incremental/packageConstantChanged/const.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/constantValue/const.kt.new rename to jps/jps-plugin/testData/incremental/packageConstantChanged/const.kt.new diff --git a/jps/jps-plugin/testData/incremental/constantValue/usage.kt b/jps/jps-plugin/testData/incremental/packageConstantChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/constantValue/usage.kt rename to jps/jps-plugin/testData/incremental/packageConstantChanged/usage.kt From 0fe80fdb5be4f0c86e0c02c15d553c3538cf9869 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 7 Jul 2014 15:05:28 +0400 Subject: [PATCH 0125/1557] Expanded test with constants unchanged. Now it has class-level and package-level constants mixed in one file. Original commit: ca647a9ff449c686a47df9b07811031f1db9c5dc --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 6 +++--- .../testData/incremental/constantUnchanged/const.kt | 3 --- .../testData/incremental/constantUnchanged/const.kt.new | 3 --- .../testData/incremental/constantUnchanged/usage.kt | 4 ---- .../{constantUnchanged => constantsUnchanged}/build.log | 2 ++ .../testData/incremental/constantsUnchanged/const.kt | 9 +++++++++ .../testData/incremental/constantsUnchanged/const.kt.new | 9 +++++++++ .../testData/incremental/constantsUnchanged/usage.kt | 4 ++++ 8 files changed, 27 insertions(+), 13 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/constantUnchanged/const.kt delete mode 100644 jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt rename jps/jps-plugin/testData/incremental/{constantUnchanged => constantsUnchanged}/build.log (67%) create mode 100644 jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/constantsUnchanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 0ba2e825c09..bb880f3439f 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -86,9 +86,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/classSignatureUnchanged/"); } - @TestMetadata("constantUnchanged") - public void testConstantUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/constantUnchanged/"); + @TestMetadata("constantsUnchanged") + public void testConstantsUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/constantsUnchanged/"); } @TestMetadata("dependencyClassReferenced") diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt deleted file mode 100644 index 1572968f89f..00000000000 --- a/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt +++ /dev/null @@ -1,3 +0,0 @@ -package test - -val CONST = "foo" diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new deleted file mode 100644 index 1572968f89f..00000000000 --- a/jps/jps-plugin/testData/incremental/constantUnchanged/const.kt.new +++ /dev/null @@ -1,3 +0,0 @@ -package test - -val CONST = "foo" diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt deleted file mode 100644 index cb0f4ce8687..00000000000 --- a/jps/jps-plugin/testData/incremental/constantUnchanged/usage.kt +++ /dev/null @@ -1,4 +0,0 @@ -package test - -deprecated(CONST + CONST) -class Usage diff --git a/jps/jps-plugin/testData/incremental/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/constantsUnchanged/build.log similarity index 67% rename from jps/jps-plugin/testData/incremental/constantUnchanged/build.log rename to jps/jps-plugin/testData/incremental/constantsUnchanged/build.log index dad2c9128da..7e364968874 100644 --- a/jps/jps-plugin/testData/incremental/constantUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/constantsUnchanged/build.log @@ -1,4 +1,6 @@ Cleaning output files: +out/production/module/test/Klass$object.class +out/production/module/test/Klass.class out/production/module/test/TestPackage-const-*.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt b/jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt new file mode 100644 index 00000000000..8261acd68a1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt @@ -0,0 +1,9 @@ +package test + +val CONST = "foo" + +class Klass { + class object { + val CONST = "bar" + } +} diff --git a/jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new new file mode 100644 index 00000000000..8261acd68a1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new @@ -0,0 +1,9 @@ +package test + +val CONST = "foo" + +class Klass { + class object { + val CONST = "bar" + } +} diff --git a/jps/jps-plugin/testData/incremental/constantsUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/constantsUnchanged/usage.kt new file mode 100644 index 00000000000..993031ad991 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/constantsUnchanged/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated(CONST + Klass.CONST) +class Usage From 5e0ae6481db9c5383a16254c192bd0c836801617 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 7 Jul 2014 15:10:12 +0400 Subject: [PATCH 0126/1557] Merged tests with inline functions in class and in package. Now this test also checks situation when several class files with inline functions are emitted from one source file. Original commit: f8ac8f727e7ae6f3691ad6a9548f342aec0fcc0c --- .../jps/build/IncrementalJpsTestGenerated.java | 15 +++++---------- .../classInlineFunctionUnchanged/build.log | 6 ------ .../build.log | 1 + .../inline.kt | 5 +++++ .../inline.kt.new | 5 +++++ .../usage.kt | 1 + .../packageInlineFunctionUnchanged/inline.kt | 6 ------ .../packageInlineFunctionUnchanged/inline.kt.new | 6 ------ .../packageInlineFunctionUnchanged/usage.kt | 5 ----- 9 files changed, 17 insertions(+), 33 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log rename jps/jps-plugin/testData/incremental/{packageInlineFunctionUnchanged => inlineFunctionsUnchanged}/build.log (82%) rename jps/jps-plugin/testData/incremental/{classInlineFunctionUnchanged => inlineFunctionsUnchanged}/inline.kt (61%) rename jps/jps-plugin/testData/incremental/{classInlineFunctionUnchanged => inlineFunctionsUnchanged}/inline.kt.new (61%) rename jps/jps-plugin/testData/incremental/{classInlineFunctionUnchanged => inlineFunctionsUnchanged}/usage.kt (70%) delete mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt delete mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index bb880f3439f..c27e8be304e 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -61,11 +61,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/classInlineFunctionChanged/"); } - @TestMetadata("classInlineFunctionUnchanged") - public void testClassInlineFunctionUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/classInlineFunctionUnchanged/"); - } - @TestMetadata("classObjectConstantChanged") public void testClassObjectConstantChanged() throws Exception { doTest("jps-plugin/testData/incremental/classObjectConstantChanged/"); @@ -111,6 +106,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/inlineFunctionsCircularDependency/"); } + @TestMetadata("inlineFunctionsUnchanged") + public void testInlineFunctionsUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/inlineFunctionsUnchanged/"); + } + @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { doTest("jps-plugin/testData/incremental/multiplePackagesModified/"); @@ -166,11 +166,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/"); } - @TestMetadata("packageInlineFunctionUnchanged") - public void testPackageInlineFunctionUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/packageInlineFunctionUnchanged/"); - } - @TestMetadata("packageRecreated") public void testPackageRecreated() throws Exception { doTest("jps-plugin/testData/incremental/packageRecreated/"); diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log b/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log deleted file mode 100644 index ea54d90c2ed..00000000000 --- a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/build.log +++ /dev/null @@ -1,6 +0,0 @@ -Cleaning output files: -out/production/module/inline/Klass.class -End of files -Compiling files: -src/inline.kt -End of files diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log b/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/build.log similarity index 82% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log rename to jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/build.log index b0e0bfb31e6..b01a631083b 100644 --- a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/build.log @@ -1,6 +1,7 @@ Cleaning output files: out/production/module/inline/InlinePackage-inline-*.class out/production/module/inline/InlinePackage.class +out/production/module/inline/Klass.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt similarity index 61% rename from jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt rename to jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt index 4ac2a4efd18..9edab4e5554 100644 --- a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt +++ b/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt @@ -1,5 +1,10 @@ package inline +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} + class Klass { inline fun f(body: () -> Unit) { println("i'm inline function") diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt.new similarity index 61% rename from jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new rename to jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt.new index 4ac2a4efd18..9edab4e5554 100644 --- a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/inline.kt.new +++ b/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt.new @@ -1,5 +1,10 @@ package inline +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} + class Klass { inline fun f(body: () -> Unit) { println("i'm inline function") diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt similarity index 70% rename from jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt rename to jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt index 204a8e2537f..ed756cfe5f1 100644 --- a/jps/jps-plugin/testData/incremental/classInlineFunctionUnchanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt @@ -1,5 +1,6 @@ package usage fun main(args: Array) { + inline.f { println("to be inlined") } inline.Klass().f { println("to be inlined") } } diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt deleted file mode 100644 index 80d71e901a3..00000000000 --- a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt +++ /dev/null @@ -1,6 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - println("i'm inline function") - body() -} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new deleted file mode 100644 index 80d71e901a3..00000000000 --- a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/inline.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - println("i'm inline function") - body() -} diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt deleted file mode 100644 index 3f8161245b6..00000000000 --- a/jps/jps-plugin/testData/incremental/packageInlineFunctionUnchanged/usage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package usage - -fun main(args: Array) { - inline.f { println("to be inlined") } -} From 290b367600df082c658d43b62bb7ae59d6ed6d38 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 7 Jul 2014 15:12:03 +0400 Subject: [PATCH 0127/1557] Made constants and inline functions maps class-file based. Otherwise data for different class files was overwritten: e.g. several classes in file, class and top-level callables in one source file. Extracted superclass with common parts. Original commit: aa9384a2077883685dae22da0b64790847a08294 --- .../jps/incremental/IncrementalCacheImpl.kt | 109 ++++++++---------- 1 file changed, 45 insertions(+), 64 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 97941652d92..fb39e516805 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -71,10 +71,11 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return if (protoMap.put(moduleId, className, data)) COMPILE_OTHERS else DO_NOTHING } KotlinClassHeader.Kind.CLASS -> { - val inlinesChanged = inlineFunctionsMap.process(moduleId, sourceFiles.first(), fileBytes) + val inlinesChanged = inlineFunctionsMap.process(moduleId, className, fileBytes) val protoChanged = protoMap.put(moduleId, className, data) + val constantsChanged = constantsMap.process(moduleId, className, fileBytes) - return if (inlinesChanged) RECOMPILE_ALL else if (protoChanged) COMPILE_OTHERS else DO_NOTHING + return if (inlinesChanged) RECOMPILE_ALL else if (protoChanged || constantsChanged) COMPILE_OTHERS else DO_NOTHING } else -> { throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}") @@ -84,8 +85,8 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.putPackagePartSourceData(moduleId, sourceFiles.first(), className) - val inlinesChanged = inlineFunctionsMap.process(moduleId, sourceFiles.first(), fileBytes) - val constantsChanged = constantsMap.process(moduleId, sourceFiles.first(), fileBytes) + val inlinesChanged = inlineFunctionsMap.process(moduleId, className, fileBytes) + val constantsChanged = constantsMap.process(moduleId, className, fileBytes) return if (inlinesChanged) RECOMPILE_ALL else if (constantsChanged) COMPILE_OTHERS else DO_NOTHING } @@ -94,11 +95,11 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { public fun clearCacheForRemovedFiles(moduleIdsAndSourceFiles: Collection>, outDirectories: Map) { for ((moduleId, sourceFile) in moduleIdsAndSourceFiles) { - constantsMap.remove(moduleId, sourceFile) - inlineFunctionsMap.remove(moduleId, sourceFile) packagePartMap.remove(moduleId, sourceFile) } + inlineFunctionsMap.clearOutdated(outDirectories) + constantsMap.clearOutdated(outDirectories) protoMap.clearOutdated(outDirectories) } @@ -117,36 +118,18 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { packagePartMap.close() } - private inner class ProtoMap { - private val map: PersistentHashMap = PersistentHashMap( - File(baseDir, PROTO_MAP), - EnumeratorStringDescriptor(), - ByteArrayExternalizer - ) + private abstract class ClassFileBasedMap { + protected abstract val map: PersistentHashMap - private fun getKeyString(moduleId: String, className: JvmClassName): String { + protected fun getKeyString(moduleId: String, className: JvmClassName): String { return moduleId + ":" + className.getInternalName() } - private fun parseKeyString(key: String): Pair { + protected fun parseKeyString(key: String): Pair { val colon = key.lastIndexOf(":") return Pair(key.substring(0, colon), JvmClassName.byInternalName(key.substring(colon + 1))) } - public fun put(moduleId: String, className: JvmClassName, data: ByteArray): Boolean { - val key = getKeyString(moduleId, className) - val oldData = map[key] - if (Arrays.equals(data, oldData)) { - return false - } - map.put(key, data) - return true - } - - public fun get(moduleId: String, className: JvmClassName): ByteArray? { - return map[getKeyString(moduleId, className)] - } - public fun clearOutdated(outDirectories: Map) { val keysToRemove = HashSet() @@ -173,17 +156,35 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } } - private inner class ConstantsMap { - private val map: PersistentHashMap> = PersistentHashMap( + private inner class ProtoMap: ClassFileBasedMap() { + override val map: PersistentHashMap = PersistentHashMap( + File(baseDir, PROTO_MAP), + EnumeratorStringDescriptor(), + ByteArrayExternalizer + ) + + public fun put(moduleId: String, className: JvmClassName, data: ByteArray): Boolean { + val key = getKeyString(moduleId, className) + val oldData = map[key] + if (Arrays.equals(data, oldData)) { + return false + } + map.put(key, data) + return true + } + + public fun get(moduleId: String, className: JvmClassName): ByteArray? { + return map[getKeyString(moduleId, className)] + } + } + + private inner class ConstantsMap: ClassFileBasedMap() { + override val map: PersistentHashMap> = PersistentHashMap( File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), ConstantsMapExternalizer ) - private fun getKey(moduleId: String, sourceFile: File): String { - return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() - } - private fun getConstantsMap(bytes: ByteArray): Map { val result = HashMap() @@ -199,12 +200,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return result } - public fun process(moduleId: String, file: File, bytes: ByteArray): Boolean { - return put(moduleId, file, getConstantsMap(bytes)) + public fun process(moduleId: String, className: JvmClassName, bytes: ByteArray): Boolean { + return put(moduleId, className, getConstantsMap(bytes)) } - private fun put(moduleId: String, file: File, constantsMap: Map): Boolean { - val key = getKey(moduleId, file) + private fun put(moduleId: String, className: JvmClassName, constantsMap: Map): Boolean { + val key = getKeyString(moduleId, className) val oldMap = map[key] if (oldMap == constantsMap) { @@ -213,14 +214,6 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { map.put(key, constantsMap) return true } - - public fun remove(moduleId: String, file: File) { - map.remove(getKey(moduleId, file)) - } - - public fun close() { - map.close() - } } private object ConstantsMapExternalizer: DataExternalizer> { @@ -281,17 +274,13 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } } - private inner class InlineFunctionsMap { - private val map: PersistentHashMap> = PersistentHashMap( + private inner class InlineFunctionsMap: ClassFileBasedMap() { + override val map: PersistentHashMap> = PersistentHashMap( File(baseDir, INLINE_FUNCTIONS), EnumeratorStringDescriptor(), InlineFunctionsMapExternalizer ) - private fun getKey(moduleId: String, sourceFile: File): String { - return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() - } - private fun getInlineFunctionsMap(bytes: ByteArray): Map? { val result = HashMap() @@ -324,12 +313,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return if (result.isEmpty()) null else result } - public fun process(moduleId: String, file: File, bytes: ByteArray): Boolean { - return put(moduleId, file, getInlineFunctionsMap(bytes)) + public fun process(moduleId: String, className: JvmClassName, bytes: ByteArray): Boolean { + return put(moduleId, className, getInlineFunctionsMap(bytes)) } - private fun put(moduleId: String, file: File, inlineFunctionsMap: Map?): Boolean { - val key = getKey(moduleId, file) + private fun put(moduleId: String, className: JvmClassName, inlineFunctionsMap: Map?): Boolean { + val key = getKeyString(moduleId, className) val oldMap = map[key] if (oldMap == inlineFunctionsMap) { @@ -340,14 +329,6 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } return true } - - public fun remove(moduleId: String, file: File) { - map.remove(getKey(moduleId, file)) - } - - public fun close() { - map.close() - } } private object InlineFunctionsMapExternalizer: DataExternalizer> { From fd8cff1f534467573a21d5cc17a5f051bbb4a0c2 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 7 Jul 2014 17:38:08 +0400 Subject: [PATCH 0128/1557] Ignoring not static final fields. Added tests with class object of trait and val inside object. Original commit: 42cba1cc3c7039d884216cc1799501cf56f887b5 --- .../jet/jps/incremental/IncrementalCacheImpl.kt | 3 ++- .../jet/jps/build/IncrementalJpsTestGenerated.java | 10 ++++++++++ .../incremental/objectValChanged/build.log | 6 ++++++ .../testData/incremental/objectValChanged/const.kt | 6 ++++++ .../incremental/objectValChanged/const.kt.new | 6 ++++++ .../testData/incremental/objectValChanged/usage.kt | 5 +++++ .../traitClassObjectConstantChanged/build.log | 14 ++++++++++++++ .../traitClassObjectConstantChanged/const.kt | 8 ++++++++ .../traitClassObjectConstantChanged/const.kt.new | 8 ++++++++ .../traitClassObjectConstantChanged/usage.kt | 4 ++++ 10 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/objectValChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/objectValChanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/objectValChanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/objectValChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/usage.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index fb39e516805..9d5c2310fb1 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -190,7 +190,8 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? { - if (value != null) { + val staticFinal = Opcodes.ACC_STATIC or Opcodes.ACC_FINAL + if (value != null && access and staticFinal == staticFinal) { result[name] = value } return null diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index c27e8be304e..563e591d52e 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -116,6 +116,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/multiplePackagesModified/"); } + @TestMetadata("objectValChanged") + public void testObjectValChanged() throws Exception { + doTest("jps-plugin/testData/incremental/objectValChanged/"); + } + @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { doTest("jps-plugin/testData/incremental/ourClassReferenced/"); @@ -206,4 +211,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/topLevelMembersInTwoFiles/"); } + @TestMetadata("traitClassObjectConstantChanged") + public void testTraitClassObjectConstantChanged() throws Exception { + doTest("jps-plugin/testData/incremental/traitClassObjectConstantChanged/"); + } + } diff --git a/jps/jps-plugin/testData/incremental/objectValChanged/build.log b/jps/jps-plugin/testData/incremental/objectValChanged/build.log new file mode 100644 index 00000000000..388e9c57d12 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/objectValChanged/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/Object.class +End of files +Compiling files: +src/const.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/objectValChanged/const.kt b/jps/jps-plugin/testData/incremental/objectValChanged/const.kt new file mode 100644 index 00000000000..3f27946befb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/objectValChanged/const.kt @@ -0,0 +1,6 @@ +package test + +object Object { + // Value is changed, but we don't care, it is not compile-time constant, and therefore can't be inlined + val CONST = "old" +} diff --git a/jps/jps-plugin/testData/incremental/objectValChanged/const.kt.new b/jps/jps-plugin/testData/incremental/objectValChanged/const.kt.new new file mode 100644 index 00000000000..19580fc7c09 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/objectValChanged/const.kt.new @@ -0,0 +1,6 @@ +package test + +object Object { + // Value is changed, but we don't care, it is not compile-time constant, and therefore can't be inlined + val CONST = "new" +} diff --git a/jps/jps-plugin/testData/incremental/objectValChanged/usage.kt b/jps/jps-plugin/testData/incremental/objectValChanged/usage.kt new file mode 100644 index 00000000000..581511cf244 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/objectValChanged/usage.kt @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + val x = Object.CONST + Object.CONST +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/build.log new file mode 100644 index 00000000000..50bc11c8e4d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/Trait$$TImpl.class +out/production/module/test/Trait$object.class +out/production/module/test/Trait.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/test/Usage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt new file mode 100644 index 00000000000..71c8e2eaa7c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt @@ -0,0 +1,8 @@ +package test + +trait Trait { + class object { + // Old and new constant values are different, but their hashes are the same + val CONST = "BF" + } +} diff --git a/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt.new new file mode 100644 index 00000000000..0ef22fbf6b8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt.new @@ -0,0 +1,8 @@ +package test + +trait Trait { + class object { + // Old and new constant values are different, but their hashes are the same + val CONST = "Ae" + } +} diff --git a/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/usage.kt new file mode 100644 index 00000000000..5c0e712d868 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated(Trait.CONST + Trait.CONST) +class Usage From 30e1b77c9b9df385447293619eb1d93cce37b152 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 8 Jul 2014 12:08:03 +0400 Subject: [PATCH 0129/1557] Optimized KotlinBuilder for targets without Kotlin. Checking dirty/removed files only. Original commit: 7212597e61addc8ba1fa2f2792336648d5b5e1c3 --- .../jet/jps/build/KotlinBuilder.java | 39 +++++++++++-------- .../jps/build/KotlinSourceFileCollector.java | 16 +++++++- 2 files changed, 37 insertions(+), 18 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 09d31f3128d..6d3d6195ffd 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -106,10 +106,6 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } - if (hasKotlinFiles(chunk)) { - messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION); - } - ModuleBuildTarget representativeTarget = chunk.representativeTarget(); // For non-incremental build: take all sources @@ -117,6 +113,13 @@ public class KotlinBuilder extends ModuleLevelBuilder { return ExitCode.NOTHING_DONE; } + boolean hasKotlinFiles = hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk); + if (!hasKotlinFiles) { + return ExitCode.NOTHING_DONE; + } + + messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION); + File outputDir = representativeTarget.getOutputDir(); CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor( @@ -128,10 +131,6 @@ public class KotlinBuilder extends ModuleLevelBuilder { } ); if (!environment.success()) { - if (!hasKotlinFiles(chunk)) { - // Configuration is bad, but there's nothing to compile anyways - return ExitCode.NOTHING_DONE; - } environment.reportErrorsTo(messageCollector); return ExitCode.ABORT; } @@ -189,7 +188,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { boolean haveRemovedFiles = false; for (ModuleBuildTarget target : chunk.getTargets()) { - if (!dirtyFilesHolder.getRemovedFiles(target).isEmpty()) { + if (!KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target).isEmpty()) { if (processedTargetsWithRemoved.add(target)) { haveRemovedFiles = true; } @@ -230,7 +229,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { String targetId = target.getId(); outDirectories.put(targetId, target.getOutputDir()); - for (String file : dirtyFilesHolder.getRemovedFiles(target)) { + for (String file : KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target)) { moduleIdsAndSourceFiles.add(new Pair(targetId, new File(file))); } } @@ -302,16 +301,22 @@ public class KotlinBuilder extends ModuleLevelBuilder { return set; } - private static boolean hasKotlinFiles(@NotNull ModuleChunk chunk) { - boolean hasKotlinFiles = false; + private static boolean hasKotlinDirtyOrRemovedFiles( + @NotNull DirtyFilesHolder dirtyFilesHolder, + @NotNull ModuleChunk chunk + ) + throws IOException { + if (!KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder).isEmpty()) { + return true; + } + for (ModuleBuildTarget target : chunk.getTargets()) { - Collection sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(target); - if (!sourceFiles.isEmpty()) { - hasKotlinFiles = true; - break; + if (!KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target).isEmpty()) { + return true; } } - return hasKotlinFiles; + + return false; } private static boolean isJavaPluginEnabled(@NotNull CompileContext context) { diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index 55051bad53f..7eba8646b52 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -18,6 +18,7 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.util.Function; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; @@ -55,6 +56,19 @@ public class KotlinSourceFileCollector { return sourceFiles; } + @NotNull + public static List getRemovedKotlinFiles( + @NotNull DirtyFilesHolder dirtyFilesHolder, + @NotNull ModuleBuildTarget target + ) throws IOException { + return ContainerUtil.filter(dirtyFilesHolder.getRemovedFiles(target), new Condition() { + @Override + public boolean value(String s) { + return FileUtilRt.extensionEquals(s, "kt"); + } + }); + } + @NotNull public static List getAllKotlinSourceFiles(@NotNull ModuleBuildTarget target) { final List moduleExcludes = ContainerUtil.map(target.getModule().getExcludeRootsList().getUrls(), new Function() { @@ -105,7 +119,7 @@ public class KotlinSourceFileCollector { } private static boolean isKotlinSourceFile(File file) { - return file.getPath().endsWith(".kt"); + return FileUtilRt.extensionEquals(file.getName(), "kt"); } private KotlinSourceFileCollector() {} From 7b984bc389108b9fa4309e75a58b8e7e39eb2b44 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 8 Jul 2014 14:10:37 +0400 Subject: [PATCH 0130/1557] Made it possible to run incremental compiler from IDEA. Two guava functions used were replaced with custom tiny functions, because JPS plugin won't have guava in classpath. Original commit: 40703c125ca88e36bbfc3bb96fdacf6e28a36057 --- .../jps/incremental/IncrementalCacheImpl.kt | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 9d5c2310fb1..60868dbe1f8 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -36,11 +36,10 @@ import org.jetbrains.jet.lang.resolve.java.JvmClassName import java.util.HashSet import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache import java.util.HashMap -import com.google.common.collect.Maps import org.jetbrains.jet.lang.resolve.java.PackageClassUtils import com.intellij.util.containers.MultiMap import com.intellij.openapi.util.io.FileUtil -import com.google.common.hash.Hashing +import java.security.MessageDigest val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -251,7 +250,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { override fun read(`in`: DataInput): Map? { val size = `in`.readInt() - val map = Maps.newHashMapWithExpectedSize(size)!! + val map = HashMap(size) for (i in size.indices) { val name = IOUtil.readString(`in`)!! @@ -301,7 +300,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { override fun visitEnd() { if (hasInlineAnnotation) { val dummyBytes = dummyClassWriter.toByteArray()!! - val hash = Hashing.md5()!!.hashBytes(dummyBytes)!!.asLong() + val hash = dummyBytes.md5() result[name + desc] = hash } @@ -343,7 +342,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { override fun read(`in`: DataInput): Map? { val size = `in`.readInt() - val map = Maps.newHashMapWithExpectedSize(size)!! + val map = HashMap(size) for (i in size.indices) { val name = IOUtil.readString(`in`)!! @@ -438,6 +437,19 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } } +private fun ByteArray.md5(): Long { + val d = MessageDigest.getInstance("MD5").digest(this)!! + return ((d[0].toLong() and 0xFFL) + or ((d[1].toLong() and 0xFFL) shl 8) + or ((d[2].toLong() and 0xFFL) shl 16) + or ((d[3].toLong() and 0xFFL) shl 24) + or ((d[4].toLong() and 0xFFL) shl 32) + or ((d[5].toLong() and 0xFFL) shl 40) + or ((d[6].toLong() and 0xFFL) shl 48) + or ((d[7].toLong() and 0xFFL) shl 56) + ) +} + private object ByteArrayExternalizer: DataExternalizer { override fun save(out: DataOutput, value: ByteArray?) { out.writeInt(value!!.size) From 4ec7f13421c33ed8a3bcafc385ec494c1bd6a956 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 8 Jul 2014 15:43:32 +0400 Subject: [PATCH 0131/1557] Not writing compiler script path when in JPS plugin output. XML script is removed after JPS plugin session anyway, so it's usually hard to check its contents. Also, it is redundant since -printArgs will write it anyway, so there is still possibility to debug. Original commit: 829c25bcf958cd51f466b7a706d89758718cc2d9 --- .../build/KotlinBuilderModuleScriptGenerator.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 6cc93502cf7..709832ed8cc 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -30,8 +30,6 @@ import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; -import org.jetbrains.jps.incremental.messages.BuildMessage; -import org.jetbrains.jps.incremental.messages.CompilerMessage; import org.jetbrains.jps.model.java.JpsAnnotationRootType; import org.jetbrains.jps.model.java.JpsJavaSdkType; import org.jetbrains.jps.model.library.JpsLibrary; @@ -102,7 +100,7 @@ public class KotlinBuilderModuleScriptGenerator { File scriptFile = File.createTempFile("kjps", StringUtil.sanitizeJavaIdentifier(chunk.getName()) + ".script.xml"); - writeScriptToFile(context, builder.asText(), scriptFile); + FileUtil.writeToFile(scriptFile, builder.asText().toString()); return scriptFile; } @@ -131,15 +129,6 @@ public class KotlinBuilderModuleScriptGenerator { }; } - private static void writeScriptToFile(CompileContext context, CharSequence moduleScriptText, File scriptFile) throws IOException { - FileUtil.writeToFile(scriptFile, moduleScriptText.toString()); - context.processMessage(new CompilerMessage( - "Kotlin", - BuildMessage.Kind.INFO, - "Created script file: " + scriptFile - )); - } - @NotNull private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { From 48c9728e70c34f57965b79315e4aa1cd911c2067 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 8 Jul 2014 18:22:50 +0400 Subject: [PATCH 0132/1557] Moved current incremental compiler test data into subdirectory. Tweaked test generator to avoid creating test methods for parent directory of tests. Original commit: 479711e812a3298b00ce3ed21a3561ffda6b0f35 --- .../build/IncrementalJpsTestGenerated.java | 377 +++++++++--------- .../accessingFunctionsViaPackagePart/a.kt | 0 .../accessingFunctionsViaPackagePart/b.kt | 0 .../accessingFunctionsViaPackagePart/b.kt.new | 0 .../build.log | 0 .../accessingFunctionsViaPackagePart/other.kt | 0 .../accessingFunctionsViaPackagePart/usage.kt | 0 .../usage.kt.new | 0 .../accessingPropertiesViaField/a.kt | 0 .../accessingPropertiesViaField/b.kt | 0 .../accessingPropertiesViaField/b.kt.new | 0 .../accessingPropertiesViaField/build.log | 0 .../accessingPropertiesViaField/other.kt | 0 .../accessingPropertiesViaField/usage.kt | 0 .../accessingPropertiesViaField/usage.kt.new | 0 .../{ => pureKotlin}/allConstants/build.log | 0 .../{ => pureKotlin}/allConstants/const.kt | 0 .../allConstants/const.kt.new.1 | 0 .../allConstants/const.kt.new.2 | 0 .../{ => pureKotlin}/allConstants/usage.kt | 0 .../annotations/annotations.kt | 0 .../{ => pureKotlin}/annotations/build.log | 0 .../{ => pureKotlin}/annotations/other.kt | 0 .../{ => pureKotlin}/annotations/other.kt.new | 0 .../classInlineFunctionChanged/build.log | 0 .../classInlineFunctionChanged/inline.kt | 0 .../classInlineFunctionChanged/inline.kt.new | 0 .../classInlineFunctionChanged/usage.kt | 0 .../classObjectConstantChanged/build.log | 0 .../classObjectConstantChanged/const.kt | 0 .../classObjectConstantChanged/const.kt.new | 0 .../classObjectConstantChanged/usage.kt | 0 .../classRecreated/A.kt.new.2 | 0 .../{ => pureKotlin}/classRecreated/a.kt | 0 .../classRecreated/a.kt.delete.1 | 0 .../{ => pureKotlin}/classRecreated/build.log | 0 .../{ => pureKotlin}/classRecreated/other.kt | 0 .../classSignatureChanged/build.log | 0 .../classSignatureChanged/class.kt | 0 .../classSignatureChanged/class.kt.new | 0 .../classSignatureChanged/usage.kt | 0 .../classSignatureUnchanged/build.log | 0 .../classSignatureUnchanged/class.kt | 0 .../classSignatureUnchanged/class.kt.new | 0 .../classSignatureUnchanged/usage.kt | 0 .../constantsUnchanged/build.log | 0 .../constantsUnchanged/const.kt | 0 .../constantsUnchanged/const.kt.new | 0 .../constantsUnchanged/usage.kt | 0 .../dependencyClassReferenced/a.kt | 0 .../dependencyClassReferenced/a.kt.new | 0 .../dependencyClassReferenced/b.kt | 0 .../dependencyClassReferenced/build.log | 0 .../filesExchangePackages/a.kt | 0 .../filesExchangePackages/b.kt | 0 .../filesExchangePackages/b.kt.new | 0 .../filesExchangePackages/build.log | 0 .../filesExchangePackages/c.kt | 0 .../filesExchangePackages/c.kt.new | 0 .../independentClasses/Bar.kt | 0 .../independentClasses/Foo.kt | 0 .../independentClasses/Foo.kt.new | 0 .../independentClasses/build.log | 0 .../inlineFunctionsCircularDependency/a.kt | 0 .../a.kt.new | 0 .../inlineFunctionsCircularDependency/b.kt | 0 .../build.log | 0 .../inlineFunctionsUnchanged/build.log | 0 .../inlineFunctionsUnchanged/inline.kt | 0 .../inlineFunctionsUnchanged/inline.kt.new | 0 .../inlineFunctionsUnchanged/usage.kt | 0 .../multiplePackagesModified/a1.kt | 0 .../multiplePackagesModified/a2.kt.new | 0 .../multiplePackagesModified/b1.kt | 0 .../multiplePackagesModified/b2.kt | 0 .../multiplePackagesModified/b2.kt.delete | 0 .../multiplePackagesModified/build.log | 0 .../objectValChanged/build.log | 0 .../objectValChanged/const.kt | 0 .../objectValChanged/const.kt.new | 0 .../objectValChanged/usage.kt | 0 .../ourClassReferenced/Klass.kt | 0 .../ourClassReferenced/Klass.kt.new.2 | 0 .../{ => pureKotlin}/ourClassReferenced/a.kt | 0 .../ourClassReferenced/a.kt.new.1 | 0 .../ourClassReferenced/a.kt.new.2 | 0 .../{ => pureKotlin}/ourClassReferenced/b.kt | 0 .../ourClassReferenced/build.log | 0 .../packageConstantChanged/build.log | 0 .../packageConstantChanged/const.kt | 0 .../packageConstantChanged/const.kt.new | 0 .../packageConstantChanged/usage.kt | 0 .../{ => pureKotlin}/packageFileAdded/a.kt | 0 .../packageFileAdded/b.kt.new | 0 .../packageFileAdded/build.log | 0 .../packageFileChangedPackage/a.kt | 0 .../packageFileChangedPackage/b.kt | 0 .../packageFileChangedPackage/b.kt.new | 0 .../packageFileChangedPackage/build.log | 0 .../packageFileChangedThenOtherRemoved/a.kt | 0 .../a.kt.new.1 | 0 .../packageFileChangedThenOtherRemoved/b.kt | 0 .../b.kt.delete.2 | 0 .../build.log | 0 .../{ => pureKotlin}/packageFileRemoved/a.kt | 0 .../{ => pureKotlin}/packageFileRemoved/b.kt | 0 .../packageFileRemoved/b.kt.delete.1 | 0 .../packageFileRemoved/build.log | 0 .../packageFileRemoved/other.kt | 0 .../packageFileRemoved/other.kt.new.2 | 0 .../packageFilesChangedInTurn/a.kt | 0 .../packageFilesChangedInTurn/a.kt.new.1 | 0 .../packageFilesChangedInTurn/b.kt | 0 .../packageFilesChangedInTurn/b.kt.new.2 | 0 .../packageFilesChangedInTurn/build.log | 0 .../build.log | 0 .../inline.kt | 0 .../inlineOther.kt | 0 .../usage.kt | 0 .../usage.kt.new | 0 .../packageInlineFunctionChanged/build.log | 0 .../packageInlineFunctionChanged/inline.kt | 0 .../inline.kt.new | 0 .../packageInlineFunctionChanged/usage.kt | 0 .../build.log | 0 .../inline.kt | 0 .../usage.kt | 0 .../usage.kt.new | 0 .../{ => pureKotlin}/packageRecreated/a.kt | 0 .../packageRecreated/a.kt.delete.1 | 0 .../packageRecreated/b.kt.new.2 | 0 .../packageRecreated/build.log | 0 .../packageRecreatedAfterRenaming/a.kt | 0 .../packageRecreatedAfterRenaming/a.kt.new.1 | 0 .../packageRecreatedAfterRenaming/b.kt.new.2 | 0 .../packageRecreatedAfterRenaming/build.log | 0 .../{ => pureKotlin}/packageRemoved/a.kt | 0 .../packageRemoved/a.kt.delete | 0 .../{ => pureKotlin}/packageRemoved/b.kt | 0 .../packageRemoved/b.kt.delete | 0 .../{ => pureKotlin}/packageRemoved/build.log | 0 .../returnTypeChanged/build.log | 0 .../{ => pureKotlin}/returnTypeChanged/fun.kt | 0 .../returnTypeChanged/fun.kt.new | 0 .../returnTypeChanged/usage.kt | 0 .../simpleClassDependency/Bar.kt | 0 .../simpleClassDependency/Foo.kt | 0 .../simpleClassDependency/Foo.kt.new | 0 .../simpleClassDependency/build.log | 0 .../soleFileChangesPackage/a.kt | 0 .../soleFileChangesPackage/a.kt.new | 0 .../soleFileChangesPackage/build.log | 0 .../topLevelFunctionSameSignature/build.log | 0 .../topLevelFunctionSameSignature/fun.kt | 0 .../topLevelFunctionSameSignature/fun.kt.new | 0 .../topLevelFunctionSameSignature/usage.kt | 0 .../topLevelMembersInTwoFiles/a.kt | 0 .../topLevelMembersInTwoFiles/a.kt.new | 0 .../topLevelMembersInTwoFiles/b.kt | 0 .../topLevelMembersInTwoFiles/build.log | 0 .../traitClassObjectConstantChanged/build.log | 0 .../traitClassObjectConstantChanged/const.kt | 0 .../const.kt.new | 0 .../traitClassObjectConstantChanged/usage.kt | 0 164 files changed, 199 insertions(+), 178 deletions(-) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingFunctionsViaPackagePart/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingFunctionsViaPackagePart/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingFunctionsViaPackagePart/b.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingFunctionsViaPackagePart/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingFunctionsViaPackagePart/other.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingFunctionsViaPackagePart/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingFunctionsViaPackagePart/usage.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingPropertiesViaField/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingPropertiesViaField/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingPropertiesViaField/b.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingPropertiesViaField/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingPropertiesViaField/other.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingPropertiesViaField/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/accessingPropertiesViaField/usage.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/allConstants/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/allConstants/const.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/allConstants/const.kt.new.1 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/allConstants/const.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/allConstants/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/annotations/annotations.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/annotations/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/annotations/other.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/annotations/other.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classInlineFunctionChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classInlineFunctionChanged/inline.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classInlineFunctionChanged/inline.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classInlineFunctionChanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classObjectConstantChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classObjectConstantChanged/const.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classObjectConstantChanged/const.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classObjectConstantChanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classRecreated/A.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classRecreated/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classRecreated/a.kt.delete.1 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classRecreated/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classRecreated/other.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classSignatureChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classSignatureChanged/class.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classSignatureChanged/class.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classSignatureChanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classSignatureUnchanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classSignatureUnchanged/class.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classSignatureUnchanged/class.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/classSignatureUnchanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/constantsUnchanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/constantsUnchanged/const.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/constantsUnchanged/const.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/constantsUnchanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/dependencyClassReferenced/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/dependencyClassReferenced/a.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/dependencyClassReferenced/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/dependencyClassReferenced/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/filesExchangePackages/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/filesExchangePackages/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/filesExchangePackages/b.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/filesExchangePackages/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/filesExchangePackages/c.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/filesExchangePackages/c.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/independentClasses/Bar.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/independentClasses/Foo.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/independentClasses/Foo.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/independentClasses/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/inlineFunctionsCircularDependency/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/inlineFunctionsCircularDependency/a.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/inlineFunctionsCircularDependency/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/inlineFunctionsCircularDependency/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/inlineFunctionsUnchanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/inlineFunctionsUnchanged/inline.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/inlineFunctionsUnchanged/inline.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/inlineFunctionsUnchanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/multiplePackagesModified/a1.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/multiplePackagesModified/a2.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/multiplePackagesModified/b1.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/multiplePackagesModified/b2.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/multiplePackagesModified/b2.kt.delete (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/multiplePackagesModified/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/objectValChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/objectValChanged/const.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/objectValChanged/const.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/objectValChanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/ourClassReferenced/Klass.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/ourClassReferenced/Klass.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/ourClassReferenced/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/ourClassReferenced/a.kt.new.1 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/ourClassReferenced/a.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/ourClassReferenced/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/ourClassReferenced/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageConstantChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageConstantChanged/const.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageConstantChanged/const.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageConstantChanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileAdded/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileAdded/b.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileAdded/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedPackage/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedPackage/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedPackage/b.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedPackage/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedThenOtherRemoved/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedThenOtherRemoved/a.kt.new.1 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedThenOtherRemoved/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedThenOtherRemoved/b.kt.delete.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileChangedThenOtherRemoved/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileRemoved/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileRemoved/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileRemoved/b.kt.delete.1 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileRemoved/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileRemoved/other.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFileRemoved/other.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFilesChangedInTurn/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFilesChangedInTurn/a.kt.new.1 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFilesChangedInTurn/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFilesChangedInTurn/b.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageFilesChangedInTurn/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionAccessingField/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionAccessingField/inline.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionAccessingField/inlineOther.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionAccessingField/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionAccessingField/usage.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionChanged/inline.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionChanged/inline.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionChanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionFromOurPackage/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionFromOurPackage/inline.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionFromOurPackage/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageInlineFunctionFromOurPackage/usage.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRecreated/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRecreated/a.kt.delete.1 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRecreated/b.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRecreated/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRecreatedAfterRenaming/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRecreatedAfterRenaming/a.kt.new.1 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRecreatedAfterRenaming/b.kt.new.2 (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRecreatedAfterRenaming/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRemoved/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRemoved/a.kt.delete (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRemoved/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRemoved/b.kt.delete (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/packageRemoved/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/returnTypeChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/returnTypeChanged/fun.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/returnTypeChanged/fun.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/returnTypeChanged/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/simpleClassDependency/Bar.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/simpleClassDependency/Foo.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/simpleClassDependency/Foo.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/simpleClassDependency/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/soleFileChangesPackage/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/soleFileChangesPackage/a.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/soleFileChangesPackage/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/topLevelFunctionSameSignature/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/topLevelFunctionSameSignature/fun.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/topLevelFunctionSameSignature/fun.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/topLevelFunctionSameSignature/usage.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/topLevelMembersInTwoFiles/a.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/topLevelMembersInTwoFiles/a.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/topLevelMembersInTwoFiles/b.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/topLevelMembersInTwoFiles/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/traitClassObjectConstantChanged/build.log (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/traitClassObjectConstantChanged/const.kt (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/traitClassObjectConstantChanged/const.kt.new (100%) rename jps/jps-plugin/testData/incremental/{ => pureKotlin}/traitClassObjectConstantChanged/usage.kt (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 563e591d52e..ea7f0d6ecd4 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -31,189 +31,210 @@ import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("jps-plugin/testData/incremental") +@InnerTestClasses({IncrementalJpsTestGenerated.PureKotlin.class}) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { - @TestMetadata("accessingFunctionsViaPackagePart") - public void testAccessingFunctionsViaPackagePart() throws Exception { - doTest("jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/"); - } - - @TestMetadata("accessingPropertiesViaField") - public void testAccessingPropertiesViaField() throws Exception { - doTest("jps-plugin/testData/incremental/accessingPropertiesViaField/"); - } - - @TestMetadata("allConstants") - public void testAllConstants() throws Exception { - doTest("jps-plugin/testData/incremental/allConstants/"); - } - public void testAllFilesPresentInIncremental() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), false); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), true); } - @TestMetadata("annotations") - public void testAnnotations() throws Exception { - doTest("jps-plugin/testData/incremental/annotations/"); + @TestMetadata("jps-plugin/testData/incremental/pureKotlin") + @InnerTestClasses({}) + public static class PureKotlin extends AbstractIncrementalJpsTest { + @TestMetadata("accessingFunctionsViaPackagePart") + public void testAccessingFunctionsViaPackagePart() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); + } + + @TestMetadata("accessingPropertiesViaField") + public void testAccessingPropertiesViaField() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); + } + + @TestMetadata("allConstants") + public void testAllConstants() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/allConstants/"); + } + + public void testAllFilesPresentInPureKotlin() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("annotations") + public void testAnnotations() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/annotations/"); + } + + @TestMetadata("classInlineFunctionChanged") + public void testClassInlineFunctionChanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); + } + + @TestMetadata("classObjectConstantChanged") + public void testClassObjectConstantChanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); + } + + @TestMetadata("classRecreated") + public void testClassRecreated() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); + } + + @TestMetadata("classSignatureChanged") + public void testClassSignatureChanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); + } + + @TestMetadata("classSignatureUnchanged") + public void testClassSignatureUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); + } + + @TestMetadata("constantsUnchanged") + public void testConstantsUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); + } + + @TestMetadata("dependencyClassReferenced") + public void testDependencyClassReferenced() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); + } + + @TestMetadata("filesExchangePackages") + public void testFilesExchangePackages() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); + } + + @TestMetadata("independentClasses") + public void testIndependentClasses() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); + } + + @TestMetadata("inlineFunctionsCircularDependency") + public void testInlineFunctionsCircularDependency() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); + } + + @TestMetadata("inlineFunctionsUnchanged") + public void testInlineFunctionsUnchanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); + } + + @TestMetadata("multiplePackagesModified") + public void testMultiplePackagesModified() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); + } + + @TestMetadata("objectValChanged") + public void testObjectValChanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/objectValChanged/"); + } + + @TestMetadata("ourClassReferenced") + public void testOurClassReferenced() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); + } + + @TestMetadata("packageConstantChanged") + public void testPackageConstantChanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); + } + + @TestMetadata("packageFileAdded") + public void testPackageFileAdded() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); + } + + @TestMetadata("packageFileChangedPackage") + public void testPackageFileChangedPackage() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); + } + + @TestMetadata("packageFileChangedThenOtherRemoved") + public void testPackageFileChangedThenOtherRemoved() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); + } + + @TestMetadata("packageFileRemoved") + public void testPackageFileRemoved() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); + } + + @TestMetadata("packageFilesChangedInTurn") + public void testPackageFilesChangedInTurn() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); + } + + @TestMetadata("packageInlineFunctionAccessingField") + public void testPackageInlineFunctionAccessingField() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); + } + + @TestMetadata("packageInlineFunctionChanged") + public void testPackageInlineFunctionChanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/"); + } + + @TestMetadata("packageInlineFunctionFromOurPackage") + public void testPackageInlineFunctionFromOurPackage() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); + } + + @TestMetadata("packageRecreated") + public void testPackageRecreated() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); + } + + @TestMetadata("packageRecreatedAfterRenaming") + public void testPackageRecreatedAfterRenaming() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); + } + + @TestMetadata("packageRemoved") + public void testPackageRemoved() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); + } + + @TestMetadata("returnTypeChanged") + public void testReturnTypeChanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); + } + + @TestMetadata("simpleClassDependency") + public void testSimpleClassDependency() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); + } + + @TestMetadata("soleFileChangesPackage") + public void testSoleFileChangesPackage() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); + } + + @TestMetadata("topLevelFunctionSameSignature") + public void testTopLevelFunctionSameSignature() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); + } + + @TestMetadata("topLevelMembersInTwoFiles") + public void testTopLevelMembersInTwoFiles() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); + } + + @TestMetadata("traitClassObjectConstantChanged") + public void testTraitClassObjectConstantChanged() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); + } + + public static Test innerSuite() { + TestSuite suite = new TestSuite("PureKotlin"); + suite.addTestSuite(PureKotlin.class); + return suite; + } } - @TestMetadata("classInlineFunctionChanged") - public void testClassInlineFunctionChanged() throws Exception { - doTest("jps-plugin/testData/incremental/classInlineFunctionChanged/"); + public static Test suite() { + TestSuite suite = new TestSuite("IncrementalJpsTestGenerated"); + suite.addTestSuite(IncrementalJpsTestGenerated.class); + suite.addTest(PureKotlin.innerSuite()); + return suite; } - - @TestMetadata("classObjectConstantChanged") - public void testClassObjectConstantChanged() throws Exception { - doTest("jps-plugin/testData/incremental/classObjectConstantChanged/"); - } - - @TestMetadata("classRecreated") - public void testClassRecreated() throws Exception { - doTest("jps-plugin/testData/incremental/classRecreated/"); - } - - @TestMetadata("classSignatureChanged") - public void testClassSignatureChanged() throws Exception { - doTest("jps-plugin/testData/incremental/classSignatureChanged/"); - } - - @TestMetadata("classSignatureUnchanged") - public void testClassSignatureUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/classSignatureUnchanged/"); - } - - @TestMetadata("constantsUnchanged") - public void testConstantsUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/constantsUnchanged/"); - } - - @TestMetadata("dependencyClassReferenced") - public void testDependencyClassReferenced() throws Exception { - doTest("jps-plugin/testData/incremental/dependencyClassReferenced/"); - } - - @TestMetadata("filesExchangePackages") - public void testFilesExchangePackages() throws Exception { - doTest("jps-plugin/testData/incremental/filesExchangePackages/"); - } - - @TestMetadata("independentClasses") - public void testIndependentClasses() throws Exception { - doTest("jps-plugin/testData/incremental/independentClasses/"); - } - - @TestMetadata("inlineFunctionsCircularDependency") - public void testInlineFunctionsCircularDependency() throws Exception { - doTest("jps-plugin/testData/incremental/inlineFunctionsCircularDependency/"); - } - - @TestMetadata("inlineFunctionsUnchanged") - public void testInlineFunctionsUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/inlineFunctionsUnchanged/"); - } - - @TestMetadata("multiplePackagesModified") - public void testMultiplePackagesModified() throws Exception { - doTest("jps-plugin/testData/incremental/multiplePackagesModified/"); - } - - @TestMetadata("objectValChanged") - public void testObjectValChanged() throws Exception { - doTest("jps-plugin/testData/incremental/objectValChanged/"); - } - - @TestMetadata("ourClassReferenced") - public void testOurClassReferenced() throws Exception { - doTest("jps-plugin/testData/incremental/ourClassReferenced/"); - } - - @TestMetadata("packageConstantChanged") - public void testPackageConstantChanged() throws Exception { - doTest("jps-plugin/testData/incremental/packageConstantChanged/"); - } - - @TestMetadata("packageFileAdded") - public void testPackageFileAdded() throws Exception { - doTest("jps-plugin/testData/incremental/packageFileAdded/"); - } - - @TestMetadata("packageFileChangedPackage") - public void testPackageFileChangedPackage() throws Exception { - doTest("jps-plugin/testData/incremental/packageFileChangedPackage/"); - } - - @TestMetadata("packageFileChangedThenOtherRemoved") - public void testPackageFileChangedThenOtherRemoved() throws Exception { - doTest("jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/"); - } - - @TestMetadata("packageFileRemoved") - public void testPackageFileRemoved() throws Exception { - doTest("jps-plugin/testData/incremental/packageFileRemoved/"); - } - - @TestMetadata("packageFilesChangedInTurn") - public void testPackageFilesChangedInTurn() throws Exception { - doTest("jps-plugin/testData/incremental/packageFilesChangedInTurn/"); - } - - @TestMetadata("packageInlineFunctionAccessingField") - public void testPackageInlineFunctionAccessingField() throws Exception { - doTest("jps-plugin/testData/incremental/packageInlineFunctionAccessingField/"); - } - - @TestMetadata("packageInlineFunctionChanged") - public void testPackageInlineFunctionChanged() throws Exception { - doTest("jps-plugin/testData/incremental/packageInlineFunctionChanged/"); - } - - @TestMetadata("packageInlineFunctionFromOurPackage") - public void testPackageInlineFunctionFromOurPackage() throws Exception { - doTest("jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/"); - } - - @TestMetadata("packageRecreated") - public void testPackageRecreated() throws Exception { - doTest("jps-plugin/testData/incremental/packageRecreated/"); - } - - @TestMetadata("packageRecreatedAfterRenaming") - public void testPackageRecreatedAfterRenaming() throws Exception { - doTest("jps-plugin/testData/incremental/packageRecreatedAfterRenaming/"); - } - - @TestMetadata("packageRemoved") - public void testPackageRemoved() throws Exception { - doTest("jps-plugin/testData/incremental/packageRemoved/"); - } - - @TestMetadata("returnTypeChanged") - public void testReturnTypeChanged() throws Exception { - doTest("jps-plugin/testData/incremental/returnTypeChanged/"); - } - - @TestMetadata("simpleClassDependency") - public void testSimpleClassDependency() throws Exception { - doTest("jps-plugin/testData/incremental/simpleClassDependency/"); - } - - @TestMetadata("soleFileChangesPackage") - public void testSoleFileChangesPackage() throws Exception { - doTest("jps-plugin/testData/incremental/soleFileChangesPackage/"); - } - - @TestMetadata("topLevelFunctionSameSignature") - public void testTopLevelFunctionSameSignature() throws Exception { - doTest("jps-plugin/testData/incremental/topLevelFunctionSameSignature/"); - } - - @TestMetadata("topLevelMembersInTwoFiles") - public void testTopLevelMembersInTwoFiles() throws Exception { - doTest("jps-plugin/testData/incremental/topLevelMembersInTwoFiles/"); - } - - @TestMetadata("traitClassObjectConstantChanged") - public void testTraitClassObjectConstantChanged() throws Exception { - doTest("jps-plugin/testData/incremental/traitClassObjectConstantChanged/"); - } - } diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/a.kt diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/b.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/other.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/other.kt diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt diff --git a/jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingFunctionsViaPackagePart/usage.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingPropertiesViaField/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/a.kt diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingPropertiesViaField/b.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingPropertiesViaField/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingPropertiesViaField/other.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/other.kt diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt diff --git a/jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/accessingPropertiesViaField/usage.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new diff --git a/jps/jps-plugin/testData/incremental/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/allConstants/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log diff --git a/jps/jps-plugin/testData/incremental/allConstants/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/allConstants/const.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt diff --git a/jps/jps-plugin/testData/incremental/allConstants/const.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/allConstants/const.kt.new.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/allConstants/const.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/allConstants/const.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/allConstants/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/allConstants/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt diff --git a/jps/jps-plugin/testData/incremental/annotations/annotations.kt b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/annotations/annotations.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt diff --git a/jps/jps-plugin/testData/incremental/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/annotations/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log diff --git a/jps/jps-plugin/testData/incremental/annotations/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/annotations/other.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt diff --git a/jps/jps-plugin/testData/incremental/annotations/other.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/annotations/other.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/classInlineFunctionChanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/classInlineFunctionChanged/inline.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/inline.kt.new diff --git a/jps/jps-plugin/testData/incremental/classInlineFunctionChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classInlineFunctionChanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/classObjectConstantChanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt diff --git a/jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/classObjectConstantChanged/const.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new diff --git a/jps/jps-plugin/testData/incremental/classObjectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classObjectConstantChanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/classRecreated/A.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/classRecreated/A.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/classRecreated/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classRecreated/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/a.kt diff --git a/jps/jps-plugin/testData/incremental/classRecreated/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/a.kt.delete.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/classRecreated/a.kt.delete.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/a.kt.delete.1 diff --git a/jps/jps-plugin/testData/incremental/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/classRecreated/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log diff --git a/jps/jps-plugin/testData/incremental/classRecreated/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/other.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classRecreated/other.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/other.kt diff --git a/jps/jps-plugin/testData/incremental/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/classSignatureChanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt diff --git a/jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/classSignatureChanged/class.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/class.kt.new diff --git a/jps/jps-plugin/testData/incremental/classSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classSignatureChanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/classSignatureUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/classSignatureUnchanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log diff --git a/jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt diff --git a/jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/classSignatureUnchanged/class.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/class.kt.new diff --git a/jps/jps-plugin/testData/incremental/classSignatureUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/classSignatureUnchanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/constantsUnchanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log diff --git a/jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt diff --git a/jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/constantsUnchanged/const.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new diff --git a/jps/jps-plugin/testData/incremental/constantsUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/constantsUnchanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt diff --git a/jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/dependencyClassReferenced/a.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new diff --git a/jps/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/dependencyClassReferenced/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt diff --git a/jps/jps-plugin/testData/incremental/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/dependencyClassReferenced/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/filesExchangePackages/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/a.kt diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/b.kt.new diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/filesExchangePackages/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt diff --git a/jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/c.kt.new diff --git a/jps/jps-plugin/testData/incremental/independentClasses/Bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Bar.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/independentClasses/Bar.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Bar.kt diff --git a/jps/jps-plugin/testData/incremental/independentClasses/Foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/independentClasses/Foo.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt diff --git a/jps/jps-plugin/testData/incremental/independentClasses/Foo.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/independentClasses/Foo.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.new diff --git a/jps/jps-plugin/testData/incremental/independentClasses/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/independentClasses/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/a.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/a.kt.new diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/b.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/inlineFunctionsCircularDependency/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/inline.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new diff --git a/jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/inlineFunctionsUnchanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a1.kt diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/a2.kt.new diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b1.kt diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete similarity index 100% rename from jps/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt.delete rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/b2.kt.delete diff --git a/jps/jps-plugin/testData/incremental/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/multiplePackagesModified/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log diff --git a/jps/jps-plugin/testData/incremental/objectValChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/objectValChanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/objectValChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/objectValChanged/const.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt diff --git a/jps/jps-plugin/testData/incremental/objectValChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/objectValChanged/const.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new diff --git a/jps/jps-plugin/testData/incremental/objectValChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/objectValChanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/ourClassReferenced/Klass.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/ourClassReferenced/a.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/ourClassReferenced/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/b.kt diff --git a/jps/jps-plugin/testData/incremental/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/ourClassReferenced/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log diff --git a/jps/jps-plugin/testData/incremental/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageConstantChanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/packageConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageConstantChanged/const.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt diff --git a/jps/jps-plugin/testData/incremental/packageConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/packageConstantChanged/const.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new diff --git a/jps/jps-plugin/testData/incremental/packageConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageConstantChanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileAdded/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/a.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/b.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileAdded/b.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/b.kt.new diff --git a/jps/jps-plugin/testData/incremental/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileAdded/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedPackage/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/a.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedPackage/b.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/b.kt.new diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedPackage/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/a.kt.new.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/a.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt.delete.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/b.kt.delete.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/b.kt.delete.2 diff --git a/jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileChangedThenOtherRemoved/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileRemoved/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/a.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileRemoved/b.kt.delete.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/b.kt.delete.1 diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileRemoved/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt diff --git a/jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFileRemoved/other.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/other.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/a.kt.new.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/b.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/b.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageFilesChangedInTurn/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inline.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inline.kt diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inlineOther.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/inlineOther.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/inlineOther.kt diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionAccessingField/usage.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/inline.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt.new diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionChanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/inline.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/inline.kt diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt diff --git a/jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/packageInlineFunctionFromOurPackage/usage.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new diff --git a/jps/jps-plugin/testData/incremental/packageRecreated/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRecreated/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt diff --git a/jps/jps-plugin/testData/incremental/packageRecreated/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRecreated/a.kt.delete.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/a.kt.delete.1 diff --git a/jps/jps-plugin/testData/incremental/packageRecreated/b.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRecreated/b.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/b.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRecreated/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log diff --git a/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt diff --git a/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/a.kt.new.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/a.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/b.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/b.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/b.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRecreatedAfterRenaming/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRemoved/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/a.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt.delete similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRemoved/a.kt.delete rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/a.kt.delete diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRemoved/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/b.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt.delete similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRemoved/b.kt.delete rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/b.kt.delete diff --git a/jps/jps-plugin/testData/incremental/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/packageRemoved/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log diff --git a/jps/jps-plugin/testData/incremental/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/returnTypeChanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt diff --git a/jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/returnTypeChanged/fun.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/fun.kt.new diff --git a/jps/jps-plugin/testData/incremental/returnTypeChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/returnTypeChanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/usage.kt diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/Bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/simpleClassDependency/Bar.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Bar.kt diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/simpleClassDependency/Foo.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new diff --git a/jps/jps-plugin/testData/incremental/simpleClassDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/simpleClassDependency/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log diff --git a/jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt diff --git a/jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/a.kt.new diff --git a/jps/jps-plugin/testData/incremental/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/soleFileChangesPackage/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log diff --git a/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log diff --git a/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt diff --git a/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/fun.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/fun.kt.new diff --git a/jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelFunctionSameSignature/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/usage.kt diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/a.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/a.kt.new diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/b.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt diff --git a/jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/topLevelMembersInTwoFiles/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log diff --git a/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log diff --git a/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt diff --git a/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/const.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new diff --git a/jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/traitClassObjectConstantChanged/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt From bc474f8582fc9d5cde320ed3dc099273ebdcbae0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 21 Jul 2014 20:43:40 +0400 Subject: [PATCH 0133/1557] Minor. Formatting and imports. Original commit: 714ad858ef3397ed790a8d2835d7874b9bc71fde --- .../jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java index d6c95360413..47ec7b8c5ae 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java @@ -23,7 +23,6 @@ import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import java.io.File; -import java.io.IOException; public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { private static final String JDK_NAME = "1.6"; @@ -58,7 +57,7 @@ public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { File[] files = root.listFiles(); if (files == null) return; for (File file : files) { - processFile(file, rebuildBeforeMake); + processFile(file, rebuildBeforeMake); } } else if (root.getName().endsWith(".kt")) { From a393a09f9dc903156d15e076008daa55ca76e5ef Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 21 Jul 2014 20:45:15 +0400 Subject: [PATCH 0134/1557] Always closing IncrementalCache after using. Fixed KannotatorJpsTest. Original commit: 7e6b05554e1ad00a7a8923b5c174d7acee714f86 --- .../org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 60868dbe1f8..23310decd01 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -110,7 +110,7 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return protoMap[moduleId, JvmClassName.byFqNameWithoutInnerClasses(PackageClassUtils.getPackageClassFqName(FqName(fqName)))] } - public fun close() { + public override fun close() { protoMap.close() constantsMap.close() inlineFunctionsMap.close() From 4957e9d97f50f0cbdfaefbb1edb05c1ff6f881e0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Sat, 2 Aug 2014 00:55:00 +0400 Subject: [PATCH 0135/1557] Fixed collecting source files for multiple modules in incremental compilation. Error led to analyzing same file twice. Original commit: a4bbe2486c80d034397490c3a04a6c8857d89ed4 --- .../org/jetbrains/jet/jps/build/KotlinBuilder.java | 9 ++++++--- .../build/KotlinBuilderModuleScriptGenerator.java | 14 ++++++++------ .../jet/jps/build/KotlinSourceFileCollector.java | 9 +++++---- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 6d3d6195ffd..a91685071d8 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.io.StreamUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.containers.MultiMap; import gnu.trove.THashSet; import kotlin.Pair; import org.jetbrains.annotations.NotNull; @@ -180,9 +181,11 @@ public class KotlinBuilder extends ModuleLevelBuilder { NO_LOCATION); } - List filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); - filesToCompile.removeAll(allCompiledFiles); - allCompiledFiles.addAll(filesToCompile); + MultiMap filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); + for (ModuleBuildTarget target : filesToCompile.keySet()) { + filesToCompile.getModifiable(target).removeAll(allCompiledFiles); + } + allCompiledFiles.addAll(filesToCompile.values()); Set processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context); diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 709832ed8cc..9313558cc2c 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -19,6 +19,7 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder; @@ -56,7 +57,7 @@ public class KotlinBuilderModuleScriptGenerator { public static File generateModuleDescription( CompileContext context, ModuleChunk chunk, - List sourceFiles, // ignored for non-incremental compilation + MultiMap sourceFiles, // ignored for non-incremental compilation boolean hasRemovedFiles ) throws IOException @@ -73,15 +74,16 @@ public class KotlinBuilderModuleScriptGenerator { for (ModuleBuildTarget target : chunk.getTargets()) { File outputDir = getOutputDir(target); - if (!IncrementalCompilation.ENABLED) { - sourceFiles = new ArrayList(KotlinSourceFileCollector.getAllKotlinSourceFiles(target)); - } + List moduleSources = new ArrayList( + IncrementalCompilation.ENABLED + ? sourceFiles.get(target) + : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)); if (sourceFiles.size() > 0 || hasRemovedFiles) { noSources = false; if (logger.isEnabled()) { - logger.logCompiledFiles(sourceFiles, KotlinBuilder.KOTLIN_BUILDER_NAME, "Compiling files:"); + logger.logCompiledFiles(moduleSources, KotlinBuilder.KOTLIN_BUILDER_NAME, "Compiling files:"); } } @@ -89,7 +91,7 @@ public class KotlinBuilderModuleScriptGenerator { target.getId(), outputDir.getAbsolutePath(), getKotlinModuleDependencies(context, target), - sourceFiles, + moduleSources, target.isTests(), // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index 7eba8646b52..04566c5e5fc 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.util.Function; import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.FileProcessor; @@ -39,21 +40,21 @@ import java.util.List; public class KotlinSourceFileCollector { // For incremental compilation - public static List getDirtySourceFiles(DirtyFilesHolder dirtyFilesHolder) + public static MultiMap getDirtySourceFiles(DirtyFilesHolder dirtyFilesHolder) throws IOException { - final List sourceFiles = ContainerUtil.newArrayList(); + final MultiMap result = new MultiMap(); dirtyFilesHolder.processDirtyFiles(new FileProcessor() { @Override public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { if (isKotlinSourceFile(file)) { - sourceFiles.add(file); + result.putValue(target, file); } return true; } }); - return sourceFiles; + return result; } @NotNull From 26ab5cd48a88f5ee49fc1e50cea6e942ca9dcee0 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 11 Aug 2014 18:27:37 +0400 Subject: [PATCH 0136/1557] Don't pass "-verbose" by default to compiler in IDE Let user pass it in the settings. Currently doesn't affect anything since apparently no verbose messages appear in the IDE compiler output Original commit: 807cf1dcc08df8226cd87b08b177ba77c04a321f --- .../test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 842ad2a83aa..2f108a570d5 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -23,6 +23,8 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.AsmUtil; +import org.jetbrains.jet.compiler.CompilerSettings; +import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jps.builders.BuildResult; @@ -69,6 +71,9 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private void initProject() { addJdk(JDK_NAME); loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr"); + CompilerSettings settings = new CompilerSettings(); + settings.setAdditionalArguments(settings.getAdditionalArguments() + " -verbose"); + JpsKotlinCompilerSettings.setCompilerSettings(myProject, settings); } public void doTest() { From ab44343e1c8e4a9d9fb7b77db2c239a391a3a22f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 12 Aug 2014 20:30:51 +0400 Subject: [PATCH 0137/1557] Made incremental cache per-module. Reused IDEA framework which manages per-module storage. Original commit: 5fade9a5a65d3a919adc064523c59ef388a2812b --- ...otlin.incremental.IncrementalCacheProvider | 1 - .../jet/jps/build/KotlinBuilder.java | 143 ++++++++---------- .../jps/incremental/IncrementalCacheImpl.kt | 118 ++++++++++----- .../IncrementlaCacheProviderImpl.kt | 14 +- 4 files changed, 149 insertions(+), 127 deletions(-) delete mode 100644 jps/jps-plugin/src/META-INF/services/org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider deleted file mode 100644 index eadf409aee9..00000000000 --- a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider +++ /dev/null @@ -1 +0,0 @@ -org.jetbrains.jet.jps.incremental.IncrementalCacheProviderImpl \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index a91685071d8..91a4814c41e 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.jps.build; +import com.google.common.collect.Maps; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.StreamUtil; @@ -24,7 +25,6 @@ import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import gnu.trove.THashSet; -import kotlin.Pair; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.KotlinVersion; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; @@ -40,17 +40,17 @@ import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.compiler.runner.SimpleOutputItem; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; -import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl; +import org.jetbrains.jet.jps.incremental.*; import org.jetbrains.jet.preloading.ClassLoaderFactory; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; -import org.jetbrains.jps.builders.BuildTarget; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.incremental.*; import org.jetbrains.jps.incremental.java.JavaBuilder; import org.jetbrains.jps.incremental.messages.BuildMessage; import org.jetbrains.jps.incremental.messages.CompilerMessage; +import org.jetbrains.jps.incremental.storage.BuildDataManager; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.module.JpsModule; @@ -123,13 +123,22 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputDir = representativeTarget.getOutputDir(); + BuildDataManager dataManager = context.getProjectDescriptor().dataManager; + Map incrementalCaches = Maps.newHashMap(); + for (ModuleBuildTarget target : chunk.getTargets()) { + incrementalCaches.put(target, dataManager.getStorage(target, IncrementalCacheStorageProvider.INSTANCE$)); + } + + IncrementalCacheProviderImpl cacheProvider = new IncrementalCacheProviderImpl(incrementalCaches); + CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor( PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, new ClassLoaderFactory() { @Override public ClassLoader create(ClassLoader compilerClassLoader) { return new MyClassLoader(compilerClassLoader); } - } + }, + cacheProvider ); if (!environment.success()) { environment.reportErrorsTo(messageCollector); @@ -213,7 +222,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { } // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below - Map> sourceToTarget = new HashMap>(); + Map sourceToTarget = new HashMap(); if (chunk.getTargets().size() > 1) { for (ModuleBuildTarget target : chunk.getTargets()) { for (File file : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { @@ -222,67 +231,62 @@ public class KotlinBuilder extends ModuleLevelBuilder { } } - IncrementalCacheImpl cache = new IncrementalCacheImpl(KotlinBuilderModuleScriptGenerator.getIncrementalCacheDir(context)); + for (ModuleBuildTarget target : chunk.getTargets()) { + String targetId = target.getId(); - try { - List> moduleIdsAndSourceFiles = new ArrayList>(); - Map outDirectories = new HashMap(); + List removedFiles = ContainerUtil.map(KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), + new Function() { + @Override + public File fun(String s) { + return new File(s); + } + }); - for (ModuleBuildTarget target : chunk.getTargets()) { - String targetId = target.getId(); - outDirectories.put(targetId, target.getOutputDir()); + incrementalCaches.get(target).clearCacheForRemovedFiles(targetId, removedFiles, target.getOutputDir()); + } - for (String file : KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target)) { - moduleIdsAndSourceFiles.add(new Pair(targetId, new File(file))); - } + IncrementalCacheImpl.RecompilationDecision recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING; + + for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { + ModuleBuildTarget target = null; + Collection sourceFiles = outputItem.getSourceFiles(); + if (!sourceFiles.isEmpty()) { + target = sourceToTarget.get(sourceFiles.iterator().next()); } - cache.clearCacheForRemovedFiles(moduleIdsAndSourceFiles, outDirectories); - IncrementalCacheImpl.RecompilationDecision recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING; - - for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { - BuildTarget target = null; - Collection sourceFiles = outputItem.getSourceFiles(); - if (!sourceFiles.isEmpty()) { - target = sourceToTarget.get(sourceFiles.iterator().next()); - } - - if (target == null) { - target = representativeTarget; - } - - File outputFile = outputItem.getOutputFile(); - - if (IncrementalCompilation.ENABLED) { - IncrementalCacheImpl.RecompilationDecision newDecision = cache.saveFileToCache(target.getId(), sourceFiles, outputFile); - recompilationDecision = recompilationDecision.merge(newDecision); - } - - outputConsumer.registerOutputFile(target, outputFile, paths(sourceFiles)); + if (target == null) { + target = representativeTarget; } + File outputFile = outputItem.getOutputFile(); + if (IncrementalCompilation.ENABLED) { - if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { - allCompiledFiles.clear(); - return ExitCode.CHUNK_REBUILD_REQUIRED; - } - if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.COMPILE_OTHERS) { - // TODO should mark dependencies as dirty, as well - FSOperations.markDirty(context, chunk, new FileFilter() { - @Override - public boolean accept(@NotNull File file) { - return !allCompiledFiles.contains(file); - } - }); - } - return ExitCode.ADDITIONAL_PASS_REQUIRED; - } - else { - return ExitCode.OK; + IncrementalCacheImpl.RecompilationDecision newDecision = + incrementalCaches.get(target).saveFileToCache(target.getId(), sourceFiles, outputFile); + recompilationDecision = recompilationDecision.merge(newDecision); } + + outputConsumer.registerOutputFile(target, outputFile, paths(sourceFiles)); } - finally { - cache.close(); + + if (IncrementalCompilation.ENABLED) { + if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { + allCompiledFiles.clear(); + return ExitCode.CHUNK_REBUILD_REQUIRED; + } + if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.COMPILE_OTHERS) { + // TODO should mark dependencies as dirty, as well + FSOperations.markDirty(context, chunk, new FileFilter() { + @Override + public boolean accept(@NotNull File file) { + return !allCompiledFiles.contains(file); + } + }); + } + return ExitCode.ADDITIONAL_PASS_REQUIRED; + } + else { + return ExitCode.OK; } } @@ -420,32 +424,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { @Override public Class loadClass(@NotNull String name) throws ClassNotFoundException { - if (name.startsWith("org.jetbrains.jet.jps.incremental.")) { - return loadClassFromBytes(name); - } - else if (name.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.")) { - return compilerClassLoader.loadClass(name); - } - else { - return jpsPluginClassLoader.loadClass(name); - } - } - - private Class loadClassFromBytes(String name) throws ClassNotFoundException { - String classResource = name.replace('.', '/') + ".class"; - InputStream resource = jpsPluginClassLoader.getResourceAsStream(classResource); - if (resource == null) { - return null; - } - byte[] bytes; - try { - bytes = StreamUtil.loadFromStream(resource); - } - catch (IOException e) { - throw new ClassNotFoundException("Couldn't load class " + name, e); - } - - return defineClass(name, bytes, 0, bytes.length); + return jpsPluginClassLoader.loadClass(name); } } } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 23310decd01..a21edd6ac16 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -40,10 +40,13 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils import com.intellij.util.containers.MultiMap import com.intellij.openapi.util.io.FileUtil import java.security.MessageDigest +import org.jetbrains.jps.incremental.storage.StorageOwner +import org.jetbrains.jps.builders.storage.StorageProvider +import java.io.IOException val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" -public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { +public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalCache { class object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" @@ -56,10 +59,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { private val inlineFunctionsMap = InlineFunctionsMap() private val packagePartMap = PackagePartMap() + private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) + public fun saveFileToCache(moduleId: String, sourceFiles: Collection, classFile: File): RecompilationDecision { val fileBytes = classFile.readBytes() val classNameAndHeader = VirtualFileKotlinClass.readClassNameAndHeader(fileBytes) - if (classNameAndHeader == null) return RecompilationDecision.DO_NOTHING + if (classNameAndHeader == null) return DO_NOTHING val (className, header) = classNameAndHeader val annotationDataEncoded = header.annotationData @@ -92,14 +97,14 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return DO_NOTHING } - public fun clearCacheForRemovedFiles(moduleIdsAndSourceFiles: Collection>, outDirectories: Map) { - for ((moduleId, sourceFile) in moduleIdsAndSourceFiles) { - packagePartMap.remove(moduleId, sourceFile) + public fun clearCacheForRemovedFiles(moduleId: String, removedSourceFiles: Collection, outDirectory: File) { + for (removedSourceFile in removedSourceFiles) { + packagePartMap.remove(moduleId, removedSourceFile) } - inlineFunctionsMap.clearOutdated(outDirectories) - constantsMap.clearOutdated(outDirectories) - protoMap.clearOutdated(outDirectories) + inlineFunctionsMap.clearOutdated(outDirectory) + constantsMap.clearOutdated(outDirectory) + protoMap.clearOutdated(outDirectory) } public override fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map): Collection { @@ -110,16 +115,55 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return protoMap[moduleId, JvmClassName.byFqNameWithoutInnerClasses(PackageClassUtils.getPackageClassFqName(FqName(fqName)))] } - public override fun close() { - protoMap.close() - constantsMap.close() - inlineFunctionsMap.close() - packagePartMap.close() + override fun flush(memoryCachesOnly: Boolean) { + maps.forEach { it.flush(memoryCachesOnly) } } - private abstract class ClassFileBasedMap { - protected abstract val map: PersistentHashMap + public override fun clean() { + maps.forEach { it.clean() } + } + public override fun close() { + maps.forEach { it.close () } + } + + private abstract class BasicMap { + protected var map: PersistentHashMap = createMap() + + protected abstract fun createMap(): PersistentHashMap + + public fun clean() { + try { + map.close() + } + catch (ignored: IOException) { + } + + PersistentHashMap.deleteFilesStartingWith(map.getBaseFile()!!) + try { + map = createMap() + } + catch (ignored: IOException) { + } + } + + public fun flush(memoryCachesOnly: Boolean) { + if (memoryCachesOnly) { + if (map.isDirty()) { + map.dropMemoryCaches() + } + } + else { + map.force() + } + } + + public fun close() { + map.close() + } + } + + private abstract class ClassFileBasedMap: BasicMap() { protected fun getKeyString(moduleId: String, className: JvmClassName): String { return moduleId + ":" + className.getInternalName() } @@ -129,17 +173,15 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return Pair(key.substring(0, colon), JvmClassName.byInternalName(key.substring(colon + 1))) } - public fun clearOutdated(outDirectories: Map) { + // TODO may be too expensive, because it traverses all files in out directory + public fun clearOutdated(outDirectory: File) { val keysToRemove = HashSet() - map.processKeys { key -> + map.processKeysWithExistingMapping { key -> val (moduleId, className) = parseKeyString(key!!) - val outDir = outDirectories[moduleId] - if (outDir != null) { - val classFile = File(outDir, FileUtil.toSystemDependentName(className.getInternalName()) + ".class") - if (!classFile.exists()) { - keysToRemove.add(key) - } + val classFile = File(outDirectory, FileUtil.toSystemDependentName(className.getInternalName()) + ".class") + if (!classFile.exists()) { + keysToRemove.add(key) } true @@ -149,14 +191,10 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { map.remove(key) } } - - public fun close() { - map.close() - } } - private inner class ProtoMap: ClassFileBasedMap() { - override val map: PersistentHashMap = PersistentHashMap( + private inner class ProtoMap: ClassFileBasedMap() { + override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PROTO_MAP), EnumeratorStringDescriptor(), ByteArrayExternalizer @@ -177,8 +215,8 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } } - private inner class ConstantsMap: ClassFileBasedMap() { - override val map: PersistentHashMap> = PersistentHashMap( + private inner class ConstantsMap: ClassFileBasedMap>() { + override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), ConstantsMapExternalizer @@ -274,8 +312,8 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } } - private inner class InlineFunctionsMap: ClassFileBasedMap() { - override val map: PersistentHashMap> = PersistentHashMap( + private inner class InlineFunctionsMap: ClassFileBasedMap>() { + override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, INLINE_FUNCTIONS), EnumeratorStringDescriptor(), InlineFunctionsMapExternalizer @@ -357,9 +395,9 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } - private inner class PackagePartMap { + private inner class PackagePartMap: BasicMap() { // Format of serialization to string: --> - private val map: PersistentHashMap = PersistentHashMap( + override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PACKAGE_PARTS), EnumeratorStringDescriptor(), EnumeratorStringDescriptor() @@ -420,10 +458,6 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { return result } - - public fun close() { - map.close() - } } enum class RecompilationDecision { @@ -437,6 +471,12 @@ public class IncrementalCacheImpl(val baseDir: File): IncrementalCache { } } +public object IncrementalCacheStorageProvider : StorageProvider() { + override fun createStorage(targetDataDir: File?): IncrementalCacheImpl { + return IncrementalCacheImpl(File(targetDataDir, "kotlin")) + } +} + private fun ByteArray.md5(): Long { val d = MessageDigest.getInstance("MD5").digest(this)!! return ((d[0].toLong() and 0xFFL) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt index 5b94b207b71..65f6ccb6f89 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt @@ -17,11 +17,15 @@ package org.jetbrains.jet.jps.incremental import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider -import java.io.File +import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache +import kotlin.properties.Delegates -public class IncrementalCacheProviderImpl: IncrementalCacheProvider { - override fun getIncrementalCache(baseDir: File): IncrementalCache { - return IncrementalCacheImpl(baseDir) +public class IncrementalCacheProviderImpl(caches: Map): IncrementalCacheProvider { + private val idToCache = caches.mapKeys { it.key.getId()!! } + + override fun getIncrementalCache(moduleId: String): IncrementalCache { + return idToCache[moduleId]!! } -} \ No newline at end of file +} + From 3acdb6a5cb2cdcb2690f85d6d47be11b523c417a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 12 Aug 2014 21:16:08 +0400 Subject: [PATCH 0138/1557] Moved incremental cache API to separate package. Original commit: e419c1a6042c2ee069fec16ebde5cccb6e9d317d --- .../org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 2 +- .../jet/jps/incremental/IncrementlaCacheProviderImpl.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index a21edd6ac16..d30d0886804 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -34,7 +34,7 @@ import com.intellij.util.io.EnumeratorStringDescriptor import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames import org.jetbrains.jet.lang.resolve.java.JvmClassName import java.util.HashSet -import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache +import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache import java.util.HashMap import org.jetbrains.jet.lang.resolve.java.PackageClassUtils import com.intellij.util.containers.MultiMap diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt index 65f6ccb6f89..b174b864cee 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt @@ -16,9 +16,9 @@ package org.jetbrains.jet.jps.incremental -import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCacheProvider +import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.jet.lang.resolve.kotlin.incremental.IncrementalCache +import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache import kotlin.properties.Delegates public class IncrementalCacheProviderImpl(caches: Map): IncrementalCacheProvider { From b2e343774d913c1ab88c4733c88b1dd2e2ea83d4 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 12 Aug 2014 21:24:34 +0400 Subject: [PATCH 0139/1557] Passing class loader instead of factory to compiler. Original commit: 3233317316cb66a306044c59202ffb88c2af02b3 --- .../jet/jps/build/KotlinBuilder.java | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 91a4814c41e..5f6013bd792 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -19,7 +19,6 @@ package org.jetbrains.jet.jps.build; import com.google.common.collect.Maps; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.io.StreamUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; @@ -41,7 +40,6 @@ import org.jetbrains.jet.compiler.runner.SimpleOutputItem; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.jps.incremental.*; -import org.jetbrains.jet.preloading.ClassLoaderFactory; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -57,10 +55,8 @@ import org.jetbrains.jps.model.module.JpsModule; import java.io.File; import java.io.FileFilter; import java.io.IOException; -import java.io.InputStream; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.net.URL; import java.util.*; import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; @@ -132,14 +128,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { IncrementalCacheProviderImpl cacheProvider = new IncrementalCacheProviderImpl(incrementalCaches); CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor( - PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, new ClassLoaderFactory() { - @Override - public ClassLoader create(ClassLoader compilerClassLoader) { - return new MyClassLoader(compilerClassLoader); - } - }, - cacheProvider - ); + PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), cacheProvider); if (!environment.success()) { environment.reportErrorsTo(messageCollector); return ExitCode.ABORT; @@ -407,24 +396,4 @@ public class KotlinBuilder extends ModuleLevelBuilder { public List getCompilableFileExtensions() { return COMPILABLE_FILE_EXTENSIONS; } - - private class MyClassLoader extends ClassLoader { - private final ClassLoader compilerClassLoader; - private final ClassLoader jpsPluginClassLoader = KotlinBuilder.this.getClass().getClassLoader(); - - private MyClassLoader(ClassLoader compilerClassLoader) { - this.compilerClassLoader = compilerClassLoader; - } - - @NotNull - @Override - public Enumeration getResources(String name) throws IOException { - return jpsPluginClassLoader.getResources(name); - } - - @Override - public Class loadClass(@NotNull String name) throws ClassNotFoundException { - return jpsPluginClassLoader.loadClass(name); - } - } } From e97d8614c58fbd15ca321afeca0169c183346117 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 18 Aug 2014 15:31:26 +0400 Subject: [PATCH 0140/1557] Removed storing module ids in incremental caches. Original commit: 6dd56a08bdabe89b1eab124f0af740a426b95b35 --- .../jet/jps/build/KotlinBuilder.java | 16 +-- .../jps/incremental/IncrementalCacheImpl.kt | 110 ++++++++---------- 2 files changed, 49 insertions(+), 77 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 5f6013bd792..3f58e1efa08 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -221,17 +221,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { } for (ModuleBuildTarget target : chunk.getTargets()) { - String targetId = target.getId(); - - List removedFiles = ContainerUtil.map(KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), - new Function() { - @Override - public File fun(String s) { - return new File(s); - } - }); - - incrementalCaches.get(target).clearCacheForRemovedFiles(targetId, removedFiles, target.getOutputDir()); + incrementalCaches.get(target).clearCacheForRemovedFiles( + KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), target.getOutputDir()); } IncrementalCacheImpl.RecompilationDecision recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING; @@ -250,8 +241,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputFile = outputItem.getOutputFile(); if (IncrementalCompilation.ENABLED) { - IncrementalCacheImpl.RecompilationDecision newDecision = - incrementalCaches.get(target).saveFileToCache(target.getId(), sourceFiles, outputFile); + IncrementalCacheImpl.RecompilationDecision newDecision = incrementalCaches.get(target).saveFileToCache(sourceFiles, outputFile); recompilationDecision = recompilationDecision.merge(newDecision); } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index d30d0886804..3700771d690 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -61,7 +61,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) - public fun saveFileToCache(moduleId: String, sourceFiles: Collection, classFile: File): RecompilationDecision { + public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { val fileBytes = classFile.readBytes() val classNameAndHeader = VirtualFileKotlinClass.readClassNameAndHeader(fileBytes) if (classNameAndHeader == null) return DO_NOTHING @@ -72,12 +72,12 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC val data = BitEncoding.decodeBytes(annotationDataEncoded) when (header.kind) { KotlinClassHeader.Kind.PACKAGE_FACADE -> { - return if (protoMap.put(moduleId, className, data)) COMPILE_OTHERS else DO_NOTHING + return if (protoMap.put(className, data)) COMPILE_OTHERS else DO_NOTHING } KotlinClassHeader.Kind.CLASS -> { - val inlinesChanged = inlineFunctionsMap.process(moduleId, className, fileBytes) - val protoChanged = protoMap.put(moduleId, className, data) - val constantsChanged = constantsMap.process(moduleId, className, fileBytes) + val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + val protoChanged = protoMap.put(className, data) + val constantsChanged = constantsMap.process(className, fileBytes) return if (inlinesChanged) RECOMPILE_ALL else if (protoChanged || constantsChanged) COMPILE_OTHERS else DO_NOTHING } @@ -88,31 +88,29 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } - packagePartMap.putPackagePartSourceData(moduleId, sourceFiles.first(), className) - val inlinesChanged = inlineFunctionsMap.process(moduleId, className, fileBytes) - val constantsChanged = constantsMap.process(moduleId, className, fileBytes) + packagePartMap.putPackagePartSourceData(sourceFiles.first(), className) + val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + val constantsChanged = constantsMap.process(className, fileBytes) return if (inlinesChanged) RECOMPILE_ALL else if (constantsChanged) COMPILE_OTHERS else DO_NOTHING } return DO_NOTHING } - public fun clearCacheForRemovedFiles(moduleId: String, removedSourceFiles: Collection, outDirectory: File) { - for (removedSourceFile in removedSourceFiles) { - packagePartMap.remove(moduleId, removedSourceFile) - } + public fun clearCacheForRemovedFiles(removedSourceFiles: Collection, outDirectory: File) { + removedSourceFiles.forEach { packagePartMap.remove(it) } inlineFunctionsMap.clearOutdated(outDirectory) constantsMap.clearOutdated(outDirectory) protoMap.clearOutdated(outDirectory) } - public override fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map): Collection { - return packagePartMap.getRemovedPackageParts(moduleId, compiledSourceFilesToFqName) + public override fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { + return packagePartMap.getRemovedPackageParts(compiledSourceFilesToFqName) } - public override fun getPackageData(moduleId: String, fqName: String): ByteArray? { - return protoMap[moduleId, JvmClassName.byFqNameWithoutInnerClasses(PackageClassUtils.getPackageClassFqName(FqName(fqName)))] + public override fun getPackageData(fqName: String): ByteArray? { + return protoMap[JvmClassName.byFqNameWithoutInnerClasses(PackageClassUtils.getPackageClassFqName(FqName(fqName)))] } override fun flush(memoryCachesOnly: Boolean) { @@ -164,21 +162,13 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } private abstract class ClassFileBasedMap: BasicMap() { - protected fun getKeyString(moduleId: String, className: JvmClassName): String { - return moduleId + ":" + className.getInternalName() - } - - protected fun parseKeyString(key: String): Pair { - val colon = key.lastIndexOf(":") - return Pair(key.substring(0, colon), JvmClassName.byInternalName(key.substring(colon + 1))) - } // TODO may be too expensive, because it traverses all files in out directory public fun clearOutdated(outDirectory: File) { val keysToRemove = HashSet() map.processKeysWithExistingMapping { key -> - val (moduleId, className) = parseKeyString(key!!) + val className = JvmClassName.byInternalName(key!!) val classFile = File(outDirectory, FileUtil.toSystemDependentName(className.getInternalName()) + ".class") if (!classFile.exists()) { keysToRemove.add(key) @@ -200,8 +190,8 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC ByteArrayExternalizer ) - public fun put(moduleId: String, className: JvmClassName, data: ByteArray): Boolean { - val key = getKeyString(moduleId, className) + public fun put(className: JvmClassName, data: ByteArray): Boolean { + val key = className.getInternalName() val oldData = map[key] if (Arrays.equals(data, oldData)) { return false @@ -210,8 +200,8 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC return true } - public fun get(moduleId: String, className: JvmClassName): ByteArray? { - return map[getKeyString(moduleId, className)] + public fun get(className: JvmClassName): ByteArray? { + return map[className.getInternalName()] } } @@ -238,12 +228,12 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC return result } - public fun process(moduleId: String, className: JvmClassName, bytes: ByteArray): Boolean { - return put(moduleId, className, getConstantsMap(bytes)) + public fun process(className: JvmClassName, bytes: ByteArray): Boolean { + return put(className, getConstantsMap(bytes)) } - private fun put(moduleId: String, className: JvmClassName, constantsMap: Map): Boolean { - val key = getKeyString(moduleId, className) + private fun put(className: JvmClassName, constantsMap: Map): Boolean { + val key = className.getInternalName() val oldMap = map[key] if (oldMap == constantsMap) { @@ -351,12 +341,12 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC return if (result.isEmpty()) null else result } - public fun process(moduleId: String, className: JvmClassName, bytes: ByteArray): Boolean { - return put(moduleId, className, getInlineFunctionsMap(bytes)) + public fun process(className: JvmClassName, bytes: ByteArray): Boolean { + return put(className, getInlineFunctionsMap(bytes)) } - private fun put(moduleId: String, className: JvmClassName, inlineFunctionsMap: Map?): Boolean { - val key = getKeyString(moduleId, className) + private fun put(className: JvmClassName, inlineFunctionsMap: Map?): Boolean { + val key = className.getInternalName() val oldMap = map[key] if (oldMap == inlineFunctionsMap) { @@ -396,43 +386,37 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC private inner class PackagePartMap: BasicMap() { - // Format of serialization to string: --> + // Format of serialization to string: --> override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PACKAGE_PARTS), EnumeratorStringDescriptor(), EnumeratorStringDescriptor() ) - private fun getKey(moduleId: String, sourceFile: File): String { - return moduleId + File.pathSeparator + sourceFile.getAbsolutePath() + public fun putPackagePartSourceData(sourceFile: File, className: JvmClassName) { + map.put(sourceFile.getAbsolutePath(), className.getInternalName()) } - public fun putPackagePartSourceData(moduleId: String, sourceFile: File, className: JvmClassName) { - map.put(getKey(moduleId, sourceFile), className.getInternalName()) + public fun remove(sourceFile: String) { + map.remove(sourceFile) } - public fun remove(moduleId: String, sourceFile: File) { - map.remove(getKey(moduleId, sourceFile)) - } - - public fun getRemovedPackageParts(moduleId: String, compiledSourceFilesToFqName: Map): Collection { + public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { val result = HashSet() map.processKeysWithExistingMapping { key -> - if (key!!.startsWith(moduleId + File.pathSeparator)) { - val sourceFile = File(key.substring(moduleId.length + 1)) + val sourceFile = File(key!!) - val packagePartClassName = map[key]!! - if (!sourceFile.exists()) { + val packagePartClassName = map[key]!! + if (!sourceFile.exists()) { + result.add(packagePartClassName) + } + else { + val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] + if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { result.add(packagePartClassName) } - else { - val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() - val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] - if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { - result.add(packagePartClassName) - } - } } true @@ -441,17 +425,15 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC return result } - public fun getModulesToPackages(): MultiMap { - val result = MultiMap.createSet() + public fun getPackages(): Set { + val result = HashSet() map.processKeysWithExistingMapping { key -> - val indexOf = key!!.indexOf(File.pathSeparator) - val moduleId = key.substring(0, indexOf) - val packagePartClassName = map[key]!! + val packagePartClassName = map[key!!]!! val packageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() - result.putValue(moduleId, packageFqName) + result.add(packageFqName) true } From 79ae770031dfbf141b3b2cb303924eb57258b10d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 18 Aug 2014 19:21:42 +0400 Subject: [PATCH 0141/1557] Made compiler report source to output mapping when invoked from JPS. Original commit: cbf8af2e88c7bfb7631e91570a0970000facee09 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 ++ .../test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 3f58e1efa08..3de567053f6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -140,6 +140,8 @@ public class KotlinBuilder extends ModuleLevelBuilder { JpsProject project = representativeTarget.getModule().getProject(); CommonCompilerArguments commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project); + commonArguments.verbose = true; // Make compiler report source to output files mapping + CompilerSettings compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project); final Set allCompiledFiles = getAllCompiledFilesContainer(context); diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 2f108a570d5..9a96e7ca41e 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -71,9 +71,6 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private void initProject() { addJdk(JDK_NAME); loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr"); - CompilerSettings settings = new CompilerSettings(); - settings.setAdditionalArguments(settings.getAdditionalArguments() + " -verbose"); - JpsKotlinCompilerSettings.setCompilerSettings(myProject, settings); } public void doTest() { From b92205b27775cafd951a66f3f5dd3ef7919396ba Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 19 Aug 2014 17:34:36 +0400 Subject: [PATCH 0142/1557] Removed passing incremental cache base dir via module script. Original commit: 184ddbc9e17cada4b7526ddc30554200f54d081d --- .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 9313558cc2c..6a08f7222c7 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -62,7 +62,7 @@ public class KotlinBuilderModuleScriptGenerator { ) throws IOException { - KotlinModuleDescriptionBuilder builder = FACTORY.create(getIncrementalCacheDir(context).getAbsolutePath()); + KotlinModuleDescriptionBuilder builder = FACTORY.create(); boolean noSources = true; @@ -107,10 +107,6 @@ public class KotlinBuilderModuleScriptGenerator { return scriptFile; } - public static File getIncrementalCacheDir(CompileContext context) { - return new File(context.getProjectDescriptor().dataManager.getDataPaths().getDataStorageRoot(), "kotlin"); - } - @NotNull private static File getOutputDir(@NotNull ModuleBuildTarget target) { File outputDir = target.getOutputDir(); From df3604fc6a21901b92ae468001bcee3ff1ac2e9c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 19 Aug 2014 20:49:48 +0400 Subject: [PATCH 0143/1557] Passing services via type-safe container instead of map. Original commit: f3b7ae379f15e4bacb88990150eb7e918bc17c05 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 3de567053f6..a09cbed0ddf 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -37,9 +37,11 @@ import org.jetbrains.jet.compiler.runner.CompilerEnvironment; import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants; import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.compiler.runner.SimpleOutputItem; +import org.jetbrains.jet.config.CompilerServices; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.jps.incremental.*; +import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -125,10 +127,12 @@ public class KotlinBuilder extends ModuleLevelBuilder { incrementalCaches.put(target, dataManager.getStorage(target, IncrementalCacheStorageProvider.INSTANCE$)); } - IncrementalCacheProviderImpl cacheProvider = new IncrementalCacheProviderImpl(incrementalCaches); + CompilerServices compilerServices = new CompilerServices.Builder() + .register(IncrementalCacheProvider.class, new IncrementalCacheProviderImpl(incrementalCaches)) + .build(); CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor( - PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), cacheProvider); + PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), compilerServices); if (!environment.success()) { environment.reportErrorsTo(messageCollector); return ExitCode.ABORT; From 5dd641c0304e2350f72a202168e1a98c354a035e Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 19 Aug 2014 21:03:21 +0400 Subject: [PATCH 0144/1557] Passing condition to prefer parent class loader as a parameter to preloader. Original commit: fe27b2264a97c6b267f34e83145765af24657ee3 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index a09cbed0ddf..ba809168e2f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -42,6 +42,7 @@ import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.jps.incremental.*; import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; +import org.jetbrains.jet.preloading.ClassCondition; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; @@ -132,7 +133,13 @@ public class KotlinBuilder extends ModuleLevelBuilder { .build(); CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor( - PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), compilerServices); + PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), new ClassCondition() { + @Override + public boolean accept(String className) { + return className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") || + className.equals("org.jetbrains.jet.config.CompilerServices"); + } + }, compilerServices); if (!environment.success()) { environment.reportErrorsTo(messageCollector); return ExitCode.ABORT; From 2305d26a43df37c350e3c1f5fa00a77196f64971 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 20 Aug 2014 13:45:52 +0400 Subject: [PATCH 0145/1557] Minor. Renamed and cleaned CompilerServices -> Services. Original commit: 487f3812879fd8bc6d7484fb0fa6142189c3fc71 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index ba809168e2f..44e9152c20f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -37,7 +37,7 @@ import org.jetbrains.jet.compiler.runner.CompilerEnvironment; import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants; import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.compiler.runner.SimpleOutputItem; -import org.jetbrains.jet.config.CompilerServices; +import org.jetbrains.jet.config.Services; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.jps.incremental.*; @@ -128,7 +128,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { incrementalCaches.put(target, dataManager.getStorage(target, IncrementalCacheStorageProvider.INSTANCE$)); } - CompilerServices compilerServices = new CompilerServices.Builder() + Services compilerServices = new Services.Builder() .register(IncrementalCacheProvider.class, new IncrementalCacheProviderImpl(incrementalCaches)) .build(); From f679db9c3172444827838fb324faf491fad2a595 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 20 Aug 2014 14:29:03 +0400 Subject: [PATCH 0146/1557] Minor. Renamed and cleaned CompilerServices -> Services. Original commit: 56fd9cec7a39bb8239eb9b7ec98985475b329966 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 44e9152c20f..8e205251104 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -137,7 +137,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { @Override public boolean accept(String className) { return className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") || - className.equals("org.jetbrains.jet.config.CompilerServices"); + className.equals("org.jetbrains.jet.config.Services"); } }, compilerServices); if (!environment.success()) { From 713e2cb172417640218ed042d683c7a17ab36964 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 21 Aug 2014 19:54:59 +0400 Subject: [PATCH 0147/1557] Add dependency on intellij-core explicitly util module doesn't export intellij-core dependency Original commit: 77416aba5f639b8c309dcbf89291c4eb00fb3f90 --- jps/jps-plugin/jps-plugin.iml | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 5ccd205933f..89925d41a75 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -21,6 +21,7 @@ + From aa996e703ae61753ce6671034309bc9222669049 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 25 Aug 2014 12:36:26 +0400 Subject: [PATCH 0148/1557] Remove dependency on Maps from jps-plugin It seems that there's no Guava in the classpath formed for JPS plugins #KT-5676 Fixed Original commit: 994348b0cac163e43765e5a1b08d08a6725dee53 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java index 8e205251104..f40738b42ac 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java @@ -16,7 +16,6 @@ package org.jetbrains.jet.jps.build; -import com.google.common.collect.Maps; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -37,13 +36,16 @@ import org.jetbrains.jet.compiler.runner.CompilerEnvironment; import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants; import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; import org.jetbrains.jet.compiler.runner.SimpleOutputItem; -import org.jetbrains.jet.config.Services; import org.jetbrains.jet.config.IncrementalCompilation; +import org.jetbrains.jet.config.Services; import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; -import org.jetbrains.jet.jps.incremental.*; +import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl; +import org.jetbrains.jet.jps.incremental.IncrementalCacheProviderImpl; +import org.jetbrains.jet.jps.incremental.IncrementalCacheStorageProvider; import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; import org.jetbrains.jet.preloading.ClassCondition; import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.DirtyFilesHolder; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; @@ -123,7 +125,7 @@ public class KotlinBuilder extends ModuleLevelBuilder { File outputDir = representativeTarget.getOutputDir(); BuildDataManager dataManager = context.getProjectDescriptor().dataManager; - Map incrementalCaches = Maps.newHashMap(); + Map incrementalCaches = UtilsPackage.newHashMapWithExpectedSize(chunk.getTargets().size()); for (ModuleBuildTarget target : chunk.getTargets()) { incrementalCaches.put(target, dataManager.getStorage(target, IncrementalCacheStorageProvider.INSTANCE$)); } From ce906f6ccaa794d8c8b75e17be1f0ec4a17c431d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 25 Aug 2014 17:36:32 +0400 Subject: [PATCH 0149/1557] Minor, remove dependency of everything on "descriptor.loader.java" Everything already depends on "frontend.java" which exports "descriptor.loader.java" Original commit: d5d4cff7014d722115426e68381d2abf723eba8d --- jps/jps-plugin/jps-plugin.iml | 1 - 1 file changed, 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 89925d41a75..06a90fbc110 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -17,7 +17,6 @@ - From d577d5165105243be650d00d2bbf34e886e32b72 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 25 Aug 2014 16:49:52 +0400 Subject: [PATCH 0150/1557] Regenerate tests after recent generator improvements Original commit: 087eec45211fa3ba37cb6c49eb35589517e849ba --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index ea7f0d6ecd4..58756f3e9ce 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -16,17 +16,14 @@ package org.jetbrains.jet.jps.build; -import junit.framework.Assert; import junit.framework.Test; import junit.framework.TestSuite; - -import java.io.File; -import java.util.regex.Pattern; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest; +import java.io.File; +import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @@ -34,7 +31,7 @@ import org.jetbrains.jet.jps.build.AbstractIncrementalJpsTest; @InnerTestClasses({IncrementalJpsTestGenerated.PureKotlin.class}) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public void testAllFilesPresentInIncremental() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @@ -56,7 +53,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInPureKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("annotations") From 6a15f0ad8f0f4243afcc46bccc376539c3aa8722 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 20 Aug 2014 14:31:02 +0400 Subject: [PATCH 0151/1557] Converted KotlinBuilder from Java to Kotlin Original commit: 75ffc0f5ff139a0b617731124bdfeef05ba60a2e --- .../jet/jps/build/KotlinBuilder.java | 404 ------------------ .../jetbrains/jet/jps/build/KotlinBuilder.kt | 323 ++++++++++++++ .../jps/build/KotlinSourceFileCollector.java | 1 + 3 files changed, 324 insertions(+), 404 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java deleted file mode 100644 index f40738b42ac..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java +++ /dev/null @@ -1,404 +0,0 @@ -/* - * Copyright 2010-2013 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.jps.build; - -import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.Function; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.MultiMap; -import gnu.trove.THashSet; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.KotlinVersion; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.jet.cli.common.messages.MessageCollector; -import org.jetbrains.jet.compiler.CompilerSettings; -import org.jetbrains.jet.compiler.runner.CompilerEnvironment; -import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants; -import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl; -import org.jetbrains.jet.compiler.runner.SimpleOutputItem; -import org.jetbrains.jet.config.IncrementalCompilation; -import org.jetbrains.jet.config.Services; -import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; -import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl; -import org.jetbrains.jet.jps.incremental.IncrementalCacheProviderImpl; -import org.jetbrains.jet.jps.incremental.IncrementalCacheStorageProvider; -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider; -import org.jetbrains.jet.preloading.ClassCondition; -import org.jetbrains.jet.utils.PathUtil; -import org.jetbrains.jet.utils.UtilsPackage; -import org.jetbrains.jps.ModuleChunk; -import org.jetbrains.jps.builders.DirtyFilesHolder; -import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; -import org.jetbrains.jps.incremental.*; -import org.jetbrains.jps.incremental.java.JavaBuilder; -import org.jetbrains.jps.incremental.messages.BuildMessage; -import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.jetbrains.jps.incremental.storage.BuildDataManager; -import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.module.JpsModule; - -import java.io.File; -import java.io.FileFilter; -import java.io.IOException; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.*; - -import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*; -import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX; -import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler; -import static org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler; - -public class KotlinBuilder extends ModuleLevelBuilder { - private static final Key> ALL_COMPILED_FILES_KEY = Key.create("_all_kotlin_compiled_files_"); - private static final Key> PROCESSED_TARGETS_WITH_REMOVED_FILES = Key.create("_processed_targets_with_removed_files_"); - - public static final String KOTLIN_BUILDER_NAME = "Kotlin Builder"; - private static final List COMPILABLE_FILE_EXTENSIONS = Collections.singletonList("kt"); - - private static final Function MODULE_NAME = new Function() { - @Override - public String fun(JpsModule module) { - return module.getName(); - } - }; - - protected KotlinBuilder() { - super(BuilderCategory.SOURCE_PROCESSOR); - } - - @NotNull - @Override - public String getPresentableName() { - return KOTLIN_BUILDER_NAME; - } - - @Override - public ExitCode build( - CompileContext context, - ModuleChunk chunk, - DirtyFilesHolder dirtyFilesHolder, - OutputConsumer outputConsumer - ) throws ProjectBuildException, IOException { - MessageCollector messageCollector = new MessageCollectorAdapter(context); - // Workaround for Android Studio - if (!isJavaPluginEnabled(context)) { - messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION); - return ExitCode.NOTHING_DONE; - } - - ModuleBuildTarget representativeTarget = chunk.representativeTarget(); - - // For non-incremental build: take all sources - if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()) { - return ExitCode.NOTHING_DONE; - } - - boolean hasKotlinFiles = hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk); - if (!hasKotlinFiles) { - return ExitCode.NOTHING_DONE; - } - - messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION); - - File outputDir = representativeTarget.getOutputDir(); - - BuildDataManager dataManager = context.getProjectDescriptor().dataManager; - Map incrementalCaches = UtilsPackage.newHashMapWithExpectedSize(chunk.getTargets().size()); - for (ModuleBuildTarget target : chunk.getTargets()) { - incrementalCaches.put(target, dataManager.getStorage(target, IncrementalCacheStorageProvider.INSTANCE$)); - } - - Services compilerServices = new Services.Builder() - .register(IncrementalCacheProvider.class, new IncrementalCacheProviderImpl(incrementalCaches)) - .build(); - - CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor( - PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), new ClassCondition() { - @Override - public boolean accept(String className) { - return className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") || - className.equals("org.jetbrains.jet.config.Services"); - } - }, compilerServices); - if (!environment.success()) { - environment.reportErrorsTo(messageCollector); - return ExitCode.ABORT; - } - - assert outputDir != null : "CompilerEnvironment must have checked for outputDir to be not null, but it didn't"; - - OutputItemsCollectorImpl outputItemCollector = new OutputItemsCollectorImpl(); - - JpsProject project = representativeTarget.getModule().getProject(); - CommonCompilerArguments commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project); - commonArguments.verbose = true; // Make compiler report source to output files mapping - - CompilerSettings compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project); - - final Set allCompiledFiles = getAllCompiledFilesContainer(context); - - if (JpsUtils.isJsKotlinModule(representativeTarget)) { - if (chunk.getModules().size() > 1) { - // We do not support circular dependencies, but if they are present, we do our best should not break the build, - // so we simply yield a warning and report NOTHING_DONE - messageCollector.report( - WARNING, "Circular dependencies are not supported. " + - "The following JS modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + - "Kotlin is not compiled for these modules", - NO_LOCATION); - return ExitCode.NOTHING_DONE; - } - - Collection sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget); - //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); - - if (sourceFiles.isEmpty()) { - return ExitCode.NOTHING_DONE; - } - - File outputFile = new File(outputDir, representativeTarget.getModule().getName() + ".js"); - List libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget); - K2JSCompilerArguments k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project); - - runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, - outputItemCollector, sourceFiles, libraryFiles, outputFile); - } - else { - if (chunk.getModules().size() > 1) { - messageCollector.report( - WARNING, "Circular dependencies are only partially supported. " + - "The following modules depend on each other: " + StringUtil.join(chunk.getModules(), MODULE_NAME, ", ") + ". " + - "Kotlin will compile them, but some strange effect may happen", - NO_LOCATION); - } - - MultiMap filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); - for (ModuleBuildTarget target : filesToCompile.keySet()) { - filesToCompile.getModifiable(target).removeAll(allCompiledFiles); - } - allCompiledFiles.addAll(filesToCompile.values()); - - Set processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context); - - boolean haveRemovedFiles = false; - for (ModuleBuildTarget target : chunk.getTargets()) { - if (!KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target).isEmpty()) { - if (processedTargetsWithRemoved.add(target)) { - haveRemovedFiles = true; - } - } - } - - File moduleFile = KotlinBuilderModuleScriptGenerator - .generateModuleDescription(context, chunk, filesToCompile, haveRemovedFiles); - if (moduleFile == null) { - // No Kotlin sources found - return ExitCode.NOTHING_DONE; - } - - K2JVMCompilerArguments k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project); - - runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, - moduleFile, outputItemCollector); - moduleFile.delete(); - } - - // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below - Map sourceToTarget = new HashMap(); - if (chunk.getTargets().size() > 1) { - for (ModuleBuildTarget target : chunk.getTargets()) { - for (File file : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { - sourceToTarget.put(file, target); - } - } - } - - for (ModuleBuildTarget target : chunk.getTargets()) { - incrementalCaches.get(target).clearCacheForRemovedFiles( - KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), target.getOutputDir()); - } - - IncrementalCacheImpl.RecompilationDecision recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING; - - for (SimpleOutputItem outputItem : outputItemCollector.getOutputs()) { - ModuleBuildTarget target = null; - Collection sourceFiles = outputItem.getSourceFiles(); - if (!sourceFiles.isEmpty()) { - target = sourceToTarget.get(sourceFiles.iterator().next()); - } - - if (target == null) { - target = representativeTarget; - } - - File outputFile = outputItem.getOutputFile(); - - if (IncrementalCompilation.ENABLED) { - IncrementalCacheImpl.RecompilationDecision newDecision = incrementalCaches.get(target).saveFileToCache(sourceFiles, outputFile); - recompilationDecision = recompilationDecision.merge(newDecision); - } - - outputConsumer.registerOutputFile(target, outputFile, paths(sourceFiles)); - } - - if (IncrementalCompilation.ENABLED) { - if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { - allCompiledFiles.clear(); - return ExitCode.CHUNK_REBUILD_REQUIRED; - } - if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.COMPILE_OTHERS) { - // TODO should mark dependencies as dirty, as well - FSOperations.markDirty(context, chunk, new FileFilter() { - @Override - public boolean accept(@NotNull File file) { - return !allCompiledFiles.contains(file); - } - }); - } - return ExitCode.ADDITIONAL_PASS_REQUIRED; - } - else { - return ExitCode.OK; - } - } - - private static Set getAllCompiledFilesContainer(CompileContext context) { - Set allCompiledFiles = ALL_COMPILED_FILES_KEY.get(context); - if (allCompiledFiles == null) { - allCompiledFiles = new THashSet(FileUtil.FILE_HASHING_STRATEGY); - ALL_COMPILED_FILES_KEY.set(context, allCompiledFiles); - } - return allCompiledFiles; - } - - private static Set getProcessedTargetsWithRemovedFilesContainer(CompileContext context) { - Set set = PROCESSED_TARGETS_WITH_REMOVED_FILES.get(context); - if (set == null) { - set = new HashSet(); - PROCESSED_TARGETS_WITH_REMOVED_FILES.set(context, set); - } - return set; - } - - private static boolean hasKotlinDirtyOrRemovedFiles( - @NotNull DirtyFilesHolder dirtyFilesHolder, - @NotNull ModuleChunk chunk - ) - throws IOException { - if (!KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder).isEmpty()) { - return true; - } - - for (ModuleBuildTarget target : chunk.getTargets()) { - if (!KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target).isEmpty()) { - return true; - } - } - - return false; - } - - private static boolean isJavaPluginEnabled(@NotNull CompileContext context) { - try { - // Using reflection for backward compatibility with IDEA 12 - Field javaPluginIsEnabledField = JavaBuilder.class.getDeclaredField("IS_ENABLED"); - return Modifier.isPublic(javaPluginIsEnabledField.getModifiers()) ? JavaBuilder.IS_ENABLED.get(context, Boolean.TRUE) : true; - } - catch (NoSuchFieldException e) { - throw new IllegalArgumentException("Cannot check if Java Jps Plugin is enabled", e); - } - } - - private static Collection paths(Collection files) { - Collection result = ContainerUtil.newArrayList(); - for (File file : files) { - result.add(file.getPath()); - } - return result; - } - - public static class MessageCollectorAdapter implements MessageCollector { - - private final CompileContext context; - - public MessageCollectorAdapter(@NotNull CompileContext context) { - this.context = context; - } - - @Override - public void report( - @NotNull CompilerMessageSeverity severity, - @NotNull String message, - @NotNull CompilerMessageLocation location - ) { - String prefix = ""; - if (severity == EXCEPTION) { - prefix = INTERNAL_ERROR_PREFIX; - } - context.processMessage(new CompilerMessage( - CompilerRunnerConstants.KOTLIN_COMPILER_NAME, - kind(severity), - prefix + message + renderLocationIfNeeded(location), - location.getPath(), - -1, -1, -1, - location.getLine(), - location.getColumn() - )); - } - - private static String renderLocationIfNeeded(@NotNull CompilerMessageLocation location) { - if (location == NO_LOCATION) return ""; - - // Sometimes we report errors in JavaScript library stubs, i.e. files like core/javautil.kt - // IDEA can't find these files, and does not display paths in Messages View, so we add the position information - // to the error message itself: - String pathname = String.valueOf(location.getPath()); - return new File(pathname).exists() ? "" : " (" + location + ")"; - } - - @NotNull - private static BuildMessage.Kind kind(@NotNull CompilerMessageSeverity severity) { - switch (severity) { - case INFO: - return BuildMessage.Kind.INFO; - case ERROR: - case EXCEPTION: - return BuildMessage.Kind.ERROR; - case WARNING: - return BuildMessage.Kind.WARNING; - case LOGGING: - return BuildMessage.Kind.PROGRESS; - default: - throw new IllegalArgumentException("Unsupported severity: " + severity); - } - } - - } - - @Override - public List getCompilableFileExtensions() { - return COMPILABLE_FILE_EXTENSIONS; - } -} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt new file mode 100644 index 00000000000..a322984dea9 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -0,0 +1,323 @@ +/* + * Copyright 2010-2014 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.jps.build + +import com.intellij.openapi.util.Key +import com.intellij.openapi.util.io.FileUtil +import gnu.trove.THashSet +import org.jetbrains.jet.cli.common.KotlinVersion +import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation +import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.jet.cli.common.messages.MessageCollector +import org.jetbrains.jet.compiler.runner.CompilerEnvironment +import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants +import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl +import org.jetbrains.jet.config.Services +import org.jetbrains.jet.config.IncrementalCompilation +import org.jetbrains.jet.jps.JpsKotlinCompilerSettings +import org.jetbrains.jet.jps.incremental.* +import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider +import org.jetbrains.jet.utils.PathUtil +import org.jetbrains.jps.ModuleChunk +import org.jetbrains.jps.builders.DirtyFilesHolder +import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor +import org.jetbrains.jps.incremental.* +import org.jetbrains.jps.incremental.java.JavaBuilder +import org.jetbrains.jps.incremental.messages.BuildMessage +import org.jetbrains.jps.incremental.messages.CompilerMessage +import java.io.File +import java.io.IOException +import java.lang.reflect.Modifier +import java.util.* +import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION +import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.* +import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX +import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler +import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler +import org.jetbrains.jet.utils.keysToMap +import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* + +public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { + + override fun getPresentableName() = "Kotlin Builder" + + override fun getCompilableFileExtensions() = arrayListOf("kt") + + override fun build( + context: CompileContext, + chunk: ModuleChunk, + dirtyFilesHolder: DirtyFilesHolder, + outputConsumer: ModuleLevelBuilder.OutputConsumer + ): ModuleLevelBuilder.ExitCode { + val messageCollector = MessageCollectorAdapter(context) + // Workaround for Android Studio + if (!isJavaPluginEnabled(context)) { + messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION) + return NOTHING_DONE + } + + val representativeTarget = chunk.representativeTarget() + + // For non-incremental build: take all sources + if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()) { + return NOTHING_DONE + } + + if (!hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { + return NOTHING_DONE + } + + messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION) + + val outputDir = representativeTarget.getOutputDir() + + val dataManager = context.getProjectDescriptor().dataManager + val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) } + + val compilerServices = Services.Builder() + .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) + .build() + + val environment = CompilerEnvironment.getEnvironmentFor( + PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), + outputDir, + javaClass.getClassLoader(), + { className -> + className!!.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") + || className == "org.jetbrains.jet.config.Services" + }, + compilerServices + ) + + if (!environment.success()) { + environment.reportErrorsTo(messageCollector) + return ABORT + } + + assert(outputDir != null, "CompilerEnvironment must have checked for outputDir to be not null, but it didn't") + + val outputItemCollector = OutputItemsCollectorImpl() + + val project = representativeTarget.getModule().getProject()!! + val commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project) + commonArguments.verbose = true // Make compiler report source to output files mapping + + val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) + + val allCompiledFiles = getAllCompiledFilesContainer(context) + + if (JpsUtils.isJsKotlinModule(representativeTarget)) { + if (chunk.getModules().size() > 1) { + // We do not support circular dependencies, but if they are present, we do our best should not break the build, + // so we simply yield a warning and report NOTHING_DONE + messageCollector.report(WARNING, "Circular dependencies are not supported. " + + "The following JS modules depend on each other: " + + chunk.getModules().map { it.getName() }.joinToString(", ") + + ". " + + "Kotlin is not compiled for these modules", NO_LOCATION) + return NOTHING_DONE + } + + val sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget) + //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); + + if (sourceFiles.isEmpty()) { + return NOTHING_DONE + } + + val outputFile = File(outputDir, representativeTarget.getModule().getName() + ".js") + val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) + val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) + + runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + } + else { + if (chunk.getModules().size() > 1) { + messageCollector.report(WARNING, "Circular dependencies are only partially supported. " + + "The following modules depend on each other: " + + chunk.getModules().map { it.getName() }.joinToString(", ") + + ". " + + "Kotlin will compile them, but some strange effect may happen", NO_LOCATION) + } + + val filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) + for (target in filesToCompile.keySet()) { + filesToCompile.getModifiable(target).removeAll(allCompiledFiles) + } + allCompiledFiles.addAll(filesToCompile.values()) + + val processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context) + + var haveRemovedFiles = false + for (target in chunk.getTargets()) { + if (!KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target).isEmpty()) { + if (processedTargetsWithRemoved.add(target)) { + haveRemovedFiles = true + } + } + } + + val moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile, haveRemovedFiles) + if (moduleFile == null) { + // No Kotlin sources found + return NOTHING_DONE + } + + val k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project) + + runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) + moduleFile.delete() + } + + // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below + val sourceToTarget = HashMap() + if (chunk.getTargets().size() > 1) { + for (target in chunk.getTargets()) { + for (file in KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { + sourceToTarget.put(file, target) + } + } + } + + for ((target, cache) in incrementalCaches) { + cache.clearCacheForRemovedFiles( + KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), + target.getOutputDir()!! + ) + } + + var recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING + + for (outputItem in outputItemCollector.getOutputs()) { + var target: ModuleBuildTarget? = null + val sourceFiles = outputItem.getSourceFiles() + if (!sourceFiles.isEmpty()) { + target = sourceToTarget[sourceFiles.iterator().next()] + } + + if (target == null) { + target = representativeTarget + } + + val outputFile = outputItem.getOutputFile() + + if (IncrementalCompilation.ENABLED) { + val newDecision = incrementalCaches[target]!!.saveFileToCache(sourceFiles, outputFile) + recompilationDecision = recompilationDecision.merge(newDecision) + } + + outputConsumer.registerOutputFile(target, outputFile, sourceFiles.map { it.getPath() }) + } + + if (IncrementalCompilation.ENABLED) { + if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { + allCompiledFiles.clear() + return CHUNK_REBUILD_REQUIRED + } + if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.COMPILE_OTHERS) { + // TODO should mark dependencies as dirty, as well + FSOperations.markDirty(context, chunk, { file -> !allCompiledFiles.contains(file) }) + } + return ADDITIONAL_PASS_REQUIRED + } + + return OK + } + + public class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { + + override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { + var prefix = "" + if (severity == EXCEPTION) { + prefix = INTERNAL_ERROR_PREFIX + } + context.processMessage(CompilerMessage( + CompilerRunnerConstants.KOTLIN_COMPILER_NAME, + kind(severity), + prefix + message + renderLocationIfNeeded(location), + location.getPath(), + -1, -1, -1, + location.getLine().toLong(), location.getColumn().toLong() + )) + } + + private fun renderLocationIfNeeded(location: CompilerMessageLocation): String { + if (location == NO_LOCATION) return "" + + // Sometimes we report errors in JavaScript library stubs, i.e. files like core/javautil.kt + // IDEA can't find these files, and does not display paths in Messages View, so we add the position information + // to the error message itself: + val pathname = "" + location.getPath() + return if (File(pathname).exists()) "" else " (" + location + ")" + } + + private fun kind(severity: CompilerMessageSeverity): BuildMessage.Kind { + return when (severity) { + INFO -> BuildMessage.Kind.INFO + ERROR, EXCEPTION -> BuildMessage.Kind.ERROR + WARNING -> BuildMessage.Kind.WARNING + LOGGING -> BuildMessage.Kind.PROGRESS + else -> throw IllegalArgumentException("Unsupported severity: " + severity) + } + } + + } +} + +private val ALL_COMPILED_FILES_KEY = Key.create>("_all_kotlin_compiled_files_") +private fun getAllCompiledFilesContainer(context: CompileContext): MutableSet { + var allCompiledFiles = ALL_COMPILED_FILES_KEY.get(context) + if (allCompiledFiles == null) { + allCompiledFiles = THashSet(FileUtil.FILE_HASHING_STRATEGY) + ALL_COMPILED_FILES_KEY.set(context, allCompiledFiles) + } + return allCompiledFiles!! +} + +private val PROCESSED_TARGETS_WITH_REMOVED_FILES = Key.create>("_processed_targets_with_removed_files_") +private fun getProcessedTargetsWithRemovedFilesContainer(context: CompileContext): MutableSet { + var set = PROCESSED_TARGETS_WITH_REMOVED_FILES.get(context) + if (set == null) { + set = HashSet() + PROCESSED_TARGETS_WITH_REMOVED_FILES.set(context, set) + } + return set!! +} + +private fun hasKotlinDirtyOrRemovedFiles( + dirtyFilesHolder: DirtyFilesHolder, + chunk: ModuleChunk +): Boolean { + if (!KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder).isEmpty()) { + return true + } + + return chunk.getTargets().any { !KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isEmpty() } +} + +private fun isJavaPluginEnabled(context: CompileContext): Boolean { + try { + // Using reflection for backward compatibility with IDEA 12 + val javaPluginIsEnabledField = javaClass().getDeclaredField("IS_ENABLED") + return if (Modifier.isPublic(javaPluginIsEnabledField.getModifiers())) JavaBuilder.IS_ENABLED[context, true] else true + } + catch (e: NoSuchFieldException) { + throw IllegalArgumentException("Cannot check if Java Jps Plugin is enabled", e) + } + +} + diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index 04566c5e5fc..c1e77ab0d3d 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -40,6 +40,7 @@ import java.util.List; public class KotlinSourceFileCollector { // For incremental compilation + @NotNull public static MultiMap getDirtySourceFiles(DirtyFilesHolder dirtyFilesHolder) throws IOException { From 0504cef6a9522d6ac95b707bc328ddb231103173 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 26 Aug 2014 17:05:41 +0400 Subject: [PATCH 0152/1557] Introduced bare kotlin compiler plugin for IntelliJ IDEA developers. Original commit: 822f02e23a5ca489bae83178257609bcc47c239d --- jps/jps-plugin/bare-plugin/bare-plugin.iml | 15 ++++++ .../bare-plugin/src/META-INF/plugin.xml | 22 ++++++++ .../jet/plugin/bare/BareJpsPluginRegistrar.kt | 50 +++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 jps/jps-plugin/bare-plugin/bare-plugin.iml create mode 100644 jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml create mode 100644 jps/jps-plugin/bare-plugin/src/org/jetbrains/jet/plugin/bare/BareJpsPluginRegistrar.kt diff --git a/jps/jps-plugin/bare-plugin/bare-plugin.iml b/jps/jps-plugin/bare-plugin/bare-plugin.iml new file mode 100644 index 00000000000..80ba7107224 --- /dev/null +++ b/jps/jps-plugin/bare-plugin/bare-plugin.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml new file mode 100644 index 00000000000..8722daba9d2 --- /dev/null +++ b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml @@ -0,0 +1,22 @@ + + org.jetbrains.kotlin.bare + + Kotlin Bare Compiler for IntelliJ IDEA + + This plugin is intended for IntelliJ IDEA developers only. It should be installed along with main Kotlin plugin. + When main Kotlin plugin is disabled due to incompatibility with bleeding edge IntelliJ IDEA, + this plugin will still compile Kotlin sources. +
+ This plugin is only capable of compiling Kotlin code. All highlighting, inspections, refactorings are disabled. + + @snapshot@ + JetBrains Inc. + + + + + + org.jetbrains.jet.plugin.bare.BareJpsPluginRegistrar + + + diff --git a/jps/jps-plugin/bare-plugin/src/org/jetbrains/jet/plugin/bare/BareJpsPluginRegistrar.kt b/jps/jps-plugin/bare-plugin/src/org/jetbrains/jet/plugin/bare/BareJpsPluginRegistrar.kt new file mode 100644 index 00000000000..e5f87180f9b --- /dev/null +++ b/jps/jps-plugin/bare-plugin/src/org/jetbrains/jet/plugin/bare/BareJpsPluginRegistrar.kt @@ -0,0 +1,50 @@ +/* + * Copyright 2010-2014 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.plugin.bare + +import com.intellij.compiler.server.CompileServerPlugin +import com.intellij.ide.plugins.IdeaPluginDescriptor +import com.intellij.ide.plugins.PluginManager +import com.intellij.openapi.components.ApplicationComponent +import com.intellij.openapi.extensions.Extensions +import com.intellij.openapi.extensions.PluginId + +public class BareJpsPluginRegistrar : ApplicationComponent { + override fun initComponent() { + val mainKotlinPlugin = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin")) + + if (mainKotlinPlugin != null && mainKotlinPlugin.isEnabled()) { + // do nothing + } + else { + val compileServerPlugin = CompileServerPlugin() + compileServerPlugin.setClasspath("jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-bare-plugin.jar") + compileServerPlugin.setPluginDescriptor(PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin.bare"))) + + Extensions.getRootArea() + .getExtensionPoint(CompileServerPlugin.EP_NAME) + .registerExtension(compileServerPlugin) + } + } + + override fun disposeComponent() { + } + + override fun getComponentName(): String { + return javaClass.getName() + } +} From 691779b3c47aadaa09ca0b143eab8465a30ac58d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 26 Aug 2014 18:26:28 +0400 Subject: [PATCH 0153/1557] Removed dependency on intellij-core in jps-plugin to avoid linkage errors. Original commit: 97beb92fbcbb2a795b6f7aa10b47af0ed1303a9c --- jps/jps-plugin/jps-plugin.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 06a90fbc110..25f9ab18817 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -20,7 +20,7 @@ - + From 05c27079b12c1b4482c58f0d50b79fdd9f5403c9 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 26 Aug 2014 20:36:50 +0400 Subject: [PATCH 0154/1557] Minor. Removed redundant assertions. Original commit: 95ab99cce3e93f337dc4809b9ec41718d305b2dd --- .../org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 6f2585576ff..44f051a7fb8 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -132,11 +132,11 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) - JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject!!) + JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject) .setOutputUrl(JpsPathUtil.pathToUrl(getAbsolutePath("out"))) addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) - AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject!!) + AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject) initialMake() From 537ab3e77e2af97ef3a5dc93cdaa58e044d5186b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 27 Aug 2014 16:41:36 +0400 Subject: [PATCH 0155/1557] Fixed compilation. Original commit: eae49e23d4cc09642e257d8d1f2f46a4ac7197c5 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index a322984dea9..fdf292e60cf 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -52,8 +52,11 @@ import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { + class object { + public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" + } - override fun getPresentableName() = "Kotlin Builder" + override fun getPresentableName() = KOTLIN_BUILDER_NAME override fun getCompilableFileExtensions() = arrayListOf("kt") From dcd41cc1b1c1bd90f910569d158ee9ae55fb23c5 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 27 Aug 2014 18:12:17 +0400 Subject: [PATCH 0156/1557] Supported multi-module incremental compilation tests. Original commit: 15cb2ec586f962c928e36f27c4235e1704527348 --- .../jps/build/AbstractIncrementalJpsTest.kt | 97 ++++++++++++++++--- 1 file changed, 82 insertions(+), 15 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 44f051a7fb8..b66c42386ff 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -30,6 +30,8 @@ import org.jetbrains.jet.config.IncrementalCompilation import java.util.ArrayList import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import kotlin.test.fail +import java.util.HashMap +import org.jetbrains.jet.utils.keysToMap public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { private var testDataDir: File by Delegates.notNull() @@ -69,16 +71,35 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { buildGetLog(CompileScopeTestBuilder.rebuild().allModules()) } - private fun getModificationsToPerform(): List> { + private fun getModificationsToPerform(moduleNames: Collection?): List> { fun getModificationsForIteration(newSuffix: String, deleteSuffix: String): List { + + fun getDirPrefix(fileName: String): String { + val underscore = fileName.indexOf("_") + + if (underscore != -1) { + val module = fileName.substring(0, underscore) + + assert(moduleNames != null) { "File name has module prefix, but multi-module environment is absent" } + assert(module in moduleNames!!) { "Module not found for file with prefix: $fileName" } + + return module + "/src" + } + + assert(moduleNames == null) { "Test is multi-module, but file has no module prefix: $fileName" } + return "src" + } + val modifications = ArrayList() for (file in testDataDir.listFiles()!!) { - if (file.getName().endsWith(newSuffix)) { - modifications.add(ModifyContent(file.getName().trimTrailing(newSuffix), file)) + val fileName = file.getName() + + if (fileName.endsWith(newSuffix)) { + modifications.add(ModifyContent(getDirPrefix(fileName) + "/" + fileName.trimTrailing(newSuffix), file)) } - if (file.getName().endsWith(deleteSuffix)) { - modifications.add(DeleteFile(file.getName().trimTrailing(deleteSuffix))) + if (fileName.endsWith(deleteSuffix)) { + modifications.add(DeleteFile(getDirPrefix(fileName) + "/" + fileName.trimTrailing(deleteSuffix))) } } return modifications @@ -122,6 +143,22 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { rebuildAndCheckOutput() } + private fun readModuleDependencies(): Map>? { + val dependenciesTxt = File(testDataDir, "dependencies.txt") + if (!dependenciesTxt.exists()) return null + + val result = HashMap>() + for (line in dependenciesTxt.readLines()) { + val split = line.split("->") + val module = split[0] + val dependencies = split[1].split(",") + + result[module] = dependencies.toList() + } + + return result + } + protected fun doTest(testDataPath: String) { if (!IncrementalCompilation.ENABLED) { return @@ -130,17 +167,47 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { testDataDir = File(testDataPath) workDir = FileUtil.createTempDirectory("jps-build", null) - FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) - JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject) .setOutputUrl(JpsPathUtil.pathToUrl(getAbsolutePath("out"))) - addModule("module", array(getAbsolutePath("src")), null, null, addJdk("my jdk")) + val jdk = addJdk("my jdk") + + val moduleDependencies = readModuleDependencies() + + val moduleNames: Set? // null means one module + + if (moduleDependencies == null) { + addModule("module", array(getAbsolutePath("src")), null, null, jdk) + + FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) + + moduleNames = null + } + else { + val nameToModule = moduleDependencies.keySet() + .keysToMap { addModule(it, array(getAbsolutePath(it + "/src")), null, null, jdk)!! } + + for ((moduleName, dependencies) in moduleDependencies) { + val module = nameToModule[moduleName]!! + for (dependency in dependencies) { + module.getDependenciesList().addModuleDependency(nameToModule[dependency]!!) + } + } + + for (module in nameToModule.values()) { + val moduleName = module.getName() + + FileUtil.copyDir(testDataDir, File(workDir, moduleName + "/src"), + { it.getName().startsWith(moduleName + "_") && (it.getName().endsWith(".kt") || it.getName().endsWith(".java")) }) + } + + moduleNames = nameToModule.keySet() + } AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject) initialMake() - val modifications = getModificationsToPerform() + val modifications = getModificationsToPerform(moduleNames) val logs = ArrayList() for (step in modifications) { @@ -179,15 +246,15 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } } - private abstract class Modification(val name: String) { + private abstract class Modification(val path: String) { abstract fun perform(workDir: File) - override fun toString(): String = "${javaClass.getSimpleName()} $name" + override fun toString(): String = "${javaClass.getSimpleName()} $path" } - private class ModifyContent(name: String, val dataFile: File) : Modification(name) { + private class ModifyContent(path: String, val dataFile: File) : Modification(path) { override fun perform(workDir: File) { - val file = File(workDir, "src/$name") + val file = File(workDir, path) val oldLastModified = file.lastModified() dataFile.copyTo(file) @@ -200,9 +267,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } } - private class DeleteFile(name: String) : Modification(name) { + private class DeleteFile(path: String) : Modification(path) { override fun perform(workDir: File) { - val fileToDelete = File(workDir, "src/$name") + val fileToDelete = File(workDir, path) if (!fileToDelete.delete()) { throw AssertionError("Couldn't delete $fileToDelete") } From 4d427833839a19ed0a0fe2e7687c2b732fac16cd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 27 Aug 2014 18:14:29 +0400 Subject: [PATCH 0157/1557] Minor. Clearer logic. Original commit: 76864a3eb089d5a81141285147f048e7b61fca34 --- .../jet/jps/build/KotlinBuilderModuleScriptGenerator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 6a08f7222c7..8a12efc8468 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -79,7 +79,7 @@ public class KotlinBuilderModuleScriptGenerator { ? sourceFiles.get(target) : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)); - if (sourceFiles.size() > 0 || hasRemovedFiles) { + if (moduleSources.size() > 0 || hasRemovedFiles) { noSources = false; if (logger.isEnabled()) { From 81fabc90f9ebdfa65d8f5417f4d22ac64153075f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 27 Aug 2014 18:15:05 +0400 Subject: [PATCH 0158/1557] Fixed redeclaration from incremental compilation. Added workaround for JPS bug. Original commit: 3226093fa6a75fc3086df488087a6848eb804d1b --- .../jps/build/KotlinSourceFileCollector.java | 5 +++++ .../build/IncrementalJpsTestGenerated.java | 22 ++++++++++++++++++- .../circularDependency/simple/build.log | 15 +++++++++++++ .../simple/dependencies.txt | 2 ++ .../circularDependency/simple/module1_a.kt | 9 ++++++++ .../circularDependency/simple/module2_b.kt | 7 ++++++ .../simple/module2_b.kt.new | 11 ++++++++++ 7 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/circularDependency/simple/build.log create mode 100644 jps/jps-plugin/testData/incremental/circularDependency/simple/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/circularDependency/simple/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt.new diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index c1e77ab0d3d..402086b3e03 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -49,6 +49,11 @@ public class KotlinSourceFileCollector { dirtyFilesHolder.processDirtyFiles(new FileProcessor() { @Override public boolean apply(ModuleBuildTarget target, File file, JavaSourceRootDescriptor root) throws IOException { + //TODO this is a workaround for bug in JPS: the latter erroneously calls process with invalid parameters + if (!root.getTarget().equals(target)) { + return true; + } + if (isKotlinSourceFile(file)) { result.putValue(target, file); } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 58756f3e9ce..d1f2f8d6972 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -28,12 +28,31 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("jps-plugin/testData/incremental") -@InnerTestClasses({IncrementalJpsTestGenerated.PureKotlin.class}) +@InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class}) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public void testAllFilesPresentInIncremental() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("jps-plugin/testData/incremental/circularDependency") + @InnerTestClasses({}) + public static class CircularDependency extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInCircularDependency() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/circularDependency"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("simple") + public void testSimple() throws Exception { + doTest("jps-plugin/testData/incremental/circularDependency/simple/"); + } + + public static Test innerSuite() { + TestSuite suite = new TestSuite("CircularDependency"); + suite.addTestSuite(CircularDependency.class); + return suite; + } + } + @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @InnerTestClasses({}) public static class PureKotlin extends AbstractIncrementalJpsTest { @@ -231,6 +250,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public static Test suite() { TestSuite suite = new TestSuite("IncrementalJpsTestGenerated"); suite.addTestSuite(IncrementalJpsTestGenerated.class); + suite.addTest(CircularDependency.innerSuite()); suite.addTest(PureKotlin.innerSuite()); return suite; } diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log b/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log new file mode 100644 index 00000000000..ee01130e93f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module2/b/BPackage-module2_b-*.class +out/production/module2/b/BPackage.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +Cleaning output files: +out/production/module1/a/A.class +out/production/module1/a/APackage-module1_a-*.class +out/production/module1/a/APackage.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/dependencies.txt b/jps/jps-plugin/testData/incremental/circularDependency/simple/dependencies.txt new file mode 100644 index 00000000000..02d5c8ca1a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/circularDependency/simple/dependencies.txt @@ -0,0 +1,2 @@ +module1->module2 +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/module1_a.kt b/jps/jps-plugin/testData/incremental/circularDependency/simple/module1_a.kt new file mode 100644 index 00000000000..5f77590e624 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/circularDependency/simple/module1_a.kt @@ -0,0 +1,9 @@ +package a + +class A + +fun a() { + // TODO: this call is compiled via package facade or package part depending on if callee comes from compiled or source + // Must be uncommented when modules are supported in compiler + //b.b() +} diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt b/jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt new file mode 100644 index 00000000000..164222697b7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt @@ -0,0 +1,7 @@ +package b + +fun b() { + // TODO: this call is compiled via package facade or package part depending on if callee comes from compiled or source + // Must be uncommented when modules are supported in compiler + // a.a() +} diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt.new b/jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt.new new file mode 100644 index 00000000000..b6a3f3fd029 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt.new @@ -0,0 +1,11 @@ +package b + +fun b() { + // TODO: this call is compiled via package facade or package part depending on if callee comes from compiled or source + // Must be uncommented when modules are supported in compiler + // a.a() +} + +fun bb() { + +} From 803d52a36d151e7b19466728d479de3601b57d82 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 28 Aug 2014 17:06:43 +0400 Subject: [PATCH 0159/1557] Supported methods with default arguments in partial package compilation. Original commit: 35720ff46dd8cf7620c2a31d80b18818bac78333 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 5 +++++ .../testData/incremental/pureKotlin/defaultArguments/a.kt | 3 +++ .../incremental/pureKotlin/defaultArguments/a.kt.new | 3 +++ .../testData/incremental/pureKotlin/defaultArguments/b.kt | 3 +++ .../incremental/pureKotlin/defaultArguments/build.log | 7 +++++++ 5 files changed, 21 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index d1f2f8d6972..3a7765cdeaa 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -110,6 +110,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); } + @TestMetadata("defaultArguments") + public void testDefaultArguments() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + } + @TestMetadata("dependencyClassReferenced") public void testDependencyClassReferenced() throws Exception { doTest("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt new file mode 100644 index 00000000000..1609642a906 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt @@ -0,0 +1,3 @@ +fun a(p1: String, p2: String? = null) { + +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new new file mode 100644 index 00000000000..1609642a906 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new @@ -0,0 +1,3 @@ +fun a(p1: String, p2: String? = null) { + +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt new file mode 100644 index 00000000000..21bf9e204ba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt @@ -0,0 +1,3 @@ +fun b(p1: String, p2: String? = null) { + +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log new file mode 100644 index 00000000000..9fede6968ce --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/_DefaultPackage-a-*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/a.kt +End of files From 0b42fc071a645ac2d5795ccf54788e072da95560 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 8 Sep 2014 18:49:21 +0400 Subject: [PATCH 0160/1557] Tests regenerated Original commit: 32c8d3a96d2d1dd7afa0ad33dab730407b25ab9b --- .../build/IncrementalJpsTestGenerated.java | 118 ++++++++++++------ 1 file changed, 80 insertions(+), 38 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 3a7765cdeaa..4e0ca0824ac 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -16,6 +16,7 @@ package org.jetbrains.jet.jps.build; +import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; import org.jetbrains.jet.JetTestUtils; @@ -28,6 +29,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("jps-plugin/testData/incremental") +@TestDataPath("$PROJECT_ROOT") @InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class}) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public void testAllFilesPresentInIncremental() throws Exception { @@ -35,6 +37,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } @TestMetadata("jps-plugin/testData/incremental/circularDependency") + @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) public static class CircularDependency extends AbstractIncrementalJpsTest { public void testAllFilesPresentInCircularDependency() throws Exception { @@ -43,7 +46,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("simple") public void testSimple() throws Exception { - doTest("jps-plugin/testData/incremental/circularDependency/simple/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/circularDependency/simple/"); + doTest(fileName); } public static Test innerSuite() { @@ -54,21 +58,25 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } @TestMetadata("jps-plugin/testData/incremental/pureKotlin") + @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); + doTest(fileName); } @TestMetadata("accessingPropertiesViaField") public void testAccessingPropertiesViaField() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); + doTest(fileName); } @TestMetadata("allConstants") public void testAllConstants() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/allConstants/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); + doTest(fileName); } public void testAllFilesPresentInPureKotlin() throws Exception { @@ -77,172 +85,206 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("annotations") public void testAnnotations() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/annotations/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/"); + doTest(fileName); } @TestMetadata("classInlineFunctionChanged") public void testClassInlineFunctionChanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); + doTest(fileName); } @TestMetadata("classObjectConstantChanged") public void testClassObjectConstantChanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); + doTest(fileName); } @TestMetadata("classRecreated") public void testClassRecreated() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); + doTest(fileName); } @TestMetadata("classSignatureChanged") public void testClassSignatureChanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); + doTest(fileName); } @TestMetadata("classSignatureUnchanged") public void testClassSignatureUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); + doTest(fileName); } @TestMetadata("constantsUnchanged") public void testConstantsUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); + doTest(fileName); } @TestMetadata("defaultArguments") public void testDefaultArguments() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + doTest(fileName); } @TestMetadata("dependencyClassReferenced") public void testDependencyClassReferenced() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); + doTest(fileName); } @TestMetadata("filesExchangePackages") public void testFilesExchangePackages() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); + doTest(fileName); } @TestMetadata("independentClasses") public void testIndependentClasses() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); + doTest(fileName); } @TestMetadata("inlineFunctionsCircularDependency") public void testInlineFunctionsCircularDependency() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); + doTest(fileName); } @TestMetadata("inlineFunctionsUnchanged") public void testInlineFunctionsUnchanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); + doTest(fileName); } @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); + doTest(fileName); } @TestMetadata("objectValChanged") public void testObjectValChanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/objectValChanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectValChanged/"); + doTest(fileName); } @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); + doTest(fileName); } @TestMetadata("packageConstantChanged") public void testPackageConstantChanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); + doTest(fileName); } @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); + doTest(fileName); } @TestMetadata("packageFileChangedPackage") public void testPackageFileChangedPackage() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); + doTest(fileName); } @TestMetadata("packageFileChangedThenOtherRemoved") public void testPackageFileChangedThenOtherRemoved() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); + doTest(fileName); } @TestMetadata("packageFileRemoved") public void testPackageFileRemoved() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); + doTest(fileName); } @TestMetadata("packageFilesChangedInTurn") public void testPackageFilesChangedInTurn() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); + doTest(fileName); } @TestMetadata("packageInlineFunctionAccessingField") public void testPackageInlineFunctionAccessingField() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); + doTest(fileName); } @TestMetadata("packageInlineFunctionChanged") public void testPackageInlineFunctionChanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/"); + doTest(fileName); } @TestMetadata("packageInlineFunctionFromOurPackage") public void testPackageInlineFunctionFromOurPackage() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); + doTest(fileName); } @TestMetadata("packageRecreated") public void testPackageRecreated() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); + doTest(fileName); } @TestMetadata("packageRecreatedAfterRenaming") public void testPackageRecreatedAfterRenaming() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); + doTest(fileName); } @TestMetadata("packageRemoved") public void testPackageRemoved() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); + doTest(fileName); } @TestMetadata("returnTypeChanged") public void testReturnTypeChanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); + doTest(fileName); } @TestMetadata("simpleClassDependency") public void testSimpleClassDependency() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); + doTest(fileName); } @TestMetadata("soleFileChangesPackage") public void testSoleFileChangesPackage() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); + doTest(fileName); } @TestMetadata("topLevelFunctionSameSignature") public void testTopLevelFunctionSameSignature() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); + doTest(fileName); } @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); + doTest(fileName); } @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); + doTest(fileName); } public static Test innerSuite() { From 0bb4d78932276f7a28abea76c22ffc4fedcc1ffe Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 9 Sep 2014 12:12:39 +0400 Subject: [PATCH 0161/1557] Regenerate tests Original commit: 041d009b9af68512e7bd166cb7229b5a0f1ac59c --- .../build/IncrementalJpsTestGenerated.java | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 4e0ca0824ac..8dc9e5b2174 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -19,9 +19,11 @@ package org.jetbrains.jet.jps.build; import com.intellij.testFramework.TestDataPath; import junit.framework.Test; import junit.framework.TestSuite; +import org.junit.runner.RunWith; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.jet.JUnit3RunnerWithInners; import java.io.File; import java.util.regex.Pattern; @@ -31,6 +33,7 @@ import java.util.regex.Pattern; @TestMetadata("jps-plugin/testData/incremental") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class}) +@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public void testAllFilesPresentInIncremental() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), true); @@ -39,6 +42,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/circularDependency") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class CircularDependency extends AbstractIncrementalJpsTest { public void testAllFilesPresentInCircularDependency() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/circularDependency"), Pattern.compile("^([^\\.]+)$"), true); @@ -50,16 +54,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("CircularDependency"); - suite.addTestSuite(CircularDependency.class); - return suite; - } } @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { @@ -287,18 +287,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - public static Test innerSuite() { - TestSuite suite = new TestSuite("PureKotlin"); - suite.addTestSuite(PureKotlin.class); - return suite; - } } - public static Test suite() { - TestSuite suite = new TestSuite("IncrementalJpsTestGenerated"); - suite.addTestSuite(IncrementalJpsTestGenerated.class); - suite.addTest(CircularDependency.innerSuite()); - suite.addTest(PureKotlin.innerSuite()); - return suite; - } } From 9e105dcaeddaa4a88ad3ea3946bd4b032e8599fe Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 12 Sep 2014 21:09:31 +0400 Subject: [PATCH 0162/1557] Extract abstract FileBasedKotlinClass out of VirtualFileKotlinClass Add another implementation of FileBasedKotlinClass which was indirectly used in jps-plugin (LocalFileKotlinClass) Original commit: fa39bf03a023c34af4e31b1f8ee0d55f39d503f7 --- .../jps/incremental/IncrementalCacheImpl.kt | 13 +++--- .../jps/incremental/LocalFileKotlinClass.kt | 46 +++++++++++++++++++ .../jet/jps/build/classFilesComparison.kt | 8 ++-- 3 files changed, 55 insertions(+), 12 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 3700771d690..3987227e646 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -24,10 +24,8 @@ import com.intellij.util.io.IOUtil import java.io.DataInput import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.util.io.DataExternalizer -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader import org.jetbrains.jet.descriptors.serialization.BitEncoding -import org.jetbrains.jet.utils.intellij.* import java.util.Arrays import org.jetbrains.org.objectweb.asm.* import com.intellij.util.io.EnumeratorStringDescriptor @@ -37,7 +35,6 @@ import java.util.HashSet import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache import java.util.HashMap import org.jetbrains.jet.lang.resolve.java.PackageClassUtils -import com.intellij.util.containers.MultiMap import com.intellij.openapi.util.io.FileUtil import java.security.MessageDigest import org.jetbrains.jps.incremental.storage.StorageOwner @@ -62,11 +59,13 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { - val fileBytes = classFile.readBytes() - val classNameAndHeader = VirtualFileKotlinClass.readClassNameAndHeader(fileBytes) - if (classNameAndHeader == null) return DO_NOTHING + val kotlinClass = LocalFileKotlinClass.create(classFile) + if (kotlinClass == null) return DO_NOTHING + + val fileBytes = kotlinClass.getFileContents() + val className = kotlinClass.getClassName() + val header = kotlinClass.getClassHeader() - val (className, header) = classNameAndHeader val annotationDataEncoded = header.annotationData if (annotationDataEncoded != null) { val data = BitEncoding.decodeBytes(annotationDataEncoded) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt new file mode 100644 index 00000000000..a5d69cd4f64 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt @@ -0,0 +1,46 @@ +/* + * Copyright 2010-2014 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.jps.incremental + +import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass +import org.jetbrains.jet.lang.resolve.java.JvmClassName +import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import java.io.File + +class LocalFileKotlinClass private( + private val file: File, + private val fileContents: ByteArray, + className: JvmClassName, + classHeader: KotlinClassHeader +) : FileBasedKotlinClass(className, classHeader) { + + class object { + fun create(file: File): LocalFileKotlinClass? { + val fileContents = file.readBytes() + val nameAndHeader = FileBasedKotlinClass.readClassNameAndHeader(fileContents) + if (nameAndHeader == null) return null + + return LocalFileKotlinClass(file, fileContents, nameAndHeader.first!!, nameAndHeader.second!!) + } + } + + public override fun getFileContents(): ByteArray = fileContents + + override fun hashCode(): Int = file.hashCode() + override fun equals(other: Any?): Boolean = other is LocalFileKotlinClass && file == other.file + override fun toString(): String = "$javaClass: $file" +} diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index 1bc2940535e..d5764a212d1 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -35,7 +35,7 @@ import com.google.protobuf.ExtensionRegistry import java.io.ByteArrayInputStream import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf import java.util.Arrays -import org.jetbrains.jet.lang.resolve.kotlin.VirtualFileKotlinClass +import org.jetbrains.jet.jps.incremental.LocalFileKotlinClass // Set this to true if you want to dump all bytecode (test will fail in this case) val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" @@ -116,12 +116,10 @@ fun assertEqualDirectories(expected: File, actual: File) { fun classFileToString(classFile: File): String { val out = StringWriter() - val classBytes = classFile.readBytes() - val traceVisitor = TraceClassVisitor(PrintWriter(out)) - ClassReader(classBytes).accept(traceVisitor, 0) + ClassReader(classFile.readBytes()).accept(traceVisitor, 0) - val classHeader = VirtualFileKotlinClass.readClassHeader(classBytes) + val classHeader = LocalFileKotlinClass.create(classFile)?.getClassHeader() val annotationDataEncoded = classHeader?.annotationData if (annotationDataEncoded != null) { From 4fbe5d0c45cdd218e97aebbcb1ada40b60592c9e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 12 Sep 2014 21:15:47 +0400 Subject: [PATCH 0163/1557] Minor, refactor FileBasedKotlinClass factory method Original commit: 9648c50ac99407a7b3c7622af4d0bad44b9517fe --- .../jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt index a5d69cd4f64..dd55ccff47a 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt @@ -31,10 +31,10 @@ class LocalFileKotlinClass private( class object { fun create(file: File): LocalFileKotlinClass? { val fileContents = file.readBytes() - val nameAndHeader = FileBasedKotlinClass.readClassNameAndHeader(fileContents) - if (nameAndHeader == null) return null - - return LocalFileKotlinClass(file, fileContents, nameAndHeader.first!!, nameAndHeader.second!!) + return FileBasedKotlinClass.create(fileContents) { + className, classHeader -> + LocalFileKotlinClass(file, fileContents, className, classHeader) + } } } From 3853d6a39a69adad0f722ac5a29689d60690418e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 15 Sep 2014 10:55:31 +0400 Subject: [PATCH 0164/1557] Read InnerClasses attribute value in FileBasedKotlinClass Resolve names mentioned in class declarations based on this information Original commit: 1f8b2cef523eaf31ddee7f0aed6b20d9522f5507 --- .../jet/jps/incremental/LocalFileKotlinClass.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt index dd55ccff47a..a414e46deb4 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt @@ -25,15 +25,16 @@ class LocalFileKotlinClass private( private val file: File, private val fileContents: ByteArray, className: JvmClassName, - classHeader: KotlinClassHeader -) : FileBasedKotlinClass(className, classHeader) { + classHeader: KotlinClassHeader, + innerClasses: FileBasedKotlinClass.InnerClassesInfo +) : FileBasedKotlinClass(className, classHeader, innerClasses) { class object { fun create(file: File): LocalFileKotlinClass? { val fileContents = file.readBytes() return FileBasedKotlinClass.create(fileContents) { - className, classHeader -> - LocalFileKotlinClass(file, fileContents, className, classHeader) + className, classHeader, innerClasses -> + LocalFileKotlinClass(file, fileContents, className, classHeader, innerClasses) } } } From 11b8d4f9c387bc8315c08ef29beb7d22142ad35b Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 15 Sep 2014 13:49:55 +0400 Subject: [PATCH 0165/1557] Use ClassId instead of JvmClassName in KotlinJvmBinaryClass ClassId contains exact information about origin of the class (e.g. if '$' in the class name denotes nested classes separator or just a character in the name) Original commit: 7595e32bb6908c8c2325ae78ca78cfc8d8d638fd --- jps/jps-plugin/jps-plugin.iml | 2 +- .../org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 2 +- .../org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 25f9ab18817..d96c403f498 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -18,7 +18,7 @@ - + diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 3987227e646..484a0b51c86 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -63,7 +63,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC if (kotlinClass == null) return DO_NOTHING val fileBytes = kotlinClass.getFileContents() - val className = kotlinClass.getClassName() + val className = JvmClassName.byClassId(kotlinClass.getClassId()) val header = kotlinClass.getClassHeader() val annotationDataEncoded = header.annotationData diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt index a414e46deb4..56a66dbac8c 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt @@ -17,14 +17,14 @@ package org.jetbrains.jet.jps.incremental import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass -import org.jetbrains.jet.lang.resolve.java.JvmClassName import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.jet.descriptors.serialization.ClassId import java.io.File class LocalFileKotlinClass private( private val file: File, private val fileContents: ByteArray, - className: JvmClassName, + className: ClassId, classHeader: KotlinClassHeader, innerClasses: FileBasedKotlinClass.InnerClassesInfo ) : FileBasedKotlinClass(className, classHeader, innerClasses) { From 198462b47adbae9ce75cf4b6d42ff217ff632c6c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 16 Sep 2014 11:36:39 +0400 Subject: [PATCH 0166/1557] Move ClassId to module descriptors, closer to other names Original commit: 1905401273a30dabd286e205d1dab88c7e36e859 --- .../org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt index 56a66dbac8c..ee6b4329db6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt @@ -18,7 +18,7 @@ package org.jetbrains.jet.jps.incremental import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader -import org.jetbrains.jet.descriptors.serialization.ClassId +import org.jetbrains.jet.lang.resolve.name.ClassId import java.io.File class LocalFileKotlinClass private( From 001bf06136f18cd88943f6e6c5559c6d5ee97a64 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 5 Sep 2014 18:42:16 +0400 Subject: [PATCH 0167/1557] Not clearing incremental cache on compilation error. Original commit: 853def0a10bcdeaf91c8d18452ef6e6cf7ed623b --- .../org/jetbrains/jet/jps/build/KotlinBuilder.kt | 5 ++++- .../jet/jps/incremental/IncrementalCacheImpl.kt | 10 ++++++---- .../jet/jps/build/AbstractIncrementalJpsTest.kt | 10 ++++++++-- .../jet/jps/build/IncrementalJpsTestGenerated.java | 5 +++++ .../pureKotlin/compilationErrorThenFixed/build.log | 14 ++++++++++++++ .../pureKotlin/compilationErrorThenFixed/fun.kt | 2 ++ .../pureKotlin/compilationErrorThenFixed/usage.kt | 3 +++ .../compilationErrorThenFixed/usage.kt.new.1 | 3 +++ .../compilationErrorThenFixed/usage.kt.new.2 | 3 +++ 9 files changed, 48 insertions(+), 7 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.2 diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index fdf292e60cf..b8226bd333b 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -196,10 +196,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } + val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] + for ((target, cache) in incrementalCaches) { cache.clearCacheForRemovedFiles( KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), - target.getOutputDir()!! + target.getOutputDir()!!, + !compilationErrors ) } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 484a0b51c86..3981390a3f1 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -96,12 +96,14 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC return DO_NOTHING } - public fun clearCacheForRemovedFiles(removedSourceFiles: Collection, outDirectory: File) { + public fun clearCacheForRemovedFiles(removedSourceFiles: Collection, outDirectory: File, compilationSuccessful: Boolean) { removedSourceFiles.forEach { packagePartMap.remove(it) } - inlineFunctionsMap.clearOutdated(outDirectory) - constantsMap.clearOutdated(outDirectory) - protoMap.clearOutdated(outDirectory) + if (compilationSuccessful) { + inlineFunctionsMap.clearOutdated(outDirectory) + constantsMap.clearOutdated(outDirectory) + protoMap.clearOutdated(outDirectory) + } } public override fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index b66c42386ff..408760e6c0c 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -32,6 +32,7 @@ import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import kotlin.test.fail import java.util.HashMap import org.jetbrains.jet.utils.keysToMap +import org.jetbrains.jps.incremental.messages.BuildMessage public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { private var testDataDir: File by Delegates.notNull() @@ -52,8 +53,13 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val logger = MyLogger(FileUtil.toSystemIndependentName(workDir.getAbsolutePath())) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) try { - doBuild(descriptor, scope)!!.assertSuccessful() - return logger.log + val buildResult = doBuild(descriptor, scope)!! + if (!buildResult.isSuccessful()) { + return logger.log + "COMPILATION FAILED\n" + buildResult.getMessages(BuildMessage.Kind.ERROR).joinToString("\n") + "\n" + } + else { + return logger.log + } } finally { descriptor.release() } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 8dc9e5b2174..48aebb81e5e 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -119,6 +119,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("compilationErrorThenFixed") + public void testCompilationErrorThenFixed() throws Exception { + doTest("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/"); + } + @TestMetadata("constantsUnchanged") public void testConstantsUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log new file mode 100644 index 00000000000..f4fb938c215 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/_DefaultPackage-usage-*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Expecting an expression + + +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/fun.kt new file mode 100644 index 00000000000..99cec0dbea1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/fun.kt @@ -0,0 +1,2 @@ +fun f() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt new file mode 100644 index 00000000000..05a6473592e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.1 new file mode 100644 index 00000000000..c7eec515ee8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.1 @@ -0,0 +1,3 @@ +fun main(args: Array) { + f( +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.2 new file mode 100644 index 00000000000..05a6473592e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.2 @@ -0,0 +1,3 @@ +fun main(args: Array) { + f() +} \ No newline at end of file From 3d67593ef68bbbcec7baaa18ac0488704af002a2 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 18 Sep 2014 20:28:43 +0400 Subject: [PATCH 0168/1557] Regenerate for testCompilationErrorThenFixed test Original commit: bf7a295ace0635c3f618e0ac087d659018659bac --- .../jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 48aebb81e5e..8d569fc5a76 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -121,7 +121,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("compilationErrorThenFixed") public void testCompilationErrorThenFixed() throws Exception { - doTest("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/"); + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/"); + doTest(fileName); } @TestMetadata("constantsUnchanged") From 7c2443282446445b68d40c74b9c3dbc1d317a195 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 18 Sep 2014 16:50:04 +0400 Subject: [PATCH 0169/1557] Added automatic backup for debugging incremental compilation. Original commit: 9af1c3e4dc65837597cb4ec9559e7e19a4e16063 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index b8226bd333b..3efd7de51ec 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -50,10 +50,13 @@ import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* +import com.intellij.openapi.diagnostic.Logger public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" + + private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession") } override fun getPresentableName() = KOTLIN_BUILDER_NAME @@ -66,6 +69,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR dirtyFilesHolder: DirtyFilesHolder, outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { + val historyLabel = context.getBuilderParameter("history label") + if (historyLabel != null) { + LOG.info("Label in local history: $historyLabel") + } + val messageCollector = MessageCollectorAdapter(context) // Workaround for Android Studio if (!isJavaPluginEnabled(context)) { From f971cc5f9704b14b0fe914b3a1647e364c51138a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 19 Sep 2014 16:12:25 +0400 Subject: [PATCH 0170/1557] Fix: not loading ancestor packages from incremental cache. Original commit: b435904d7f2f9576fadab3c157abca57f4115d07 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../incremental/pureKotlin/subpackage/build.log | 8 ++++++++ .../incremental/pureKotlin/subpackage/nested.kt | 12 ++++++++++++ .../incremental/pureKotlin/subpackage/nested.kt.new | 12 ++++++++++++ .../incremental/pureKotlin/subpackage/outer.kt | 7 +++++++ 5 files changed, 45 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 8d569fc5a76..2fae1f59adf 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -275,6 +275,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("subpackage") + public void testSubpackage() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/"); + doTest(fileName); + } + @TestMetadata("topLevelFunctionSameSignature") public void testTopLevelFunctionSameSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log new file mode 100644 index 00000000000..ca0056732d4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module/outer/nested/NestedPackage$main$1.class +out/production/module/outer/nested/NestedPackage-nested-*.class +out/production/module/outer/nested/NestedPackage.class +End of files +Compiling files: +src/nested.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt new file mode 100644 index 00000000000..35287cfaf30 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt @@ -0,0 +1,12 @@ +package outer.nested + +import outer.f + +fun g() { +} + +fun main(args: Array) { + f { } + g() +} + diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new new file mode 100644 index 00000000000..35287cfaf30 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new @@ -0,0 +1,12 @@ +package outer.nested + +import outer.f + +fun g() { +} + +fun main(args: Array) { + f { } + g() +} + diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt new file mode 100644 index 00000000000..83ddfc54f1e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/outer.kt @@ -0,0 +1,7 @@ +package outer + +fun f(c: () -> Unit) { +} + +fun f(c: () -> T): String = "" + From 6389a27d644ed4be9160b6b7d68153640c33323c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 24 Sep 2014 16:09:01 +0400 Subject: [PATCH 0171/1557] Fixed clearing incremental cache for removed source files. For writing system-dependent paths were used, for deleting were system-independent. That's why cache was not cleared on Windows. Original commit: 060796997e46749797e430c2379320d13a281d42 --- .../jps/build/KotlinSourceFileCollector.java | 20 ++++++++++++------- .../jps/incremental/IncrementalCacheImpl.kt | 6 +++--- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index 402086b3e03..f9855199f63 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -64,16 +64,22 @@ public class KotlinSourceFileCollector { } @NotNull - public static List getRemovedKotlinFiles( + public static List getRemovedKotlinFiles( @NotNull DirtyFilesHolder dirtyFilesHolder, @NotNull ModuleBuildTarget target ) throws IOException { - return ContainerUtil.filter(dirtyFilesHolder.getRemovedFiles(target), new Condition() { - @Override - public boolean value(String s) { - return FileUtilRt.extensionEquals(s, "kt"); - } - }); + return ContainerUtil.map(ContainerUtil.filter(dirtyFilesHolder.getRemovedFiles(target), new Condition() { + @Override + public boolean value(String s) { + return FileUtilRt.extensionEquals(s, "kt"); + } + }), + new Function() { + @Override + public File fun(String s) { + return new File(s); + } + }); } @NotNull diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 3981390a3f1..6579ab1d9f8 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -96,7 +96,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC return DO_NOTHING } - public fun clearCacheForRemovedFiles(removedSourceFiles: Collection, outDirectory: File, compilationSuccessful: Boolean) { + public fun clearCacheForRemovedFiles(removedSourceFiles: Collection, outDirectory: File, compilationSuccessful: Boolean) { removedSourceFiles.forEach { packagePartMap.remove(it) } if (compilationSuccessful) { @@ -398,8 +398,8 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC map.put(sourceFile.getAbsolutePath(), className.getInternalName()) } - public fun remove(sourceFile: String) { - map.remove(sourceFile) + public fun remove(sourceFile: File) { + map.remove(sourceFile.getAbsolutePath()) } public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { From 3a7dcd4c80ecf87694760f3cf4374cc8159c927d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 24 Sep 2014 16:29:49 +0400 Subject: [PATCH 0172/1557] Minor. Clarified "compiled file" as "file to compile". Original commit: cb58d19e29e823a00168610f7cb65b2fe9c4b9ac --- .../org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 6579ab1d9f8..684e1555258 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -106,8 +106,8 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } } - public override fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { - return packagePartMap.getRemovedPackageParts(compiledSourceFilesToFqName) + public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map): Collection { + return packagePartMap.getRemovedPackageParts(sourceFilesToCompileAndFqNames) } public override fun getPackageData(fqName: String): ByteArray? { From 9c8ee4eae6c0c4cca22ff6f6007d2f95cc6dbfa2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 22 Sep 2014 11:43:30 +0400 Subject: [PATCH 0173/1557] Use '$' instead of '-' in package part class names Otherwise some tools break (e.g. CheckMethodAdapter in ASM, used in generic signature writer) because they expect class names to be Java identifiers. Some tests fixed, some will be fixed in future commits Original commit: c57441b51b65cfe72f57072978c5e03570023663 --- .../jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 8 +++++--- .../incremental/circularDependency/simple/build.log | 6 +++--- .../pureKotlin/accessingFunctionsViaPackagePart/build.log | 4 ++-- .../pureKotlin/accessingPropertiesViaField/build.log | 6 +++--- .../incremental/pureKotlin/allConstants/build.log | 4 ++-- .../testData/incremental/pureKotlin/annotations/build.log | 2 +- .../pureKotlin/classInlineFunctionChanged/build.log | 2 +- .../incremental/pureKotlin/classRecreated/build.log | 4 ++-- .../pureKotlin/classSignatureChanged/build.log | 4 ++-- .../pureKotlin/classSignatureUnchanged/build.log | 2 +- .../pureKotlin/compilationErrorThenFixed/build.log | 2 +- .../incremental/pureKotlin/constantsUnchanged/build.log | 2 +- .../incremental/pureKotlin/defaultArguments/build.log | 2 +- .../pureKotlin/dependencyClassReferenced/build.log | 2 +- .../pureKotlin/filesExchangePackages/build.log | 6 +++--- .../incremental/pureKotlin/independentClasses/build.log | 2 +- .../inlineFunctionsCircularDependency/build.log | 6 +++--- .../pureKotlin/inlineFunctionsUnchanged/build.log | 2 +- .../pureKotlin/multiplePackagesModified/build.log | 6 +++--- .../incremental/pureKotlin/objectValChanged/build.log | 2 +- .../incremental/pureKotlin/ourClassReferenced/build.log | 4 ++-- .../pureKotlin/packageConstantChanged/build.log | 2 +- .../incremental/pureKotlin/packageFileAdded/build.log | 2 +- .../pureKotlin/packageFileChangedPackage/build.log | 4 ++-- .../packageFileChangedThenOtherRemoved/build.log | 6 +++--- .../incremental/pureKotlin/packageFileRemoved/build.log | 8 ++++---- .../pureKotlin/packageFilesChangedInTurn/build.log | 4 ++-- .../packageInlineFunctionAccessingField/build.log | 2 +- .../pureKotlin/packageInlineFunctionChanged/build.log | 8 ++++---- .../packageInlineFunctionFromOurPackage/build.log | 2 +- .../incremental/pureKotlin/packageRecreated/build.log | 2 +- .../pureKotlin/packageRecreatedAfterRenaming/build.log | 4 ++-- .../incremental/pureKotlin/packageRemoved/build.log | 6 +++--- .../incremental/pureKotlin/returnTypeChanged/build.log | 4 ++-- .../pureKotlin/simpleClassDependency/build.log | 2 +- .../pureKotlin/soleFileChangesPackage/build.log | 4 ++-- .../pureKotlin/topLevelFunctionSameSignature/build.log | 2 +- .../pureKotlin/topLevelMembersInTwoFiles/build.log | 4 ++-- 39 files changed, 75 insertions(+), 73 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 684e1555258..fab5c5f1e39 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -413,7 +413,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC result.add(packagePartClassName) } else { - val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { result.add(packagePartClassName) @@ -432,7 +432,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC map.processKeysWithExistingMapping { key -> val packagePartClassName = map[key!!]!! - val packageFqName = JvmClassName.byInternalName(packagePartClassName).getFqNameForClassNameWithoutDollars().parent() + val packageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() result.add(packageFqName) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 408760e6c0c..4e6509593b8 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -241,9 +241,11 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { override fun logLine(message: String?) { fun String.replaceHashWithStar(): String { - val lastHyphen = this.lastIndexOf('-') - if (lastHyphen != -1 && substring(lastHyphen + 1).matches("[0-9a-f]{1,8}\\.class")) { - return substring(0, lastHyphen) + "-*.class" + if (this contains "Package$") { + val lastDollar = this.lastIndexOf('$') + if (lastDollar != -1 && substring(lastDollar + 1).matches("[0-9a-f]{1,8}\\.class")) { + return substring(0, lastDollar) + "$*.class" + } } return this } diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log b/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log index ee01130e93f..03390944246 100644 --- a/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log +++ b/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module2/b/BPackage-module2_b-*.class +out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class End of files Compiling files: @@ -7,9 +7,9 @@ module2/src/module2_b.kt End of files Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage-module1_a-*.class +out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class End of files Compiling files: module1/src/module1_a.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index ee902811972..38c3e40467d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage-b-*.class -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 5e565b356f6..38c3e40467d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,6 +1,6 @@ - Cleaning output files: -out/production/module/test/TestPackage-b-*.class -out/production/module/test/TestPackage-usage-*.class +Cleaning output files: +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 22f4d62f635..aec0fb80c88 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 3e90e7f7e51..830fd9d2ae7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-other-*.class +out/production/module/test/TestPackage$other$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index 41261841973..eafec833b17 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,7 +6,7 @@ src/inline.kt End of files Cleaning output files: out/production/module/inline/Klass.class -out/production/module/usage/UsagePackage-usage-*.class +out/production/module/usage/UsagePackage$usage$*.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index d59630c7ce7..c326658bdd5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -9,9 +9,9 @@ Compiling files: src/A.kt End of files Cleaning output files: -out/production/module/test/TestPackage-other-*.class +out/production/module/test/TestPackage$other$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 03df388cc2b..22a85136d38 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -5,9 +5,9 @@ Compiling files: src/class.kt End of files Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log index cc8924d4caa..5c686f1943a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log @@ -3,4 +3,4 @@ out/production/module/test/Klass.class End of files Compiling files: src/class.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log index f4fb938c215..5a8dee5393d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage-usage-*.class +out/production/module/_DefaultPackage$usage$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 7e364968874..e7a3af58bd6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/Klass$object.class out/production/module/test/Klass.class -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 9fede6968ce..74e194ec93c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage-a-*.class +out/production/module/_DefaultPackage$a$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 37112dda098..4e18829e5c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 492218cc4a6..a135c67f323 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/bar/BarPackage-c-*.class +out/production/module/bar/BarPackage$c$*.class out/production/module/bar/BarPackage.class -out/production/module/foo/FooPackage-b-*.class +out/production/module/foo/FooPackage$b$*.class out/production/module/foo/FooPackage.class End of files Compiling files: @@ -9,7 +9,7 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/foo/FooPackage-a-*.class +out/production/module/foo/FooPackage$a$*.class out/production/module/foo/FooPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log index b33bb4d2a49..e4d8b80cbf7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log @@ -3,4 +3,4 @@ out/production/module/test/Foo.class End of files Compiling files: src/Foo.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 41097177bde..624837de297 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index b01a631083b..31233b36691 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 914a8b69528..440fbd4f235 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/b/BPackage-b2-*.class +out/production/module/b/BPackage$b2$*.class out/production/module/b/BPackage.class End of files Compiling files: src/a2.kt End of files Cleaning output files: -out/production/module/a/APackage-a1-*.class +out/production/module/a/APackage$a1$*.class out/production/module/a/APackage.class -out/production/module/b/BPackage-b1-*.class +out/production/module/b/BPackage$b1$*.class out/production/module/b/BPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log index 388e9c57d12..06bb7395a25 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log @@ -3,4 +3,4 @@ out/production/module/test/Object.class End of files Compiling files: src/const.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index ccf56d9e65b..6d8c334b1ef 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -9,7 +9,7 @@ End of files Cleaning output files: out/production/module/klass/Klass.class -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index dbdb31fbbf0..7cb5f4c6a48 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-const-*.class +out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index f729fb6d124..df1bd14d31c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -2,7 +2,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 076add162ad..c6c913124c1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index cd5cce6af7e..df9c0c9e3f5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,13 +8,13 @@ End of files Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 7be687a676c..e6ae4266a50 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/other/OtherPackage-other-*.class +out/production/module/other/OtherPackage$other$*.class out/production/module/other/OtherPackage.class -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/other/OtherPackage-other-*.class +out/production/module/other/OtherPackage$other$*.class out/production/module/other/OtherPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 87d1614e2f1..31269315f90 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index 7c79a56fe44..edacd856bb9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index 2b175459118..1d578c6afff 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log @@ -1,17 +1,17 @@ Cleaning output files: -out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/InlinePackage-inline-*.class +out/production/module/inline/InlinePackage$inline$*.class out/production/module/inline/InlinePackage.class -out/production/module/usage/UsagePackage-usage-*.class +out/production/module/usage/UsagePackage$usage$*.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index 7c79a56fe44..edacd856bb9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 73408189236..510015c0156 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index 7cb5ae7d3e1..fc781a99d2d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -11,7 +11,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test2/Test2Package-a-*.class +out/production/module/test2/Test2Package$a$*.class out/production/module/test2/Test2Package.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index c307a197264..449c2b5fdd7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/test/TestPackage-b-*.class +out/production/module/test/TestPackage$b$*.class End of files Compiling files: -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 22b74887df0..4b0a58ace9a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/TestPackage-fun-*.class +out/production/module/test/TestPackage$fun$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt End of files Cleaning output files: -out/production/module/test/TestPackage-usage-*.class +out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log index 2cfeb2be275..cd31e5c6326 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log @@ -4,4 +4,4 @@ out/production/module/test/Foo.class End of files Compiling files: src/Foo.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 3c8fdd9ea17..74244f566b2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/foo/FooPackage-a-*.class +out/production/module/foo/FooPackage$a$*.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index 4a956843b6d..560795823cd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage-fun-*.class +out/production/module/test/TestPackage$fun$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 6e7a5e35e00..4e18829e5c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/TestPackage-a-*.class +out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files \ No newline at end of file +End of files From 1a02eb4c6cdea1efd9e493cc21476cb6457031bf Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 19 Sep 2014 19:27:22 +0400 Subject: [PATCH 0174/1557] Include package part name to top level closure names #KT-4234 Fixed #KT-4496 Fixed Original commit: c30aa7db84c9936fde44e5e847bb1d326ef10fd6 --- .../jet/jps/build/AbstractIncrementalJpsTest.kt | 15 +++++++++------ .../incremental/pureKotlin/subpackage/build.log | 4 ++-- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 4e6509593b8..ca1063ee4cc 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -33,6 +33,7 @@ import kotlin.test.fail import java.util.HashMap import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.messages.BuildMessage +import java.util.regex.Pattern public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { private var testDataDir: File by Delegates.notNull() @@ -239,19 +240,21 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { override fun isEnabled(): Boolean = true override fun logLine(message: String?) { - fun String.replaceHashWithStar(): String { - if (this contains "Package$") { - val lastDollar = this.lastIndexOf('$') - if (lastDollar != -1 && substring(lastDollar + 1).matches("[0-9a-f]{1,8}\\.class")) { - return substring(0, lastDollar) + "$*.class" - } + val matcher = STRIP_PACKAGE_PART_HASH_PATTERN.matcher(this) + if (matcher.find()) { + return matcher.replaceAll("\\$*") } return this } logBuf.append(message!!.trimLeading(rootPath + "/").replaceHashWithStar()).append('\n') } + + class object { + // We suspect sequences of several consecutive hexadecimal digits to be a package part hash code + val STRIP_PACKAGE_PART_HASH_PATTERN = Pattern.compile("\\$([0-9a-f]{5,8})") + } } private abstract class Modification(val path: String) { diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index ca0056732d4..d6788707583 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/outer/nested/NestedPackage$main$1.class -out/production/module/outer/nested/NestedPackage-nested-*.class +out/production/module/outer/nested/NestedPackage$nested$*$main$1.class +out/production/module/outer/nested/NestedPackage$nested$*.class out/production/module/outer/nested/NestedPackage.class End of files Compiling files: From 60a8794f8435434fda3fbf34baac68731ed7c7f4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 25 Sep 2014 17:42:17 +0400 Subject: [PATCH 0175/1557] Prepend zeros to package part hash code Original commit: 80a7c64369b2f1b4eecd43092e41f6e104b26622 --- .../org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index ca1063ee4cc..627faaad056 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -252,8 +252,8 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } class object { - // We suspect sequences of several consecutive hexadecimal digits to be a package part hash code - val STRIP_PACKAGE_PART_HASH_PATTERN = Pattern.compile("\\$([0-9a-f]{5,8})") + // We suspect sequences of eight consecutive hexadecimal digits to be a package part hash code + val STRIP_PACKAGE_PART_HASH_PATTERN = Pattern.compile("\\$([0-9a-f]{8})") } } From a8d310b6c82b880d7fb21180ab78732fc21b3f44 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 10 Oct 2014 15:27:57 +0400 Subject: [PATCH 0176/1557] Saving only class files into incremental cache. Fixed exception for JS modules. Original commit: 75853e3aada077ce83542c572fc136bc110f91ad --- .../org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index fab5c5f1e39..580aaf752e2 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -59,6 +59,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { + if (classFile.extension.toLowerCase() != "class") return DO_NOTHING val kotlinClass = LocalFileKotlinClass.create(classFile) if (kotlinClass == null) return DO_NOTHING From 079fbaa7cb63752da71d50fda46b17675e2f9184 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 13 Oct 2014 16:02:39 +0400 Subject: [PATCH 0177/1557] Minor. Compilation fixed Original commit: 34a98f25636db46550aa91b18973035ff11b99c5 --- .../test/org/jetbrains/jet/jps/build/classFilesComparison.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index d5764a212d1..93bf8b7f766 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -126,7 +126,7 @@ fun classFileToString(classFile: File): String { ByteArrayInputStream(BitEncoding.decodeBytes(annotationDataEncoded)).use { input -> - out.write("\n------ simpleNames proto -----\n${DebugProtoBuf.SimpleNameTable.parseDelimitedFrom(input)}") + out.write("\n------ simpleNames proto -----\n${DebugProtoBuf.StringTable.parseDelimitedFrom(input)}") out.write("\n------ qualifiedNames proto -----\n${DebugProtoBuf.QualifiedNameTable.parseDelimitedFrom(input)}") when (classHeader!!.kind) { From 2462b95e6bd7e890bfcd461fd147cf1d62d87c53 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 24 Sep 2014 19:33:05 +0400 Subject: [PATCH 0178/1557] Rearranged code in abstract incremental compilation test. Original commit: 0eda00e2dfc9869b36662916cc41c9a7e82437c6 --- .../jps/build/AbstractIncrementalJpsTest.kt | 53 +++++++++++-------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 627faaad056..107886f8ea1 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -174,15 +174,42 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { testDataDir = File(testDataPath) workDir = FileUtil.createTempDirectory("jps-build", null) + val moduleNames = configureModules() + initialMake() + + val log = performModificationsAndMake(moduleNames) + UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), log) + + rebuildAndCheckOutput() + clearCachesRebuildAndCheckOutput() + } + + private fun performModificationsAndMake(moduleNames: Set?): String { + val logs = ArrayList() + + val modifications = getModificationsToPerform(moduleNames) + for (step in modifications) { + step.forEach { it.perform(workDir) } + performAdditionalModifications() + + val log = make() + logs.add(log) + } + + return logs.join("\n\n") + } + + protected open fun performAdditionalModifications() { + } + + // null means one module + private fun configureModules(): Set? { + var moduleNames: Set? JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject) .setOutputUrl(JpsPathUtil.pathToUrl(getAbsolutePath("out"))) val jdk = addJdk("my jdk") - val moduleDependencies = readModuleDependencies() - - val moduleNames: Set? // null means one module - if (moduleDependencies == null) { addModule("module", array(getAbsolutePath("src")), null, null, jdk) @@ -211,23 +238,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { moduleNames = nameToModule.keySet() } AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject) - - initialMake() - - val modifications = getModificationsToPerform(moduleNames) - val logs = ArrayList() - - for (step in modifications) { - step.forEach { it.perform(workDir) } - - val log = make() - logs.add(log) - } - - UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), logs.join("\n\n")) - - rebuildAndCheckOutput() - clearCachesRebuildAndCheckOutput() + return moduleNames } override fun doGetProjectDir(): File? = workDir From 07d79c88f53910538972879063cbb7a146099fe5 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 24 Sep 2014 19:35:19 +0400 Subject: [PATCH 0179/1557] Added incremental cache format versioning. Original commit: 954a0117216e49c11985af0eb40b21c4a5b41046 --- .../jetbrains/jet/jps/build/KotlinBuilder.kt | 16 ++++-- .../jps/incremental/IncrementalCacheImpl.kt | 39 ++++++++++++++- .../jps/build/AbstractIncrementalJpsTest.kt | 10 +++- .../IncrementalCacheVersionChangedTest.kt | 50 +++++++++++++++++++ .../build/IncrementalJpsTestGenerated.java | 6 --- .../custom/cacheVersionChanged/a.kt | 4 ++ .../custom/cacheVersionChanged/b.kt | 4 ++ .../custom/cacheVersionChanged/build.log | 9 ++++ .../cacheVersionChangedAndFileModified/a.kt | 4 ++ .../cacheVersionChangedAndFileModified/b.kt | 4 ++ .../b.kt.new | 4 ++ .../build.log | 11 ++++ 12 files changed, 148 insertions(+), 13 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/a.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/b.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index 3efd7de51ec..86ca6b770d8 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -51,6 +51,7 @@ import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import com.intellij.openapi.diagnostic.Logger +import org.jetbrains.jet.lang.resolve.java.JvmAbi public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -83,6 +84,16 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val representativeTarget = chunk.representativeTarget() + val outputDir = representativeTarget.getOutputDir() + + val dataManager = context.getProjectDescriptor().dataManager + val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) } + + if (incrementalCaches.values().any { it -> it.isCacheVersionIncompatible() }) { + incrementalCaches.values().forEach { it.clean() } + return CHUNK_REBUILD_REQUIRED + } + // For non-incremental build: take all sources if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()) { return NOTHING_DONE @@ -94,11 +105,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION) - val outputDir = representativeTarget.getOutputDir() - - val dataManager = context.getProjectDescriptor().dataManager - val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) } - val compilerServices = Services.Builder() .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) .build() diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 580aaf752e2..cab43bc9fb0 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -40,15 +40,25 @@ import java.security.MessageDigest import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.jps.builders.storage.StorageProvider import java.io.IOException +import java.util.Scanner +import org.jetbrains.jet.lang.resolve.java.JvmAbi val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalCache { class object { + val DIRECTORY_NAME = "kotlin" + val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" val PACKAGE_PARTS = "package-parts.tab" + + // Change this when incremental cache format changes + private val INCREMENTAL_CACHE_OWN_VERSION = 1 + public val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION + + val FORMAT_VERSION_TXT = "format-version.txt" } private val protoMap = ProtoMap() @@ -58,8 +68,34 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) + private fun getFormatVersionFile(): File { + return File(baseDir, FORMAT_VERSION_TXT) + } + + public fun isCacheVersionIncompatible(): Boolean { + val version = loadCacheFormatVersion() + return version != -1 && version != CACHE_FORMAT_VERSION + } + + private fun loadCacheFormatVersion(): Int { + val versionFile = getFormatVersionFile() + if (!versionFile.exists()) return -1 + + return versionFile.readText().toInt() + } + + private fun saveCacheFormatVersionIfNeeded() { + val versionFile = getFormatVersionFile() + if (!versionFile.exists()) { + versionFile.writeText(CACHE_FORMAT_VERSION.toString()) + } + } + public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { if (classFile.extension.toLowerCase() != "class") return DO_NOTHING + + saveCacheFormatVersionIfNeeded() + val kotlinClass = LocalFileKotlinClass.create(classFile) if (kotlinClass == null) return DO_NOTHING @@ -121,6 +157,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC public override fun clean() { maps.forEach { it.clean() } + getFormatVersionFile().delete() } public override fun close() { @@ -457,7 +494,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC public object IncrementalCacheStorageProvider : StorageProvider() { override fun createStorage(targetDataDir: File?): IncrementalCacheImpl { - return IncrementalCacheImpl(File(targetDataDir, "kotlin")) + return IncrementalCacheImpl(File(targetDataDir, IncrementalCacheImpl.DIRECTORY_NAME)) } } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 107886f8ea1..0a77dd7011f 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -50,6 +50,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { super.tearDown() } + protected open val customTest: Boolean + get() = false + fun buildGetLog(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): String { val logger = MyLogger(FileUtil.toSystemIndependentName(workDir.getAbsolutePath())) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) @@ -119,7 +122,12 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { fail("Bad test data format: files ending with both unnumbered and numbered \".new\"/\".delete\" were found") } if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { - fail("Bad test data format: no files ending with \".new\" or \".delete\" found") + if (customTest) { + return listOf(listOf()) + } + else { + fail("Bad test data format: no files ending with \".new\" or \".delete\" found") + } } if (haveFilesWithoutNumbers) { diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt new file mode 100644 index 00000000000..8ad04c98423 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt @@ -0,0 +1,50 @@ +/* + * Copyright 2010-2014 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.jps.build + +import com.intellij.testFramework.TestDataPath +import org.jetbrains.jet.JetTestUtils +import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.jps.builders.impl.BuildDataPathsImpl +import java.io.File +import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType +import org.jetbrains.jet.jps.incremental +import com.sun.tools.javac.resources.version +import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl +import kotlin.test.assertTrue + +public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() { + fun testCacheVersionChanged() { + doTest("jps-plugin/testData/incremental/custom/cacheVersionChanged/") + } + + fun testCacheVersionChangedAndFileModified() { + doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/") + } + + override val customTest: Boolean + get() = true + + override fun performAdditionalModifications() { + val storageForTargetType = BuildDataPathsImpl(myDataStorageRoot).getTargetTypeDataRoot(JavaModuleBuildTargetType.PRODUCTION) + val relativePath = "module/${File.separator}${IncrementalCacheImpl.DIRECTORY_NAME}/${IncrementalCacheImpl.FORMAT_VERSION_TXT}" + val cacheVersionFile = File(storageForTargetType, relativePath) + + assertTrue(cacheVersionFile.exists()) + cacheVersionFile.writeText("777") + } +} \ No newline at end of file diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 2fae1f59adf..5a7c14ceebe 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -30,15 +30,9 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("jps-plugin/testData/incremental") -@TestDataPath("$PROJECT_ROOT") @InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class}) @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { - public void testAllFilesPresentInIncremental() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental"), Pattern.compile("^([^\\.]+)$"), true); - } - @TestMetadata("jps-plugin/testData/incremental/circularDependency") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/a.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/a.kt new file mode 100644 index 00000000000..91fe7016ac5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/a.kt @@ -0,0 +1,4 @@ +package test + +fun f() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/b.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/b.kt new file mode 100644 index 00000000000..c8d3d771251 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/b.kt @@ -0,0 +1,4 @@ +package test + +fun g() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log new file mode 100644 index 00000000000..5811eb1266c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log @@ -0,0 +1,9 @@ +Cleaning output files: +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +src/b.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt new file mode 100644 index 00000000000..91fe7016ac5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt @@ -0,0 +1,4 @@ +package test + +fun f() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt new file mode 100644 index 00000000000..c8d3d771251 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt @@ -0,0 +1,4 @@ +package test + +fun g() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new new file mode 100644 index 00000000000..c8d3d771251 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new @@ -0,0 +1,4 @@ +package test + +fun g() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log new file mode 100644 index 00000000000..073f1409ae5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage.class +End of files +Cleaning output files: +out/production/module/test/TestPackage$a$*.class +End of files +Compiling files: +src/a.kt +src/b.kt +End of files \ No newline at end of file From 223b9fa75396d60bc8be72812ab5f7fe967bed1e Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 20 Oct 2014 17:57:34 +0400 Subject: [PATCH 0180/1557] Optimized imports. Fixed build. Original commit: b9a4ea80c5479d9169013b7d58864312e73dbbdf --- .../jet/jps/build/IncrementalCacheVersionChangedTest.kt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt index 8ad04c98423..945a66d5cdf 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt @@ -16,14 +16,9 @@ package org.jetbrains.jet.jps.build -import com.intellij.testFramework.TestDataPath -import org.jetbrains.jet.JetTestUtils -import com.intellij.openapi.util.io.FileUtil import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import java.io.File import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType -import org.jetbrains.jet.jps.incremental -import com.sun.tools.javac.resources.version import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl import kotlin.test.assertTrue From fb80635714cb4b60bea2fd236108255c7d39023e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 20 Oct 2014 18:39:31 +0400 Subject: [PATCH 0181/1557] Regenerate tests After recent changes to Printer and TestGenerator Original commit: f8be39b26b56bf2515c11d78c04383334c6f65ba --- .../build/IncrementalJpsTestGenerated.java | 99 +++++++++---------- 1 file changed, 48 insertions(+), 51 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 5a7c14ceebe..8875bc89a7d 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -17,13 +17,11 @@ package org.jetbrains.jet.jps.build; import com.intellij.testFramework.TestDataPath; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.junit.runner.RunWith; +import org.jetbrains.jet.JUnit3RunnerWithInners; import org.jetbrains.jet.JetTestUtils; import org.jetbrains.jet.test.InnerTestClasses; import org.jetbrains.jet.test.TestMetadata; -import org.jetbrains.jet.JUnit3RunnerWithInners; +import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; @@ -31,268 +29,267 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class}) -@RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) +@RunWith(JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/circularDependency") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) - @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + @RunWith(JUnit3RunnerWithInners.class) public static class CircularDependency extends AbstractIncrementalJpsTest { public void testAllFilesPresentInCircularDependency() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/circularDependency"), Pattern.compile("^([^\\.]+)$"), true); } - + @TestMetadata("simple") public void testSimple() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/circularDependency/simple/"); doTest(fileName); } - + } - + @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) - @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); doTest(fileName); } - + @TestMetadata("accessingPropertiesViaField") public void testAccessingPropertiesViaField() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); doTest(fileName); } - + @TestMetadata("allConstants") public void testAllConstants() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); doTest(fileName); } - + public void testAllFilesPresentInPureKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); } - + @TestMetadata("annotations") public void testAnnotations() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/"); doTest(fileName); } - + @TestMetadata("classInlineFunctionChanged") public void testClassInlineFunctionChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); doTest(fileName); } - + @TestMetadata("classObjectConstantChanged") public void testClassObjectConstantChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); doTest(fileName); } - + @TestMetadata("classRecreated") public void testClassRecreated() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); doTest(fileName); } - + @TestMetadata("classSignatureChanged") public void testClassSignatureChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); doTest(fileName); } - + @TestMetadata("classSignatureUnchanged") public void testClassSignatureUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); doTest(fileName); } - + @TestMetadata("compilationErrorThenFixed") public void testCompilationErrorThenFixed() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/"); doTest(fileName); } - + @TestMetadata("constantsUnchanged") public void testConstantsUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); doTest(fileName); } - + @TestMetadata("defaultArguments") public void testDefaultArguments() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); doTest(fileName); } - + @TestMetadata("dependencyClassReferenced") public void testDependencyClassReferenced() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); doTest(fileName); } - + @TestMetadata("filesExchangePackages") public void testFilesExchangePackages() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); doTest(fileName); } - + @TestMetadata("independentClasses") public void testIndependentClasses() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); doTest(fileName); } - + @TestMetadata("inlineFunctionsCircularDependency") public void testInlineFunctionsCircularDependency() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); doTest(fileName); } - + @TestMetadata("inlineFunctionsUnchanged") public void testInlineFunctionsUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); doTest(fileName); } - + @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); doTest(fileName); } - + @TestMetadata("objectValChanged") public void testObjectValChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectValChanged/"); doTest(fileName); } - + @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); doTest(fileName); } - + @TestMetadata("packageConstantChanged") public void testPackageConstantChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); doTest(fileName); } - + @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); doTest(fileName); } - + @TestMetadata("packageFileChangedPackage") public void testPackageFileChangedPackage() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); doTest(fileName); } - + @TestMetadata("packageFileChangedThenOtherRemoved") public void testPackageFileChangedThenOtherRemoved() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); doTest(fileName); } - + @TestMetadata("packageFileRemoved") public void testPackageFileRemoved() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); doTest(fileName); } - + @TestMetadata("packageFilesChangedInTurn") public void testPackageFilesChangedInTurn() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); doTest(fileName); } - + @TestMetadata("packageInlineFunctionAccessingField") public void testPackageInlineFunctionAccessingField() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); doTest(fileName); } - + @TestMetadata("packageInlineFunctionChanged") public void testPackageInlineFunctionChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/"); doTest(fileName); } - + @TestMetadata("packageInlineFunctionFromOurPackage") public void testPackageInlineFunctionFromOurPackage() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); doTest(fileName); } - + @TestMetadata("packageRecreated") public void testPackageRecreated() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); doTest(fileName); } - + @TestMetadata("packageRecreatedAfterRenaming") public void testPackageRecreatedAfterRenaming() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); doTest(fileName); } - + @TestMetadata("packageRemoved") public void testPackageRemoved() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); doTest(fileName); } - + @TestMetadata("returnTypeChanged") public void testReturnTypeChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); doTest(fileName); } - + @TestMetadata("simpleClassDependency") public void testSimpleClassDependency() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); doTest(fileName); } - + @TestMetadata("soleFileChangesPackage") public void testSoleFileChangesPackage() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); doTest(fileName); } - + @TestMetadata("subpackage") public void testSubpackage() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/"); doTest(fileName); } - + @TestMetadata("topLevelFunctionSameSignature") public void testTopLevelFunctionSameSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); doTest(fileName); } - + @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); doTest(fileName); } - + @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); doTest(fileName); } - + } - } From 4a22258ff9ed753aa5acfe39ea8806a43bdac4ff Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 21 Oct 2014 17:31:52 +0400 Subject: [PATCH 0182/1557] Minor. Added test data sanity check. Original commit: 2492fe47f33faba264cbfa3c3d01cf5de5323595 --- .../jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 0a77dd7011f..6ad8f9e46dd 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -33,6 +33,7 @@ import kotlin.test.fail import java.util.HashMap import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.messages.BuildMessage +import kotlin.test.assertFalse import java.util.regex.Pattern public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { @@ -69,8 +70,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } } - private fun initialMake(): String { - return buildGetLog() + private fun initialMake() { + val log = buildGetLog() + assertFalse("COMPILATION FAILED" in log, "Initial make failed:\n$log") } private fun make(): String { From 03e558a741cc355e59bab9b4a7051b3a2ee0528f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 21 Oct 2014 17:34:58 +0400 Subject: [PATCH 0183/1557] Minor. More correct constants processing. If class without constants is added, it doesn't mean directly that others should be recompiled. Anyway, this mistake didn't lead to any bug: proto change would be detected anyway. Original commit: 4cf7b9e20c0376b40115d730fe1d15ea8cc3ff22 --- .../jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index cab43bc9fb0..ee69debef4f 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -251,7 +251,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC ConstantsMapExternalizer ) - private fun getConstantsMap(bytes: ByteArray): Map { + private fun getConstantsMap(bytes: ByteArray): Map? { val result = HashMap() ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { @@ -264,14 +264,14 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } }, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES) - return result + return if (result.isEmpty()) null else result } public fun process(className: JvmClassName, bytes: ByteArray): Boolean { return put(className, getConstantsMap(bytes)) } - private fun put(className: JvmClassName, constantsMap: Map): Boolean { + private fun put(className: JvmClassName, constantsMap: Map?): Boolean { val key = className.getInternalName() val oldMap = map[key] From 414caba4ef225a7c9733406d0fe487c5ca5a0e9f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 29 Oct 2014 16:41:53 +0300 Subject: [PATCH 0184/1557] Minor. Expanded test. Original commit: 0f8dd59bcfe88d3c0304cf66b2e9739e833bc4f1 --- .../pureKotlin/packageFilesChangedInTurn/a.kt.new.3 | 3 +++ .../pureKotlin/packageFilesChangedInTurn/build.log | 9 +++++++++ 2 files changed, 12 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.3 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.3 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.3 new file mode 100644 index 00000000000..a36b6841040 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.3 @@ -0,0 +1,3 @@ +package test + +fun a() = "aa" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 31269315f90..e9168f05540 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -14,3 +14,12 @@ End of files Compiling files: src/b.kt End of files + + +Cleaning output files: +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file From 9c6ef7782f8caeff459c7ae8dded13e511ed7326 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 29 Oct 2014 17:34:39 +0300 Subject: [PATCH 0185/1557] Aborting compilation on errors (don't try to compile Java after it). Original commit: 3011bdb7d7dae163c0c1f22405f42f2becf72381 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index 86ca6b770d8..74913ee7417 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -243,6 +243,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR outputConsumer.registerOutputFile(target, outputFile, sourceFiles.map { it.getPath() }) } + if (compilationErrors) { + return ABORT + } + if (IncrementalCompilation.ENABLED) { if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { allCompiledFiles.clear() From 66cd592fd22e27735cb8952e4d8ce0dea1aeb1b0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 26 Sep 2014 20:49:53 +0400 Subject: [PATCH 0186/1557] Initial support for kotlin-java interop in incremental compilation. Original commit: 70331e3b827cc2238d2cf010f83d6b8a4200d8ee --- .../jetbrains/jet/jps/build/KotlinBuilder.kt | 30 ++++++-- .../jps/build/KotlinSourceFileCollector.java | 2 +- .../build/IncrementalJpsTestGenerated.java | 71 ++++++++++++++++++- .../classObjectConstantChanged/build.log | 3 + .../compilationErrorThenFixed/build.log | 4 ++ .../traitClassObjectConstantChanged/build.log | 4 ++ .../changeNotUsedSignature/JavaClass.java | 4 ++ .../changeNotUsedSignature/JavaClass.java.new | 5 ++ .../changeNotUsedSignature/build.log | 6 ++ .../changeNotUsedSignature/notUsage.kt | 2 + .../changeSignature/JavaClass.java | 4 ++ .../changeSignature/JavaClass.java.new | 5 ++ .../changeSignature/build.log | 13 ++++ .../javaUsedInKotlin/changeSignature/usage.kt | 3 + .../notChangeSignature/JavaClass.java | 4 ++ .../notChangeSignature/JavaClass.java.new | 4 ++ .../notChangeSignature/build.log | 6 ++ .../notChangeSignature/usage.kt | 3 + .../changeNotUsedSignature/NotUsage.java | 2 + .../changeNotUsedSignature/build.log | 7 ++ .../changeNotUsedSignature/fun.kt | 5 ++ .../changeNotUsedSignature/fun.kt.new | 5 ++ .../changeSignature/Usage.java | 5 ++ .../changeSignature/build.log | 13 ++++ .../kotlinUsedInJava/changeSignature/fun.kt | 5 ++ .../changeSignature/fun.kt.new | 5 ++ .../notChangeSignature/Usage.java | 5 ++ .../notChangeSignature/build.log | 7 ++ .../notChangeSignature/fun.kt | 5 ++ .../notChangeSignature/fun.kt.new | 5 ++ 30 files changed, 235 insertions(+), 7 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index 74913ee7417..fd8e782ee22 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -52,6 +52,9 @@ import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import com.intellij.openapi.diagnostic.Logger import org.jetbrains.jet.lang.resolve.java.JvmAbi +import org.jetbrains.org.objectweb.asm.ClassReader +import org.jetbrains.jps.builders.java.JavaBuilderUtil +import com.intellij.util.containers.MultiMap public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -136,6 +139,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val allCompiledFiles = getAllCompiledFilesContainer(context) + val filesToCompile: MultiMap if (JpsUtils.isJsKotlinModule(representativeTarget)) { if (chunk.getModules().size() > 1) { @@ -152,6 +156,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget) //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); + filesToCompile = MultiMap.emptyInstance() // won't be used + if (sourceFiles.isEmpty()) { return NOTHING_DONE } @@ -171,10 +177,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR + "Kotlin will compile them, but some strange effect may happen", NO_LOCATION) } - val filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) - for (target in filesToCompile.keySet()) { - filesToCompile.getModifiable(target).removeAll(allCompiledFiles) - } + filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) allCompiledFiles.addAll(filesToCompile.values()) val processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context) @@ -243,6 +246,21 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR outputConsumer.registerOutputFile(target, outputFile, sourceFiles.map { it.getPath() }) } + val delta = context.getProjectDescriptor().dataManager.getMappings()!!.createDelta() + val callback = delta!!.getCallback()!! + + for (outputItem in outputItemCollector.getOutputs()) { + val outputFile = outputItem.getOutputFile() + callback.associate(FileUtil.toSystemIndependentName(outputFile.getAbsolutePath()), + outputItem.getSourceFiles().map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, + ClassReader(outputFile.readBytes()) + ) + } + + val allCompiled = filesToCompile.values() + val compiledInThisRound = if (compilationErrors) listOf() else allCompiled + JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound) + if (compilationErrors) { return ABORT } @@ -254,7 +272,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.COMPILE_OTHERS) { // TODO should mark dependencies as dirty, as well - FSOperations.markDirty(context, chunk, { file -> !allCompiledFiles.contains(file) }) + FSOperations.markDirty(context, chunk, { file -> + KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles + }) } return ADDITIONAL_PASS_REQUIRED } diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java index f9855199f63..353d99f2dbb 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java @@ -131,7 +131,7 @@ public class KotlinSourceFileCollector { return (Iterable) target.getModule().getSourceRoots(sourceRootType); } - private static boolean isKotlinSourceFile(File file) { + static boolean isKotlinSourceFile(File file) { return FileUtilRt.extensionEquals(file.getName(), "kt"); } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 8875bc89a7d..8c82d571c63 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -28,7 +28,7 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class}) +@InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class, IncrementalJpsTestGenerated.WithJava.class}) @RunWith(JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/circularDependency") @@ -290,6 +290,75 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); doTest(fileName); } + + } + + @TestMetadata("jps-plugin/testData/incremental/withJava") + @TestDataPath("$PROJECT_ROOT") + @InnerTestClasses({WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + public static class WithJava extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInWithJava() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") + @TestDataPath("$PROJECT_ROOT") + @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("changeNotUsedSignature") + public void testChangeNotUsedSignature() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/"); + doTest(fileName); + } + + @TestMetadata("changeSignature") + public void testChangeSignature() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/"); + doTest(fileName); + } + + @TestMetadata("notChangeSignature") + public void testNotChangeSignature() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); + doTest(fileName); + } + + } + + @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") + @TestDataPath("$PROJECT_ROOT") + @InnerTestClasses({}) + @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInKotlinUsedInJava() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("changeNotUsedSignature") + public void testChangeNotUsedSignature() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/"); + doTest(fileName); + } + + @TestMetadata("changeSignature") + public void testChangeSignature() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/"); + doTest(fileName); + } + + @TestMetadata("notChangeSignature") + public void testNotChangeSignature() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); + doTest(fileName); + } + + } } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 0d4503b9825..f277b681fb5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -6,8 +6,11 @@ Compiling files: src/const.kt End of files Cleaning output files: +out/production/module/test/Klass$object.class +out/production/module/test/Klass.class out/production/module/test/Usage.class End of files Compiling files: +src/const.kt src/usage.kt End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log index 5a8dee5393d..85f35fb29cb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log @@ -9,6 +9,10 @@ COMPILATION FAILED Kotlin:ERROR:Expecting an expression +Cleaning output files: +out/production/module/_DefaultPackage$fun$*.class +End of files Compiling files: +src/fun.kt src/usage.kt End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 50bc11c8e4d..66a82a4119c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -7,8 +7,12 @@ Compiling files: src/const.kt End of files Cleaning output files: +out/production/module/test/Trait$$TImpl.class +out/production/module/test/Trait$object.class +out/production/module/test/Trait.class out/production/module/test/Usage.class End of files Compiling files: +src/const.kt src/usage.kt End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java new file mode 100644 index 00000000000..15f4844a8da --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java @@ -0,0 +1,4 @@ +public class JavaClass { + public static void foo() { + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new new file mode 100644 index 00000000000..78acfa5f44b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/JavaClass.java.new @@ -0,0 +1,5 @@ +public class JavaClass { + public static String foo() { + return ":)"; + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log new file mode 100644 index 00000000000..06eb34e15ab --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt new file mode 100644 index 00000000000..8aa421dfc37 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/notUsage.kt @@ -0,0 +1,2 @@ +fun main(args: Array) { +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java new file mode 100644 index 00000000000..15f4844a8da --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java @@ -0,0 +1,4 @@ +public class JavaClass { + public static void foo() { + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new new file mode 100644 index 00000000000..78acfa5f44b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/JavaClass.java.new @@ -0,0 +1,5 @@ +public class JavaClass { + public static String foo() { + return ":)"; + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log new file mode 100644 index 00000000000..38e5605bee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files +Cleaning output files: +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt new file mode 100644 index 00000000000..43c9b8575bc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/usage.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + JavaClass.foo() +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java new file mode 100644 index 00000000000..15f4844a8da --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java @@ -0,0 +1,4 @@ +public class JavaClass { + public static void foo() { + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new new file mode 100644 index 00000000000..15f4844a8da --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new @@ -0,0 +1,4 @@ +public class JavaClass { + public static void foo() { + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log new file mode 100644 index 00000000000..06eb34e15ab --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt new file mode 100644 index 00000000000..43c9b8575bc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/usage.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + JavaClass.foo() +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java new file mode 100644 index 00000000000..9749b3a6a93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java @@ -0,0 +1,2 @@ +public class NotUsage { +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log new file mode 100644 index 00000000000..560795823cd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt new file mode 100644 index 00000000000..c9398192af4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt @@ -0,0 +1,5 @@ +package test + +fun foo() { + +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new new file mode 100644 index 00000000000..c32d0732df4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new @@ -0,0 +1,5 @@ +package test + +fun foo(): String { + return "Hello, world!" +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java new file mode 100644 index 00000000000..c5c8cac1e85 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java @@ -0,0 +1,5 @@ +public class Usage { + public static void main(String[] args) { + test.TestPackage.foo(); + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log new file mode 100644 index 00000000000..0433af7364a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files +Cleaning output files: +out/production/module/Usage.class +End of files +Compiling files: +src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt new file mode 100644 index 00000000000..c9398192af4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt @@ -0,0 +1,5 @@ +package test + +fun foo() { + +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new new file mode 100644 index 00000000000..c32d0732df4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new @@ -0,0 +1,5 @@ +package test + +fun foo(): String { + return "Hello, world!" +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java new file mode 100644 index 00000000000..c5c8cac1e85 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java @@ -0,0 +1,5 @@ +public class Usage { + public static void main(String[] args) { + test.TestPackage.foo(); + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log new file mode 100644 index 00000000000..560795823cd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt new file mode 100644 index 00000000000..c9398192af4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt @@ -0,0 +1,5 @@ +package test + +fun foo() { + +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new new file mode 100644 index 00000000000..c9398192af4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new @@ -0,0 +1,5 @@ +package test + +fun foo() { + +} From 9c8276c9fa23246138c556352c5d6f6c77be941b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 22 Oct 2014 12:36:29 +0400 Subject: [PATCH 0187/1557] Tests with constants, incremental compilation between Kotlin and Java. Original commit: 9234ef3803986ec1dda573782ca9cfe14ba95cf7 --- .../build/IncrementalJpsTestGenerated.java | 24 +++++++++++++++++++ .../constantChanged/JavaClass.java | 3 +++ .../constantChanged/JavaClass.java.new | 3 +++ .../constantChanged/build.log | 16 +++++++++++++ .../javaUsedInKotlin/constantChanged/usage.kt | 2 ++ .../constantUnchanged/JavaClass.java | 3 +++ .../constantUnchanged/JavaClass.java.new | 3 +++ .../constantUnchanged/build.log | 6 +++++ .../constantUnchanged/usage.kt | 2 ++ .../constantChanged/Usage.java | 7 ++++++ .../constantChanged/build.log | 18 ++++++++++++++ .../kotlinUsedInJava/constantChanged/const.kt | 8 +++++++ .../constantChanged/const.kt.new | 8 +++++++ .../constantUnchanged/Usage.java | 7 ++++++ .../constantUnchanged/build.log | 7 ++++++ .../constantUnchanged/const.kt | 7 ++++++ .../constantUnchanged/const.kt.new | 7 ++++++ 17 files changed, 131 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 8c82d571c63..a0845818323 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -323,6 +323,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("constantChanged") + public void testConstantChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/"); + doTest(fileName); + } + + @TestMetadata("constantUnchanged") + public void testConstantUnchanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/"); + doTest(fileName); + } + @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); @@ -352,6 +364,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("constantChanged") + public void testConstantChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/"); + doTest(fileName); + } + + @TestMetadata("constantUnchanged") + public void testConstantUnchanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/"); + doTest(fileName); + } + @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java new file mode 100644 index 00000000000..888f27db4e3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java @@ -0,0 +1,3 @@ +public class JavaClass { + public static final String CONST = "A"; +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new new file mode 100644 index 00000000000..96ac5cb2bca --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/JavaClass.java.new @@ -0,0 +1,3 @@ +public class JavaClass { + public static final String CONST = "B"; +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log new file mode 100644 index 00000000000..340fdbba3b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files +Cleaning output files: +out/production/module/JavaClass.class +out/production/module/Usage.class +End of files +Compiling files: +src/usage.kt +End of files +Compiling files: +src/JavaClass.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt new file mode 100644 index 00000000000..9f972262826 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt @@ -0,0 +1,2 @@ +deprecated(JavaClass.CONST + JavaClass.CONST) +class Usage diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java new file mode 100644 index 00000000000..888f27db4e3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java @@ -0,0 +1,3 @@ +public class JavaClass { + public static final String CONST = "A"; +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new new file mode 100644 index 00000000000..888f27db4e3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new @@ -0,0 +1,3 @@ +public class JavaClass { + public static final String CONST = "A"; +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log new file mode 100644 index 00000000000..1cefb7c31b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt new file mode 100644 index 00000000000..9f972262826 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt @@ -0,0 +1,2 @@ +deprecated(JavaClass.CONST + JavaClass.CONST) +class Usage diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java new file mode 100644 index 00000000000..9430b8d5f66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/Usage.java @@ -0,0 +1,7 @@ +import test.*; + +class Usage { + public static void main(String[] args) { + System.out.println(Klass.CONST + Klass.CONST); + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log new file mode 100644 index 00000000000..78e27d0e4e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/test/Klass$object.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/Usage.class +out/production/module/test/Klass$object.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files +Compiling files: +src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt new file mode 100644 index 00000000000..a3b30360e52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt @@ -0,0 +1,8 @@ +package test + +class Klass { + class object { + // Old and new constant values are different, but their hashes are the same + val CONST = "BF" + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new new file mode 100644 index 00000000000..8835b725265 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new @@ -0,0 +1,8 @@ +package test + +class Klass { + class object { + // Old and new constant values are different, but their hashes are the same + val CONST = "Ae" + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java new file mode 100644 index 00000000000..9430b8d5f66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/Usage.java @@ -0,0 +1,7 @@ +import test.*; + +class Usage { + public static void main(String[] args) { + System.out.println(Klass.CONST + Klass.CONST); + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log new file mode 100644 index 00000000000..026ae147f5a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/Klass$object.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt new file mode 100644 index 00000000000..b13ee1c3c3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt @@ -0,0 +1,7 @@ +package test + +class Klass { + class object { + val CONST = "bar" + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new new file mode 100644 index 00000000000..b13ee1c3c3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new @@ -0,0 +1,7 @@ +package test + +class Klass { + class object { + val CONST = "bar" + } +} From de840282e865239da2a40aa7a5be3ca7c3183e96 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 23 Oct 2014 17:28:01 +0400 Subject: [PATCH 0188/1557] Replaced absolute paths with macro in compilation errors. Original commit: e1180983aa37346736dbc5cf6b44db14f604cf4a --- .../jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 6ad8f9e46dd..ecbd14830f7 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -60,7 +60,12 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { try { val buildResult = doBuild(descriptor, scope)!! if (!buildResult.isSuccessful()) { - return logger.log + "COMPILATION FAILED\n" + buildResult.getMessages(BuildMessage.Kind.ERROR).joinToString("\n") + "\n" + val errorMessages = + buildResult + .getMessages(BuildMessage.Kind.ERROR) + .joinToString("\n") + .replace(workDir.getAbsolutePath(), "\$PROJECT") + return logger.log + "COMPILATION FAILED\n" + errorMessages + "\n" } else { return logger.log From 3ce56b01f31d54101deb9a018c15396228b47773 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 23 Oct 2014 18:01:10 +0400 Subject: [PATCH 0189/1557] Tests with renamed method, incremental compilation between Kotlin and Java. Original commit: 335c3f450687de9ae00e2dba07824293aeb83065 --- .../build/IncrementalJpsTestGenerated.java | 57 ++++++++++++------- .../methodRenamed/JavaClass.java | 5 ++ .../methodRenamed/JavaClass.java.new | 5 ++ .../javaUsedInKotlin/methodRenamed/build.log | 18 ++++++ .../methodRenamed/willBeResolvedToOther.kt | 6 ++ .../methodRenamed/willBeUnresolved.kt | 3 + .../funRenamed/WillBeUnresolved.java | 5 ++ .../kotlinUsedInJava/funRenamed/build.log | 14 +++++ .../kotlinUsedInJava/funRenamed/fun.kt | 5 ++ .../kotlinUsedInJava/funRenamed/fun.kt.new | 5 ++ .../propertyRenamed/WillBeUnresolved.java | 5 ++ .../propertyRenamed/build.log | 14 +++++ .../kotlinUsedInJava/propertyRenamed/prop.kt | 3 + .../propertyRenamed/prop.kt.new | 3 + 14 files changed, 128 insertions(+), 20 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index a0845818323..81773acfea9 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -290,99 +290,116 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); doTest(fileName); } - + } - + @TestMetadata("jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class}) - @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); } - + @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) - @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); } - + @TestMetadata("changeNotUsedSignature") public void testChangeNotUsedSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/"); doTest(fileName); } - + @TestMetadata("changeSignature") public void testChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/"); doTest(fileName); } - + @TestMetadata("constantChanged") public void testConstantChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/"); doTest(fileName); } - + @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/"); doTest(fileName); } - + + @TestMetadata("methodRenamed") + public void testMethodRenamed() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); + doTest(fileName); + } + @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); doTest(fileName); } - + } - + @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) - @RunWith(org.jetbrains.jet.JUnit3RunnerWithInners.class) + @RunWith(JUnit3RunnerWithInners.class) public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInKotlinUsedInJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); } - + @TestMetadata("changeNotUsedSignature") public void testChangeNotUsedSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/"); doTest(fileName); } - + @TestMetadata("changeSignature") public void testChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/"); doTest(fileName); } - + @TestMetadata("constantChanged") public void testConstantChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/"); doTest(fileName); } - + @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/"); doTest(fileName); } - + + @TestMetadata("funRenamed") + public void testFunRenamed() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/"); + doTest(fileName); + } + @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); doTest(fileName); } - - } + @TestMetadata("propertyRenamed") + public void testPropertyRenamed() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); + doTest(fileName); + } + + } } } diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java new file mode 100644 index 00000000000..588b1e9ad44 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java @@ -0,0 +1,5 @@ +public class JavaClass { + public void f(String s) { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new new file mode 100644 index 00000000000..43dd2ac8345 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/JavaClass.java.new @@ -0,0 +1,5 @@ +public class JavaClass { + public void g(String s) { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log new file mode 100644 index 00000000000..7dcafae29b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files +Cleaning output files: +out/production/module/_DefaultPackage$willBeResolvedToOther$*$willBeResolvedToOther$1.class +out/production/module/_DefaultPackage$willBeResolvedToOther$*.class +out/production/module/_DefaultPackage$willBeUnresolved$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/willBeResolvedToOther.kt +src/willBeUnresolved.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Unresolved reference: f diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt new file mode 100644 index 00000000000..72082d09fc6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeResolvedToOther.kt @@ -0,0 +1,6 @@ +fun willBeResolvedToOther() { + fun JavaClass.f(s: String) { + } + + JavaClass().f(":|") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt new file mode 100644 index 00000000000..ee4c233631a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/willBeUnresolved.kt @@ -0,0 +1,3 @@ +fun willBeUnresolved() { + JavaClass().f(":(") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java new file mode 100644 index 00000000000..7d43b904ef1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java @@ -0,0 +1,5 @@ +class WillBeUnresolved { + void main() { + test.TestPackage.f(":("); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log new file mode 100644 index 00000000000..0c78e0c1820 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files +Compiling files: +src/WillBeUnresolved.java +End of files +COMPILATION FAILED +java:ERROR:$PROJECT/src/WillBeUnresolved.java:3: cannot find symbol +symbol : method f(java.lang.String) +location: class test.TestPackage \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt new file mode 100644 index 00000000000..470b3d1fd17 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(s: String) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new new file mode 100644 index 00000000000..af45b699cb1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new @@ -0,0 +1,5 @@ +package test + +fun g(s: String) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java new file mode 100644 index 00000000000..38666b4ad3c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java @@ -0,0 +1,5 @@ +class WillBeUnresolved { + void main() { + test.TestPackage.getProp(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log new file mode 100644 index 00000000000..59f1f29a253 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/TestPackage$prop$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/prop.kt +End of files +Compiling files: +src/WillBeUnresolved.java +End of files +COMPILATION FAILED +java:ERROR:$PROJECT/src/WillBeUnresolved.java:3: cannot find symbol +symbol : method getProp() +location: class test.TestPackage diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt new file mode 100644 index 00000000000..43ed22b0657 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt @@ -0,0 +1,3 @@ +package test + +val prop = ":)" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new new file mode 100644 index 00000000000..af84143993b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new @@ -0,0 +1,3 @@ +package test + +val prop1 = ":)" \ No newline at end of file From c6c649957b52bae55723bb8fad1e7998605d1fe6 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 23 Oct 2014 20:48:05 +0400 Subject: [PATCH 0190/1557] Supported incremental compilation tests when compilation fails in the end. Original commit: c0b0a17256fa0d3cbbd8a29f4f6baf53fcb4792a --- .../jps/build/AbstractIncrementalJpsTest.kt | 40 ++++++++++++------- .../jet/jps/build/classFilesComparison.kt | 13 +++++- 2 files changed, 38 insertions(+), 15 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index ecbd14830f7..60230b664b9 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -35,8 +35,13 @@ import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.messages.BuildMessage import kotlin.test.assertFalse import java.util.regex.Pattern +import kotlin.test.assertEquals public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { + class object { + val COMPILATION_FAILED = "COMPILATION FAILED" + } + private var testDataDir: File by Delegates.notNull() var workDir: File by Delegates.notNull() @@ -65,7 +70,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { .getMessages(BuildMessage.Kind.ERROR) .joinToString("\n") .replace(workDir.getAbsolutePath(), "\$PROJECT") - return logger.log + "COMPILATION FAILED\n" + errorMessages + "\n" + return logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n" } else { return logger.log @@ -77,15 +82,15 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { private fun initialMake() { val log = buildGetLog() - assertFalse("COMPILATION FAILED" in log, "Initial make failed:\n$log") + assertFalse(COMPILATION_FAILED in log, "Initial make failed:\n$log") } private fun make(): String { return buildGetLog() } - private fun rebuild() { - buildGetLog(CompileScopeTestBuilder.rebuild().allModules()) + private fun rebuild(): String { + return buildGetLog(CompileScopeTestBuilder.rebuild().allModules()) } private fun getModificationsToPerform(moduleNames: Collection?): List> { @@ -147,22 +152,24 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } } - private fun rebuildAndCheckOutput() { + private fun rebuildAndCheckOutput(lastMakeFailed: Boolean) { val outDir = File(getAbsolutePath("out")) val outAfterMake = File(getAbsolutePath("out-after-make")) FileUtil.copyDir(outDir, outAfterMake) - rebuild() + val rebuildLog = rebuild() + val rebuildFailed = rebuildLog.contains(COMPILATION_FAILED) + assertEquals(rebuildFailed, lastMakeFailed, "Rebuild failed: $rebuildFailed, last make failed: $lastMakeFailed. Rebuild log: $rebuildLog") - assertEqualDirectories(outDir, outAfterMake) + assertEqualDirectories(outDir, outAfterMake, lastMakeFailed) FileUtil.delete(outAfterMake) } - private fun clearCachesRebuildAndCheckOutput() { + private fun clearCachesRebuildAndCheckOutput(lastMakeFailed: Boolean) { FileUtil.delete(BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot()!!) - rebuildAndCheckOutput() + rebuildAndCheckOutput(lastMakeFailed) } private fun readModuleDependencies(): Map>? { @@ -192,26 +199,31 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val moduleNames = configureModules() initialMake() - val log = performModificationsAndMake(moduleNames) + val (log, lastMakeFailed) = performModificationsAndMake(moduleNames) UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), log) - rebuildAndCheckOutput() - clearCachesRebuildAndCheckOutput() + rebuildAndCheckOutput(lastMakeFailed) + clearCachesRebuildAndCheckOutput(lastMakeFailed) } - private fun performModificationsAndMake(moduleNames: Set?): String { + + private data class MakeLogAndFailureFlag(val log: String, val makeFailed: Boolean) + + private fun performModificationsAndMake(moduleNames: Set?): MakeLogAndFailureFlag { val logs = ArrayList() val modifications = getModificationsToPerform(moduleNames) + var lastCompilationFailed = false for (step in modifications) { step.forEach { it.perform(workDir) } performAdditionalModifications() val log = make() + lastCompilationFailed = log.contains(COMPILATION_FAILED) logs.add(log) } - return logs.join("\n\n") + return MakeLogAndFailureFlag(logs.join("\n\n"), lastCompilationFailed) } protected open fun performAdditionalModifications() { diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index 93bf8b7f766..b7c8379b5ec 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -94,7 +94,7 @@ fun getAllRelativePaths(dir: File): Set { return result } -fun assertEqualDirectories(expected: File, actual: File) { +fun assertEqualDirectories(expected: File, actual: File, forgiveExtraFiles: Boolean) { val pathsInExpected = getAllRelativePaths(expected) val pathsInActual = getAllRelativePaths(actual) @@ -110,6 +110,17 @@ fun assertEqualDirectories(expected: File, actual: File) { assertEquals(expectedString, actualString + " ") } + if (forgiveExtraFiles) { + // If compilation fails, output may be different for full rebuild and partial make. Parsing output (directory string) for simplicity. + if (changedPaths.isEmpty()) { + val expectedListingLines = expectedString.split('\n').toList() + val actualListingLines = actualString.split('\n').toList() + if (actualListingLines.containsAll(expectedListingLines)) { + return + } + } + } + assertEquals(expectedString, actualString) } From 5d93890a84e0adacf29b07340f5f8162dded5d76 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 24 Oct 2014 14:48:47 +0400 Subject: [PATCH 0191/1557] Tests: converting Java to Kotlin and back. Original commit: 86dd7ec8803f2270bc9b841b0f2309ef6af929cc --- .../build/IncrementalJpsTestGenerated.java | 25 ++++++++++++++++++- .../javaToKotlin/TheClass.java | 5 ++++ .../javaToKotlin/TheClass.java.delete | 0 .../javaToKotlin/TheClass.kt.new | 5 ++++ .../javaToKotlin/Usage.java | 5 ++++ .../javaToKotlin/build.log | 17 +++++++++++++ .../javaToKotlin/usage.kt | 3 +++ .../kotlinToJava/TheClass.java.new | 5 ++++ .../kotlinToJava/TheClass.kt | 5 ++++ .../kotlinToJava/TheClass.kt.delete | 0 .../kotlinToJava/Usage.java | 5 ++++ .../kotlinToJava/build.log | 19 ++++++++++++++ .../kotlinToJava/usage.kt | 3 +++ 13 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 81773acfea9..ba64f65e805 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -295,13 +295,36 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class}) + @InnerTestClasses({WithJava.ConvertBetweenJavaAndKotlin.class, WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class}) @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") + @TestDataPath("$PROJECT_ROOT") + @InnerTestClasses({}) + @RunWith(JUnit3RunnerWithInners.class) + public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("javaToKotlin") + public void testJavaToKotlin() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/"); + doTest(fileName); + } + + @TestMetadata("kotlinToJava") + public void testKotlinToJava() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); + doTest(fileName); + } + + } + @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java new file mode 100644 index 00000000000..a802b656773 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java @@ -0,0 +1,5 @@ +public class TheClass { + public void doStuff() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.java.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new new file mode 100644 index 00000000000..0e11cbbd284 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/TheClass.kt.new @@ -0,0 +1,5 @@ +public class TheClass { + public fun doStuff() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java new file mode 100644 index 00000000000..c4f889667f3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/Usage.java @@ -0,0 +1,5 @@ +class Usage { + void usage() { + new TheClass().doStuff(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log new file mode 100644 index 00000000000..314bb5ebad4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/TheClass.class +End of files +Compiling files: +src/TheClass.kt +End of files +Cleaning output files: +out/production/module/Usage.class +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files +Compiling files: +src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt new file mode 100644 index 00000000000..64cd1bf23ad --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt @@ -0,0 +1,3 @@ +fun usage() { + TheClass().doStuff() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new new file mode 100644 index 00000000000..a802b656773 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.java.new @@ -0,0 +1,5 @@ +public class TheClass { + public void doStuff() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt new file mode 100644 index 00000000000..0e11cbbd284 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt @@ -0,0 +1,5 @@ +public class TheClass { + public fun doStuff() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/TheClass.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java new file mode 100644 index 00000000000..c4f889667f3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/Usage.java @@ -0,0 +1,5 @@ +class Usage { + void usage() { + new TheClass().doStuff(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log new file mode 100644 index 00000000000..7d8a70153b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -0,0 +1,19 @@ +Cleaning output files: +out/production/module/TheClass.class +End of files +Compiling files: +End of files +Compiling files: +src/TheClass.java +End of files +Cleaning output files: +out/production/module/Usage.class +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files +Compiling files: +src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt new file mode 100644 index 00000000000..64cd1bf23ad --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt @@ -0,0 +1,3 @@ +fun usage() { + TheClass().doStuff() +} \ No newline at end of file From 6447c4183dee3d8d52c73cee05ec08455b41acc5 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 24 Oct 2014 15:57:07 +0400 Subject: [PATCH 0192/1557] Added tests with adding method to superclass. Original commit: 32377914339d7f01daf2ad54425b9feef878e08f --- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../javaUsedInKotlin/methodAddedInSuper/Sub.kt | 4 ++++ .../methodAddedInSuper/Super.java | 4 ++++ .../methodAddedInSuper/Super.java.new | 7 +++++++ .../javaUsedInKotlin/methodAddedInSuper/build.log | 15 +++++++++++++++ .../kotlinUsedInJava/methodAddedInSuper/Sub.java | 5 +++++ .../kotlinUsedInJava/methodAddedInSuper/Super.kt | 4 ++++ .../methodAddedInSuper/Super.kt.new | 7 +++++++ .../kotlinUsedInJava/methodAddedInSuper/build.log | 11 +++++++++++ 9 files changed, 69 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index ba64f65e805..13886425f8e 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -358,6 +358,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("methodAddedInSuper") + public void testMethodAddedInSuper() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/"); + doTest(fileName); + } + @TestMetadata("methodRenamed") public void testMethodRenamed() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); @@ -411,6 +417,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("methodAddedInSuper") + public void testMethodAddedInSuper() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); + doTest(fileName); + } + @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt new file mode 100644 index 00000000000..34fce1c44ec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Sub.kt @@ -0,0 +1,4 @@ +public class Sub: Super() { + private fun y() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java new file mode 100644 index 00000000000..93dd06a5f94 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java @@ -0,0 +1,4 @@ +public class Super { + public void x() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new new file mode 100644 index 00000000000..821c0e89edf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/Super.java.new @@ -0,0 +1,7 @@ +public class Super { + public void x() { + } + + public void y() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log new file mode 100644 index 00000000000..a44ae0a4d8c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/Super.class +End of files +Compiling files: +src/Super.java +End of files +Cleaning output files: +out/production/module/Sub.class +End of files +Compiling files: +src/Sub.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Cannot weaken access privilege 'public' for 'y' in 'Super' +Kotlin:ERROR:'y' hides member of supertype 'Super' and needs 'override' modifier \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java new file mode 100644 index 00000000000..d3a612801c6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java @@ -0,0 +1,5 @@ +public class Sub extends Super { + private void y() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt new file mode 100644 index 00000000000..4529a54de25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt @@ -0,0 +1,4 @@ +public open class Super { + public fun x() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new new file mode 100644 index 00000000000..051e9812972 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new @@ -0,0 +1,7 @@ +public open class Super { + public fun x() { + } + + public fun y() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log new file mode 100644 index 00000000000..739009bbe79 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/Super.class +End of files +Compiling files: +src/Super.kt +End of files +Compiling files: +src/Sub.java +End of files +COMPILATION FAILED +java:ERROR:$PROJECT/src/Sub.java:2: y() in Sub cannot override y() in Super; overridden method is final \ No newline at end of file From e6dd4fac0c705b9bfe607da84de5bbdc31d33192 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 24 Oct 2014 16:28:32 +0400 Subject: [PATCH 0193/1557] Tests with SAM conversions. Original commit: 21105fcae4c782bee1b8788e940d80c48c0315c9 --- .../build/IncrementalJpsTestGenerated.java | 24 ++++++++++++++++++- .../methodAdded/SamInterface.java | 3 +++ .../methodAdded/SamInterface.java.new | 4 ++++ .../samConversions/methodAdded/build.log | 23 ++++++++++++++++++ .../samConversions/methodAdded/notUsage.kt | 3 +++ .../usageWithFunctionExpression.kt | 4 ++++ .../methodAdded/usageWithFunctionLiteral.kt | 3 +++ .../methodSignatureChanged/SamInterface.java | 3 +++ .../SamInterface.java.new | 3 +++ .../methodSignatureChanged/build.log | 18 ++++++++++++++ .../methodSignatureChanged/notUsage.kt | 3 +++ .../usageWithFunctionExpression.kt | 4 ++++ .../usageWithFunctionLiteral.kt | 3 +++ 13 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 13886425f8e..505e6628321 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -327,7 +327,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({}) + @InnerTestClasses({JavaUsedInKotlin.SamConversions.class}) @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { @@ -376,6 +376,28 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") + @TestDataPath("$PROJECT_ROOT") + @InnerTestClasses({}) + @RunWith(JUnit3RunnerWithInners.class) + public static class SamConversions extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInSamConversions() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("methodAdded") + public void testMethodAdded() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/"); + doTest(fileName); + } + + @TestMetadata("methodSignatureChanged") + public void testMethodSignatureChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/"); + doTest(fileName); + } + + } } @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java new file mode 100644 index 00000000000..beaca0eddc3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java @@ -0,0 +1,3 @@ +public interface SamInterface { + Object run(); +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new new file mode 100644 index 00000000000..0f3a85d741d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/SamInterface.java.new @@ -0,0 +1,4 @@ +public interface SamInterface { + Object run(); + Object walk(); +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log new file mode 100644 index 00000000000..e31f0b60e64 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module/SamInterface.class +End of files +Compiling files: +src/SamInterface.java +End of files +Cleaning output files: +out/production/module/_DefaultPackage$sam$SamInterface$*.class +out/production/module/_DefaultPackage$usageWithFunctionExpression$*$usageWithFunctionExpression$a$1.class +out/production/module/_DefaultPackage$usageWithFunctionExpression$*.class +out/production/module/_DefaultPackage$usageWithFunctionLiteral$*$usageWithFunctionLiteral$1.class +out/production/module/_DefaultPackage$usageWithFunctionLiteral$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usageWithFunctionExpression.kt +src/usageWithFunctionLiteral.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found +Kotlin:ERROR:Please specify constructor invocation; classifier 'SamInterface' does not have a class object +Kotlin:ERROR:Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found +Kotlin:ERROR:Please specify constructor invocation; classifier 'SamInterface' does not have a class object diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt new file mode 100644 index 00000000000..e1a791d4319 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/notUsage.kt @@ -0,0 +1,3 @@ +fun notUsage() { + println("!") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt new file mode 100644 index 00000000000..f7536d86407 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionExpression.kt @@ -0,0 +1,4 @@ +fun usageWithFunctionExpression() { + val a = { ":)" } + SamInterface(a) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt new file mode 100644 index 00000000000..da7b85ec489 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/usageWithFunctionLiteral.kt @@ -0,0 +1,3 @@ +fun usageWithFunctionLiteral() { + SamInterface { ":)" } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java new file mode 100644 index 00000000000..beaca0eddc3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java @@ -0,0 +1,3 @@ +public interface SamInterface { + Object run(); +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new new file mode 100644 index 00000000000..9e0be424c35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/SamInterface.java.new @@ -0,0 +1,3 @@ +public interface SamInterface { + String run(); +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log new file mode 100644 index 00000000000..f708754c847 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/SamInterface.class +End of files +Compiling files: +src/SamInterface.java +End of files +Cleaning output files: +out/production/module/_DefaultPackage$sam$SamInterface$*.class +out/production/module/_DefaultPackage$usageWithFunctionExpression$*$usageWithFunctionExpression$a$1.class +out/production/module/_DefaultPackage$usageWithFunctionExpression$*.class +out/production/module/_DefaultPackage$usageWithFunctionLiteral$*$usageWithFunctionLiteral$1.class +out/production/module/_DefaultPackage$usageWithFunctionLiteral$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usageWithFunctionExpression.kt +src/usageWithFunctionLiteral.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt new file mode 100644 index 00000000000..e1a791d4319 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/notUsage.kt @@ -0,0 +1,3 @@ +fun notUsage() { + println("!") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt new file mode 100644 index 00000000000..f7536d86407 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionExpression.kt @@ -0,0 +1,4 @@ +fun usageWithFunctionExpression() { + val a = { ":)" } + SamInterface(a) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt new file mode 100644 index 00000000000..da7b85ec489 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/usageWithFunctionLiteral.kt @@ -0,0 +1,3 @@ +fun usageWithFunctionLiteral() { + SamInterface { ":)" } +} \ No newline at end of file From 8da6c2434704fdabcf8d3847433f32c458345155 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 28 Oct 2014 15:09:59 +0300 Subject: [PATCH 0194/1557] Added tests with redeclaration. The behavior is correct (compilation error), while diagnostic message is not ideal. Original commit: 7f49a8c159bb1371b66eeb8169102164593d9ca8 --- .../build/IncrementalJpsTestGenerated.java | 24 +++++++++++++++++++ .../pureKotlin/classRedeclaration/build.log | 13 ++++++++++ .../pureKotlin/classRedeclaration/class1.kt | 1 + .../classRedeclaration/class2.kt.new | 1 + .../conflictingPlatformDeclarations/build.log | 11 +++++++++ .../conflictingPlatformDeclarations/fun1.kt | 5 ++++ .../conflictingPlatformDeclarations/fun2.kt | 3 +++ .../fun2.kt.new | 7 ++++++ .../pureKotlin/funRedeclaration/build.log | 11 +++++++++ .../pureKotlin/funRedeclaration/fun1.kt | 5 ++++ .../pureKotlin/funRedeclaration/fun2.kt | 3 +++ .../pureKotlin/funRedeclaration/fun2.kt.new | 7 ++++++ .../propertyRedeclaration/build.log | 11 +++++++++ .../pureKotlin/propertyRedeclaration/prop1.kt | 3 +++ .../pureKotlin/propertyRedeclaration/prop2.kt | 5 ++++ .../propertyRedeclaration/prop2.kt.new | 7 ++++++ 16 files changed, 117 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 505e6628321..97fe6f72843 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -99,6 +99,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("classRedeclaration") + public void testClassRedeclaration() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/"); + doTest(fileName); + } + @TestMetadata("classSignatureChanged") public void testClassSignatureChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); @@ -117,6 +123,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("conflictingPlatformDeclarations") + public void testConflictingPlatformDeclarations() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); + doTest(fileName); + } + @TestMetadata("constantsUnchanged") public void testConstantsUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); @@ -141,6 +153,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("funRedeclaration") + public void testFunRedeclaration() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funRedeclaration/"); + doTest(fileName); + } + @TestMetadata("independentClasses") public void testIndependentClasses() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); @@ -249,6 +267,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("propertyRedeclaration") + public void testPropertyRedeclaration() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/"); + doTest(fileName); + } + @TestMetadata("returnTypeChanged") public void testReturnTypeChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log new file mode 100644 index 00000000000..bfc18950439 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log @@ -0,0 +1,13 @@ +Compiling files: +src/class2.kt +End of files +Cleaning output files: +out/production/module/Klass.class +End of files +Compiling files: +src/class1.kt +src/class2.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Redeclaration: Klass +Kotlin:ERROR:Redeclaration: Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class1.kt new file mode 100644 index 00000000000..bc00411157b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class1.kt @@ -0,0 +1 @@ +class Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class2.kt.new new file mode 100644 index 00000000000..bc00411157b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/class2.kt.new @@ -0,0 +1 @@ +class Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log new file mode 100644 index 00000000000..c7c84ffc8d8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun2$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun2.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): + fun function(list: kotlin.List): kotlin.Unit + fun function(list: kotlin.List): kotlin.Unit diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt new file mode 100644 index 00000000000..45fb46b3db7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt @@ -0,0 +1,5 @@ +package test + +fun function(list: List) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt new file mode 100644 index 00000000000..897d69e3641 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt @@ -0,0 +1,3 @@ +package test + +val x = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new new file mode 100644 index 00000000000..97e1b6d862c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new @@ -0,0 +1,7 @@ +package test + +val x = 1 + +fun function(list: List) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log new file mode 100644 index 00000000000..f9713085579 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun2$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun2.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (function()V): + fun function(): kotlin.Unit + fun function(): kotlin.Unit \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun1.kt new file mode 100644 index 00000000000..539d6344c39 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun1.kt @@ -0,0 +1,5 @@ +package test + +fun function() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt new file mode 100644 index 00000000000..897d69e3641 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt @@ -0,0 +1,3 @@ +package test + +val x = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new new file mode 100644 index 00000000000..6621c5f63e7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/fun2.kt.new @@ -0,0 +1,7 @@ +package test + +val x = 1 + +fun function() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log new file mode 100644 index 00000000000..15793b4067f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/test/TestPackage$prop2$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/prop2.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): + fun (): kotlin.Int + fun (): kotlin.Int \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt new file mode 100644 index 00000000000..14b9ceec2ef --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop1.kt @@ -0,0 +1,3 @@ +package test + +val property = 1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt new file mode 100644 index 00000000000..a46bb3499d4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt @@ -0,0 +1,5 @@ +package test + +fun dummy() { + +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new new file mode 100644 index 00000000000..4a10a872d00 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/prop2.kt.new @@ -0,0 +1,7 @@ +package test + +fun dummy() { + +} + +val property = 1 \ No newline at end of file From 08831faa5c9dd681ae6a8b8effb7a2458541dbca Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 28 Oct 2014 22:41:59 +0300 Subject: [PATCH 0195/1557] Committed wrong behavior of Java+Kotlin incremental compilation (Java files recompiled twice). Original commit: 1e2c4659cdb04358e9110e6eb92d17547984a612 --- .../convertBetweenJavaAndKotlin/javaToKotlin/build.log | 3 +++ .../convertBetweenJavaAndKotlin/kotlinToJava/build.log | 1 + .../withJava/kotlinUsedInJava/changeSignature/build.log | 3 +++ .../withJava/kotlinUsedInJava/constantChanged/build.log | 3 +++ 4 files changed, 10 insertions(+) diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 314bb5ebad4..ec95b26dd18 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -4,6 +4,9 @@ End of files Compiling files: src/TheClass.kt End of files +Compiling files: +src/Usage.java +End of files Cleaning output files: out/production/module/Usage.class out/production/module/_DefaultPackage$usage$*.class diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 7d8a70153b1..31cb37fef8a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -5,6 +5,7 @@ Compiling files: End of files Compiling files: src/TheClass.java +src/Usage.java End of files Cleaning output files: out/production/module/Usage.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 0433af7364a..f0e3ef372f9 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -5,6 +5,9 @@ End of files Compiling files: src/fun.kt End of files +Compiling files: +src/Usage.java +End of files Cleaning output files: out/production/module/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index 78e27d0e4e4..7cafe0b9fe4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -5,6 +5,9 @@ End of files Compiling files: src/const.kt End of files +Compiling files: +src/Usage.java +End of files Cleaning output files: out/production/module/Usage.class out/production/module/test/Klass$object.class From 6917c317bab4b155f67ab34525dbe1c05608b436 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 29 Oct 2014 19:29:12 +0300 Subject: [PATCH 0196/1557] Minor. Added test when compilation error is introduced and fixed in other package. Original commit: 155775f925b27d6d24c4ed03762add481397d412 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 12 +++++++++--- .../build.log | 0 .../fun.kt | 0 .../usage.kt | 0 .../usage.kt.new.1 | 0 .../usage.kt.new.2 | 0 .../compilationErrorThenFixedSamePackage/build.log | 14 ++++++++++++++ .../compilationErrorThenFixedSamePackage/fun.kt | 4 ++++ .../compilationErrorThenFixedSamePackage/usage.kt | 5 +++++ .../usage.kt.new.1 | 5 +++++ .../usage.kt.new.2 | 5 +++++ 11 files changed, 42 insertions(+), 3 deletions(-) rename jps/jps-plugin/testData/incremental/pureKotlin/{compilationErrorThenFixed => compilationErrorThenFixedOtherPackage}/build.log (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/{compilationErrorThenFixed => compilationErrorThenFixedOtherPackage}/fun.kt (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/{compilationErrorThenFixed => compilationErrorThenFixedOtherPackage}/usage.kt (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/{compilationErrorThenFixed => compilationErrorThenFixedOtherPackage}/usage.kt.new.1 (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/{compilationErrorThenFixed => compilationErrorThenFixedOtherPackage}/usage.kt.new.2 (100%) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 97fe6f72843..3c9dc6cc24a 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -117,9 +117,15 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("compilationErrorThenFixed") - public void testCompilationErrorThenFixed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/"); + @TestMetadata("compilationErrorThenFixedOtherPackage") + public void testCompilationErrorThenFixedOtherPackage() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/"); + doTest(fileName); + } + + @TestMetadata("compilationErrorThenFixedSamePackage") + public void testCompilationErrorThenFixedSamePackage() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/"); doTest(fileName); } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/fun.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixed/usage.kt.new.2 rename to jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log new file mode 100644 index 00000000000..872cccb99f3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Kotlin:ERROR:Expecting an expression + + +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt new file mode 100644 index 00000000000..2171b8f5fcf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt @@ -0,0 +1,4 @@ +package f + +fun f() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt new file mode 100644 index 00000000000..406f84ac5b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + f.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 new file mode 100644 index 00000000000..568fde17ee6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + f.f( +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 new file mode 100644 index 00000000000..406f84ac5b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + f.f() +} \ No newline at end of file From 676b09ca6d941e2a8e9bd016e9f58d9bb9737fb6 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 30 Oct 2014 16:01:28 +0300 Subject: [PATCH 0197/1557] Improved output dir checking in KotlinBuilder. Output dir for representative target is necessary only for JS part: moved there. Original commit: 97b516a60021ffae8361f9bae4e2cfb06dc3f8ef --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 7 ++----- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 11 ++++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index fd8e782ee22..8dff4f07311 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -87,8 +87,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val representativeTarget = chunk.representativeTarget() - val outputDir = representativeTarget.getOutputDir() - val dataManager = context.getProjectDescriptor().dataManager val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) } @@ -114,7 +112,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val environment = CompilerEnvironment.getEnvironmentFor( PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), - outputDir, javaClass.getClassLoader(), { className -> className!!.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") @@ -128,8 +125,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return ABORT } - assert(outputDir != null, "CompilerEnvironment must have checked for outputDir to be not null, but it didn't") - val outputItemCollector = OutputItemsCollectorImpl() val project = representativeTarget.getModule().getProject()!! @@ -162,6 +157,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return NOTHING_DONE } + val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) + val outputFile = File(outputDir, representativeTarget.getModule().getName() + ".js") val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 8a12efc8468..4bf4e25a006 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -31,6 +31,7 @@ import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; +import org.jetbrains.jps.incremental.ProjectBuildException; import org.jetbrains.jps.model.java.JpsAnnotationRootType; import org.jetbrains.jps.model.java.JpsJavaSdkType; import org.jetbrains.jps.model.library.JpsLibrary; @@ -60,7 +61,7 @@ public class KotlinBuilderModuleScriptGenerator { MultiMap sourceFiles, // ignored for non-incremental compilation boolean hasRemovedFiles ) - throws IOException + throws IOException, ProjectBuildException { KotlinModuleDescriptionBuilder builder = FACTORY.create(); @@ -68,11 +69,11 @@ public class KotlinBuilderModuleScriptGenerator { Set outputDirs = new HashSet(); for (ModuleBuildTarget target : chunk.getTargets()) { - outputDirs.add(getOutputDir(target)); + outputDirs.add(getOutputDirSafe(target)); } ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger(); for (ModuleBuildTarget target : chunk.getTargets()) { - File outputDir = getOutputDir(target); + File outputDir = getOutputDirSafe(target); List moduleSources = new ArrayList( IncrementalCompilation.ENABLED @@ -108,10 +109,10 @@ public class KotlinBuilderModuleScriptGenerator { } @NotNull - private static File getOutputDir(@NotNull ModuleBuildTarget target) { + public static File getOutputDirSafe(@NotNull ModuleBuildTarget target) throws ProjectBuildException { File outputDir = target.getOutputDir(); if (outputDir == null) { - throw new IllegalStateException("No output directory found for " + target); + throw new ProjectBuildException("No output directory found for " + target); } return outputDir; } From 4b6757145b5391337cacf2f87ea93f2cfb5fef4c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 30 Oct 2014 17:33:43 +0300 Subject: [PATCH 0198/1557] Extracted methods compiling to JS and JVM in KotlinBuilder. Original commit: a797f82ce2d6859efaf5306b80786946708ef5c8 --- .../jetbrains/jet/jps/build/KotlinBuilder.kt | 161 +++++++++++------- 1 file changed, 97 insertions(+), 64 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index 8dff4f07311..2a95f84875b 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -55,6 +55,10 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.jps.builders.java.JavaBuilderUtil import com.intellij.util.containers.MultiMap +import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.jet.compiler.CompilerSettings +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jet.compiler.runner.OutputItemsCollector public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -125,79 +129,22 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return ABORT } - val outputItemCollector = OutputItemsCollectorImpl() - val project = representativeTarget.getModule().getProject()!! val commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project) commonArguments.verbose = true // Make compiler report source to output files mapping - val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) - val allCompiledFiles = getAllCompiledFilesContainer(context) - val filesToCompile: MultiMap + val filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) - if (JpsUtils.isJsKotlinModule(representativeTarget)) { - if (chunk.getModules().size() > 1) { - // We do not support circular dependencies, but if they are present, we do our best should not break the build, - // so we simply yield a warning and report NOTHING_DONE - messageCollector.report(WARNING, "Circular dependencies are not supported. " - + "The following JS modules depend on each other: " - + chunk.getModules().map { it.getName() }.joinToString(", ") - + ". " - + "Kotlin is not compiled for these modules", NO_LOCATION) - return NOTHING_DONE - } - - val sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget) - //List sourceFiles = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder); - - filesToCompile = MultiMap.emptyInstance() // won't be used - - if (sourceFiles.isEmpty()) { - return NOTHING_DONE - } - - val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) - - val outputFile = File(outputDir, representativeTarget.getModule().getName() + ".js") - val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) - val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) - - runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + val outputItemCollector = if (JpsUtils.isJsKotlinModule(representativeTarget)) { + compileToJs(chunk, commonArguments, environment, messageCollector, project) } else { - if (chunk.getModules().size() > 1) { - messageCollector.report(WARNING, "Circular dependencies are only partially supported. " - + "The following modules depend on each other: " - + chunk.getModules().map { it.getName() }.joinToString(", ") - + ". " - + "Kotlin will compile them, but some strange effect may happen", NO_LOCATION) - } + compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) + } - filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) - allCompiledFiles.addAll(filesToCompile.values()) - - val processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context) - - var haveRemovedFiles = false - for (target in chunk.getTargets()) { - if (!KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target).isEmpty()) { - if (processedTargetsWithRemoved.add(target)) { - haveRemovedFiles = true - } - } - } - - val moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile, haveRemovedFiles) - if (moduleFile == null) { - // No Kotlin sources found - return NOTHING_DONE - } - - val k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project) - - runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) - moduleFile.delete() + if (outputItemCollector == null) { + return NOTHING_DONE } // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below @@ -279,6 +226,92 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return OK } + // if null is returned, nothing was done + private fun compileToJs(chunk: ModuleChunk, + commonArguments: CommonCompilerArguments, + environment: CompilerEnvironment, + messageCollector: KotlinBuilder.MessageCollectorAdapter, + project: JpsProject + ): OutputItemsCollectorImpl? { + val outputItemCollector = OutputItemsCollectorImpl() + + val representativeTarget = chunk.representativeTarget() + if (chunk.getModules().size() > 1) { + // We do not support circular dependencies, but if they are present, we do our best should not break the build, + // so we simply yield a warning and report NOTHING_DONE + messageCollector.report(WARNING, "Circular dependencies are not supported. " + + "The following JS modules depend on each other: " + + chunk.getModules().map { it.getName() }.joinToString(", ") + + ". " + + "Kotlin is not compiled for these modules", NO_LOCATION) + return null + } + + val sourceFiles = KotlinSourceFileCollector.getAllKotlinSourceFiles(representativeTarget) + if (sourceFiles.isEmpty()) { + return null + } + + val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) + + val outputFile = File(outputDir, representativeTarget.getModule().getName() + ".js") + val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) + val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) + val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) + + runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + return outputItemCollector + } + + // if null is returned, nothing was done + private fun compileToJvm(allCompiledFiles: MutableSet, + chunk: ModuleChunk, + commonArguments: CommonCompilerArguments, + context: CompileContext, + dirtyFilesHolder: DirtyFilesHolder, + environment: CompilerEnvironment, + filesToCompile: MultiMap, + messageCollector: KotlinBuilder.MessageCollectorAdapter + ): OutputItemsCollectorImpl? { + val outputItemCollector = OutputItemsCollectorImpl() + + if (chunk.getModules().size() > 1) { + messageCollector.report(WARNING, "Circular dependencies are only partially supported. " + + "The following modules depend on each other: " + + chunk.getModules().map { it.getName() }.joinToString(", ") + + ". " + + "Kotlin will compile them, but some strange effect may happen", NO_LOCATION) + } + + allCompiledFiles.addAll(filesToCompile.values()) + + val processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context) + + var haveRemovedFiles = false + for (target in chunk.getTargets()) { + if (!KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target).isEmpty()) { + if (processedTargetsWithRemoved.add(target)) { + haveRemovedFiles = true + } + } + } + + val moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile, haveRemovedFiles) + if (moduleFile == null) { + // No Kotlin sources found + return null + } + + val project = context.getProjectDescriptor().getProject() + val k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project) + val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) + + runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) + moduleFile.delete() + + return outputItemCollector + } + public class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { From bb11e76528d1ddf31b814ccd4310ca1badb85f6f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 30 Oct 2014 21:46:37 +0300 Subject: [PATCH 0199/1557] Extracted functions which update incremental caches, etc Original commit: a840e4d122491ade3a5151470f30fb9aca9ff235 --- .../jetbrains/jet/jps/build/KotlinBuilder.kt | 149 +++++++++++------- 1 file changed, 94 insertions(+), 55 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index 2a95f84875b..d099bc9e4f6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -59,6 +59,7 @@ import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jet.compiler.CompilerSettings import org.jetbrains.jps.model.JpsProject import org.jetbrains.jet.compiler.runner.OutputItemsCollector +import org.jetbrains.jet.compiler.runner.SimpleOutputItem public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -147,63 +148,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return NOTHING_DONE } - // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below - val sourceToTarget = HashMap() - if (chunk.getTargets().size() > 1) { - for (target in chunk.getTargets()) { - for (file in KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { - sourceToTarget.put(file, target) - } - } - } - val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] + val outputsItemsAndTargets = getOutputItemsAndTargets(chunk, outputItemCollector) - for ((target, cache) in incrementalCaches) { - cache.clearCacheForRemovedFiles( - KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), - target.getOutputDir()!!, - !compilationErrors - ) - } - - var recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING - - for (outputItem in outputItemCollector.getOutputs()) { - var target: ModuleBuildTarget? = null - val sourceFiles = outputItem.getSourceFiles() - if (!sourceFiles.isEmpty()) { - target = sourceToTarget[sourceFiles.iterator().next()] - } - - if (target == null) { - target = representativeTarget - } - - val outputFile = outputItem.getOutputFile() - - if (IncrementalCompilation.ENABLED) { - val newDecision = incrementalCaches[target]!!.saveFileToCache(sourceFiles, outputFile) - recompilationDecision = recompilationDecision.merge(newDecision) - } - - outputConsumer.registerOutputFile(target, outputFile, sourceFiles.map { it.getPath() }) - } - - val delta = context.getProjectDescriptor().dataManager.getMappings()!!.createDelta() - val callback = delta!!.getCallback()!! - - for (outputItem in outputItemCollector.getOutputs()) { - val outputFile = outputItem.getOutputFile() - callback.associate(FileUtil.toSystemIndependentName(outputFile.getAbsolutePath()), - outputItem.getSourceFiles().map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, - ClassReader(outputFile.readBytes()) - ) - } - - val allCompiled = filesToCompile.values() - val compiledInThisRound = if (compilationErrors) listOf() else allCompiled - JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound) + var recompilationDecision = updateKotlinIncrementalCache(compilationErrors, dirtyFilesHolder, incrementalCaches, outputsItemsAndTargets) + registerOutputItems(outputConsumer, outputsItemsAndTargets) + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, outputsItemsAndTargets) if (compilationErrors) { return ABORT @@ -226,6 +176,95 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return OK } + private fun getOutputItemsAndTargets( + chunk: ModuleChunk, + outputItemCollector: OutputItemsCollectorImpl + ): List> { + // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below + val sourceToTarget = HashMap() + if (chunk.getTargets().size() > 1) { + for (target in chunk.getTargets()) { + for (file in KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { + sourceToTarget.put(file, target) + } + } + } + + val result = ArrayList>() + + val representativeTarget = chunk.representativeTarget() + for (outputItem in outputItemCollector.getOutputs()) { + var target: ModuleBuildTarget? = null + val sourceFiles = outputItem.getSourceFiles() + if (!sourceFiles.isEmpty()) { + target = sourceToTarget[sourceFiles.iterator().next()] + } + + if (target == null) { + target = representativeTarget + } + + result.add(Pair(outputItem, target!!)) + } + return result + } + + private fun updateJavaMappings( + chunk: ModuleChunk, + compilationErrors: Boolean, + context: CompileContext, + dirtyFilesHolder: DirtyFilesHolder, + filesToCompile: MultiMap, + outputsItemsAndTargets: List> + ) { + val delta = context.getProjectDescriptor().dataManager.getMappings()!!.createDelta() + val callback = delta!!.getCallback()!! + + for ((outputItem, _) in outputsItemsAndTargets) { + val outputFile = outputItem.getOutputFile() + callback.associate(FileUtil.toSystemIndependentName(outputFile.getAbsolutePath()), + outputItem.getSourceFiles().map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, + ClassReader(outputFile.readBytes()) + ) + } + + val allCompiled = filesToCompile.values() + val compiledInThisRound = if (compilationErrors) listOf() else allCompiled + JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound) + } + + private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, outputsItemsAndTargets: List>) { + for ((outputItem, target) in outputsItemsAndTargets) { + outputConsumer.registerOutputFile(target, outputItem.getOutputFile(), outputItem.getSourceFiles().map { it.getPath() }) + } + } + + private fun updateKotlinIncrementalCache( + compilationErrors: Boolean, + dirtyFilesHolder: DirtyFilesHolder, + incrementalCaches: Map, + outputsItemsAndTargets: List> + ): IncrementalCacheImpl.RecompilationDecision { + if (!IncrementalCompilation.ENABLED) { + return IncrementalCacheImpl.RecompilationDecision.DO_NOTHING + } + + for ((target, cache) in incrementalCaches) { + cache.clearCacheForRemovedFiles( + KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), + target.getOutputDir()!!, + !compilationErrors + ) + } + + var recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING + for ((outputItem, target) in outputsItemsAndTargets) { + val newDecision = incrementalCaches[target]!!.saveFileToCache(outputItem.getSourceFiles(), outputItem.getOutputFile()) + recompilationDecision = recompilationDecision.merge(newDecision) + } + return recompilationDecision + } + // if null is returned, nothing was done private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, From fcf4cf9e6b57c8852ab5dc41b51e083baa561e27 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 30 Oct 2014 21:53:34 +0300 Subject: [PATCH 0200/1557] Extracted function which creates compiler environment. Original commit: e51296b04743094aa3c00b6aa647246e92b412a5 --- .../jetbrains/jet/jps/build/KotlinBuilder.kt | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index d099bc9e4f6..d6a78dd0304 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -90,8 +90,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return NOTHING_DONE } - val representativeTarget = chunk.representativeTarget() - val dataManager = context.getProjectDescriptor().dataManager val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) } @@ -100,44 +98,27 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return CHUNK_REBUILD_REQUIRED } - // For non-incremental build: take all sources - if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()) { - return NOTHING_DONE - } - - if (!hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { + if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles() + || !hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { return NOTHING_DONE } messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION) - val compilerServices = Services.Builder() - .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) - .build() - - val environment = CompilerEnvironment.getEnvironmentFor( - PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), - javaClass.getClassLoader(), - { className -> - className!!.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") - || className == "org.jetbrains.jet.config.Services" - }, - compilerServices - ) - + val environment = createCompileEnvironment(incrementalCaches) if (!environment.success()) { environment.reportErrorsTo(messageCollector) return ABORT } - val project = representativeTarget.getModule().getProject()!! + val project = context.getProjectDescriptor().getProject() val commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project) commonArguments.verbose = true // Make compiler report source to output files mapping val allCompiledFiles = getAllCompiledFilesContainer(context) val filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) - val outputItemCollector = if (JpsUtils.isJsKotlinModule(representativeTarget)) { + val outputItemCollector = if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { compileToJs(chunk, commonArguments, environment, messageCollector, project) } else { @@ -176,6 +157,23 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return OK } + private fun createCompileEnvironment(incrementalCaches: Map): CompilerEnvironment { + val compilerServices = Services.Builder() + .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) + .build() + + val environment = CompilerEnvironment.getEnvironmentFor( + PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), + javaClass.getClassLoader(), + { className -> + className!!.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") + || className == "org.jetbrains.jet.config.Services" + }, + compilerServices + ) + return environment + } + private fun getOutputItemsAndTargets( chunk: ModuleChunk, outputItemCollector: OutputItemsCollectorImpl From ff77a3e3ab6d35d6262e98a06c1ef00ee37332fd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 31 Oct 2014 15:00:24 +0300 Subject: [PATCH 0201/1557] Updating Java mappings only for incremental mode. Avoiding executing this code on TeamCity, which fails on TeamCity 8.x Original commit: d72f31de614a86c4b8aaf1ad3287f3b97aa8343f --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index d6a78dd0304..783c697a3e8 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -215,6 +215,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR filesToCompile: MultiMap, outputsItemsAndTargets: List> ) { + if (!IncrementalCompilation.ENABLED) { + return + } + val delta = context.getProjectDescriptor().dataManager.getMappings()!!.createDelta() val callback = delta!!.getCallback()!! From 10933cd1540dd8c51ece51f53b9ba2bb1c24bd72 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 7 Nov 2014 14:47:19 +0300 Subject: [PATCH 0202/1557] Fixed test on Windows (slashes issue). Original commit: 878aac1acb6cc758b2ca542461d7125f191ead04 --- .../org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 60230b664b9..01bc25a9408 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -70,6 +70,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { .getMessages(BuildMessage.Kind.ERROR) .joinToString("\n") .replace(workDir.getAbsolutePath(), "\$PROJECT") + .replace(File.separatorChar, '/') return logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n" } else { From 5afcf7402453e32ed7f73c36356b461e6b13cc2e Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 7 Nov 2014 19:26:45 +0300 Subject: [PATCH 0203/1557] Minor: formatting Original commit: d80c98a8ba5a5c4dd44e1dd8c9e9f5a64160ad7f --- .../jetbrains/jet/jps/build/classFilesComparison.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index b7c8379b5ec..989a2b78e97 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -137,15 +137,16 @@ fun classFileToString(classFile: File): String { ByteArrayInputStream(BitEncoding.decodeBytes(annotationDataEncoded)).use { input -> - out.write("\n------ simpleNames proto -----\n${DebugProtoBuf.StringTable.parseDelimitedFrom(input)}") - out.write("\n------ qualifiedNames proto -----\n${DebugProtoBuf.QualifiedNameTable.parseDelimitedFrom(input)}") + out.write("\n------ simpleNames proto -----\n${DebugProtoBuf.StringTable.parseDelimitedFrom(input)}") + out.write("\n------ qualifiedNames proto -----\n${DebugProtoBuf.QualifiedNameTable.parseDelimitedFrom(input)}") - when (classHeader!!.kind) { - KotlinClassHeader.Kind.PACKAGE_FACADE -> - out.write("\n------ package proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") + when (classHeader!!.kind) { + KotlinClassHeader.Kind.PACKAGE_FACADE -> + out.write("\n------ package proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") KotlinClassHeader.Kind.CLASS -> out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") + else -> throw IllegalStateException() } } From 5ff297aed5ae0669acd0798ebb1e57927163f2c8 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 6 Nov 2014 19:03:48 +0300 Subject: [PATCH 0204/1557] Extract isCompatibleAbiVersion from kinds enum and store read kinds even for incompatible version Original commit: c242665cd3c73c130983e543b8f90ae4a9e86ba6 --- .../jet/jps/incremental/IncrementalCacheImpl.kt | 10 ++++++---- .../jetbrains/jet/jps/build/classFilesComparison.kt | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index ee69debef4f..3e449cf1bfa 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -42,6 +42,8 @@ import org.jetbrains.jps.builders.storage.StorageProvider import java.io.IOException import java.util.Scanner import org.jetbrains.jet.lang.resolve.java.JvmAbi +import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -106,11 +108,11 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC val annotationDataEncoded = header.annotationData if (annotationDataEncoded != null) { val data = BitEncoding.decodeBytes(annotationDataEncoded) - when (header.kind) { - KotlinClassHeader.Kind.PACKAGE_FACADE -> { + when { + header.isCompatiblePackageFacadeKind() -> { return if (protoMap.put(className, data)) COMPILE_OTHERS else DO_NOTHING } - KotlinClassHeader.Kind.CLASS -> { + header.isCompatibleClassKind() -> { val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) val protoChanged = protoMap.put(className, data) val constantsChanged = constantsMap.process(className, fileBytes) @@ -118,7 +120,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC return if (inlinesChanged) RECOMPILE_ALL else if (protoChanged || constantsChanged) COMPILE_OTHERS else DO_NOTHING } else -> { - throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}") + throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}, isCompatible: ${header.isCompatibleAbiVersion}") } } } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt index 989a2b78e97..baec706c9a8 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/classFilesComparison.kt @@ -36,6 +36,8 @@ import java.io.ByteArrayInputStream import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf import java.util.Arrays import org.jetbrains.jet.jps.incremental.LocalFileKotlinClass +import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind +import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind // Set this to true if you want to dump all bytecode (test will fail in this case) val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" @@ -140,11 +142,11 @@ fun classFileToString(classFile: File): String { out.write("\n------ simpleNames proto -----\n${DebugProtoBuf.StringTable.parseDelimitedFrom(input)}") out.write("\n------ qualifiedNames proto -----\n${DebugProtoBuf.QualifiedNameTable.parseDelimitedFrom(input)}") - when (classHeader!!.kind) { - KotlinClassHeader.Kind.PACKAGE_FACADE -> + when { + classHeader!!.isCompatiblePackageFacadeKind() -> out.write("\n------ package proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") - KotlinClassHeader.Kind.CLASS -> + classHeader.isCompatibleClassKind() -> out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") else -> throw IllegalStateException() From 2b5e3a5f9d10f40c12913833851718f52463deb6 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 11 Nov 2014 20:36:46 +0300 Subject: [PATCH 0205/1557] Fixed paths unification in tests on some Windows machines. Original commit: 868a8dbc84880b96b76f5d15ecb3afdafccd4c96 --- .../jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index 01bc25a9408..f0bac02f486 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -60,7 +60,8 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { get() = false fun buildGetLog(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): String { - val logger = MyLogger(FileUtil.toSystemIndependentName(workDir.getAbsolutePath())) + val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) + val logger = MyLogger(workDirPath) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) try { val buildResult = doBuild(descriptor, scope)!! @@ -69,8 +70,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { buildResult .getMessages(BuildMessage.Kind.ERROR) .joinToString("\n") - .replace(workDir.getAbsolutePath(), "\$PROJECT") .replace(File.separatorChar, '/') + .replace("/" + workDirPath, "\$PROJECT") // Sometimes path is rendered as "/C:/foo/bar" on Windows + .replace(workDirPath, "\$PROJECT") return logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n" } else { From d67423164ce1bd8603159feb421e8c2897789a20 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 11 Nov 2014 19:58:22 +0300 Subject: [PATCH 0206/1557] Fixed KNPE when inline functions/constants are completely removed. Original commit: 1a374efcd10d18d3d2bba1917d561599aaedd05a --- .../jet/jps/incremental/IncrementalCacheImpl.kt | 10 +++++++++- .../jet/jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../pureKotlin/constantRemoved/build.log | 7 +++++++ .../pureKotlin/constantRemoved/const.kt | 3 +++ .../pureKotlin/constantRemoved/const.kt.new | 3 +++ .../pureKotlin/inlineFunctionRemoved/build.log | 14 ++++++++++++++ .../pureKotlin/inlineFunctionRemoved/inline.kt | 6 ++++++ .../pureKotlin/inlineFunctionRemoved/inline.kt.new | 7 +++++++ 8 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt.new diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 3e449cf1bfa..1cd4b8eb3f4 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -280,7 +280,12 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC if (oldMap == constantsMap) { return false } - map.put(key, constantsMap) + if (constantsMap != null) { + map.put(key, constantsMap) + } + else { + map.remove(key) + } return true } } @@ -396,6 +401,9 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC if (inlineFunctionsMap != null) { map.put(key, inlineFunctionsMap) } + else { + map.remove(key) + } return true } } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 3c9dc6cc24a..657bdd96262 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -135,6 +135,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("constantRemoved") + public void testConstantRemoved() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); + doTest(fileName); + } + @TestMetadata("constantsUnchanged") public void testConstantsUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); @@ -171,6 +177,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineFunctionRemoved") + public void testInlineFunctionRemoved() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionsCircularDependency") public void testInlineFunctionsCircularDependency() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log new file mode 100644 index 00000000000..8cdfe7c6de1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage$const$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/const.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt new file mode 100644 index 00000000000..1572968f89f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt @@ -0,0 +1,3 @@ +package test + +val CONST = "foo" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new new file mode 100644 index 00000000000..c3a4d742273 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/const.kt.new @@ -0,0 +1,3 @@ +package test + +val CONST = "I'm not a constant anymore:" + System.currentTimeMillis() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log new file mode 100644 index 00000000000..3e5f9e4f172 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt.new new file mode 100644 index 00000000000..d2c5cd8c63f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/inline.kt.new @@ -0,0 +1,7 @@ +package inline + +fun f(body: () -> Unit) { + println("i'm not an inline function") + body() +} + From fdd04b08ecc4cd6316590bcb8573d27a57bc5e1c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 12 Nov 2014 15:10:23 +0300 Subject: [PATCH 0207/1557] Minor. Renamed property for disambiguation. Original commit: ab09ffa4a44a17457e68032b347dcdedec1279bf --- .../jps/incremental/IncrementalCacheImpl.kt | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 1cd4b8eb3f4..047cea49340 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -167,20 +167,20 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } private abstract class BasicMap { - protected var map: PersistentHashMap = createMap() + protected var storage: PersistentHashMap = createMap() protected abstract fun createMap(): PersistentHashMap public fun clean() { try { - map.close() + storage.close() } catch (ignored: IOException) { } - PersistentHashMap.deleteFilesStartingWith(map.getBaseFile()!!) + PersistentHashMap.deleteFilesStartingWith(storage.getBaseFile()!!) try { - map = createMap() + storage = createMap() } catch (ignored: IOException) { } @@ -188,17 +188,17 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC public fun flush(memoryCachesOnly: Boolean) { if (memoryCachesOnly) { - if (map.isDirty()) { - map.dropMemoryCaches() + if (storage.isDirty()) { + storage.dropMemoryCaches() } } else { - map.force() + storage.force() } } public fun close() { - map.close() + storage.close() } } @@ -208,7 +208,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC public fun clearOutdated(outDirectory: File) { val keysToRemove = HashSet() - map.processKeysWithExistingMapping { key -> + storage.processKeysWithExistingMapping { key -> val className = JvmClassName.byInternalName(key!!) val classFile = File(outDirectory, FileUtil.toSystemDependentName(className.getInternalName()) + ".class") if (!classFile.exists()) { @@ -219,7 +219,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } for (key in keysToRemove) { - map.remove(key) + storage.remove(key) } } } @@ -233,16 +233,16 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC public fun put(className: JvmClassName, data: ByteArray): Boolean { val key = className.getInternalName() - val oldData = map[key] + val oldData = storage[key] if (Arrays.equals(data, oldData)) { return false } - map.put(key, data) + storage.put(key, data) return true } public fun get(className: JvmClassName): ByteArray? { - return map[className.getInternalName()] + return storage[className.getInternalName()] } } @@ -276,15 +276,15 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC private fun put(className: JvmClassName, constantsMap: Map?): Boolean { val key = className.getInternalName() - val oldMap = map[key] + val oldMap = storage[key] if (oldMap == constantsMap) { return false } if (constantsMap != null) { - map.put(key, constantsMap) + storage.put(key, constantsMap) } else { - map.remove(key) + storage.remove(key) } return true } @@ -394,15 +394,15 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC private fun put(className: JvmClassName, inlineFunctionsMap: Map?): Boolean { val key = className.getInternalName() - val oldMap = map[key] + val oldMap = storage[key] if (oldMap == inlineFunctionsMap) { return false } if (inlineFunctionsMap != null) { - map.put(key, inlineFunctionsMap) + storage.put(key, inlineFunctionsMap) } else { - map.remove(key) + storage.remove(key) } return true } @@ -443,20 +443,20 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC ) public fun putPackagePartSourceData(sourceFile: File, className: JvmClassName) { - map.put(sourceFile.getAbsolutePath(), className.getInternalName()) + storage.put(sourceFile.getAbsolutePath(), className.getInternalName()) } public fun remove(sourceFile: File) { - map.remove(sourceFile.getAbsolutePath()) + storage.remove(sourceFile.getAbsolutePath()) } public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { val result = HashSet() - map.processKeysWithExistingMapping { key -> + storage.processKeysWithExistingMapping { key -> val sourceFile = File(key!!) - val packagePartClassName = map[key]!! + val packagePartClassName = storage[key]!! if (!sourceFile.exists()) { result.add(packagePartClassName) } @@ -477,8 +477,8 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC public fun getPackages(): Set { val result = HashSet() - map.processKeysWithExistingMapping { key -> - val packagePartClassName = map[key!!]!! + storage.processKeysWithExistingMapping { key -> + val packagePartClassName = storage[key!!]!! val packageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() From 209a96d74f0c5c731bb3d80252db7f58e9138d8c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 12 Nov 2014 17:56:48 +0300 Subject: [PATCH 0208/1557] Updating Kotlin incremental caches and Java mappings only for Java modules. Original commit: 6bf0c9f4ae1890532c9ef3c4e7a50bb7af23d1e7 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index 783c697a3e8..860211c60d6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -132,9 +132,16 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] val outputsItemsAndTargets = getOutputItemsAndTargets(chunk, outputItemCollector) - var recompilationDecision = updateKotlinIncrementalCache(compilationErrors, dirtyFilesHolder, incrementalCaches, outputsItemsAndTargets) registerOutputItems(outputConsumer, outputsItemsAndTargets) - updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, outputsItemsAndTargets) + + val recompilationDecision: IncrementalCacheImpl.RecompilationDecision + if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { + recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING + } + else { + recompilationDecision = updateKotlinIncrementalCache(compilationErrors, dirtyFilesHolder, incrementalCaches, outputsItemsAndTargets) + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, outputsItemsAndTargets) + } if (compilationErrors) { return ABORT From 23d44bb45e36a3d02c2a9bd75414da124953188c Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 14 Nov 2014 15:52:21 +0100 Subject: [PATCH 0209/1557] plugin description must be wrapped into CDATA if html used Original commit: 074ac2a2e277b289ba3d13922d64a0d91d24dbf4 --- jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml index 8722daba9d2..38797001f0b 100644 --- a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml +++ b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml @@ -2,12 +2,12 @@ org.jetbrains.kotlin.bare Kotlin Bare Compiler for IntelliJ IDEA - + - This plugin is only capable of compiling Kotlin code. All highlighting, inspections, refactorings are disabled. + This plugin is only capable of compiling Kotlin code. All highlighting, inspections, refactorings are disabled.]]> @snapshot@ JetBrains Inc. From e41e37932a37b074b22b62481365b3342d5cec63 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 24 Sep 2014 18:35:51 +0400 Subject: [PATCH 0210/1557] Generate static backing fields for properties in object #KT-4973 Fixed Original commit: 5412a67d2991b2849c76fe7bd829c7074ed1b8f5 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 6 +++--- .../pureKotlin/objectConstantChanged/build.log | 14 ++++++++++++++ .../pureKotlin/objectConstantChanged/const.kt | 5 +++++ .../pureKotlin/objectConstantChanged/const.kt.new | 5 +++++ .../pureKotlin/objectConstantChanged/usage.kt | 4 ++++ .../pureKotlin/objectValChanged/build.log | 6 ------ .../pureKotlin/objectValChanged/const.kt | 6 ------ .../pureKotlin/objectValChanged/const.kt.new | 6 ------ .../pureKotlin/objectValChanged/usage.kt | 5 ----- 9 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 657bdd96262..44089d4fe3b 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -201,9 +201,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("objectValChanged") - public void testObjectValChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectValChanged/"); + @TestMetadata("objectConstantChanged") + public void testObjectConstantChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/"); doTest(fileName); } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log new file mode 100644 index 00000000000..14b397d0268 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/Object.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/test/Object.class +out/production/module/test/Usage.class +End of files +Compiling files: +src/const.kt +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt new file mode 100644 index 00000000000..13a01eb1ac1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt @@ -0,0 +1,5 @@ +package test + +object Object { + val CONST = "old" +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new new file mode 100644 index 00000000000..d604ca1244f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new @@ -0,0 +1,5 @@ +package test + +object Object { + val CONST = "new" +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt new file mode 100644 index 00000000000..50ae79cf3fb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated(Object.CONST + Object.CONST) +class Usage \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log deleted file mode 100644 index 06bb7395a25..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log +++ /dev/null @@ -1,6 +0,0 @@ -Cleaning output files: -out/production/module/test/Object.class -End of files -Compiling files: -src/const.kt -End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt deleted file mode 100644 index 3f27946befb..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -object Object { - // Value is changed, but we don't care, it is not compile-time constant, and therefore can't be inlined - val CONST = "old" -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new deleted file mode 100644 index 19580fc7c09..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package test - -object Object { - // Value is changed, but we don't care, it is not compile-time constant, and therefore can't be inlined - val CONST = "new" -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt deleted file mode 100644 index 581511cf244..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -fun main(args: Array) { - val x = Object.CONST + Object.CONST -} \ No newline at end of file From e491783e86fd5d9354392fbd7684710e32548fe9 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 19 Nov 2014 16:22:39 +0300 Subject: [PATCH 0211/1557] Fixed case of file name. Original commit: adcd4d4ca0e2db2a124c22ad7a5037e9ba9c7898 --- .../testData/incremental/pureKotlin/classRecreated/{a.kt => A.kt} | 0 .../pureKotlin/classRecreated/{a.kt.delete.1 => A.kt.delete.1} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/{a.kt => A.kt} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/{a.kt.delete.1 => A.kt.delete.1} (100%) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/a.kt rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/a.kt.delete.1 rename to jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/A.kt.delete.1 From 7c0dde0233274b1d0c2f7721f9d5f394f18f5d45 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 12 Nov 2014 18:07:31 +0300 Subject: [PATCH 0212/1557] Moved test data into common directory. Original commit: 19ad2406ff1e566d97a781934721c099b8959a5f --- .../jps/build/IncrementalJpsTestGenerated.java | 16 ++++++++-------- .../build.log | 0 .../dependencies.txt | 0 .../module1_a.kt | 0 .../module2_b.kt | 0 .../module2_b.kt.new | 0 6 files changed, 8 insertions(+), 8 deletions(-) rename jps/jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/build.log (100%) rename jps/jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/dependencies.txt (100%) rename jps/jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/module1_a.kt (100%) rename jps/jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/module2_b.kt (100%) rename jps/jps-plugin/testData/incremental/{circularDependency/simple => multiModule/circularDependencyTopLevelFunctions}/module2_b.kt.new (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 44089d4fe3b..da301120372 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -28,21 +28,21 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({IncrementalJpsTestGenerated.CircularDependency.class, IncrementalJpsTestGenerated.PureKotlin.class, IncrementalJpsTestGenerated.WithJava.class}) +@InnerTestClasses({IncrementalJpsTestGenerated.MultiModule.class, IncrementalJpsTestGenerated.PureKotlin.class, IncrementalJpsTestGenerated.WithJava.class}) @RunWith(JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { - @TestMetadata("jps-plugin/testData/incremental/circularDependency") + @TestMetadata("jps-plugin/testData/incremental/multiModule") @TestDataPath("$PROJECT_ROOT") @InnerTestClasses({}) @RunWith(JUnit3RunnerWithInners.class) - public static class CircularDependency extends AbstractIncrementalJpsTest { - public void testAllFilesPresentInCircularDependency() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/circularDependency"), Pattern.compile("^([^\\.]+)$"), true); + public static class MultiModule extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInMultiModule() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); } - @TestMetadata("simple") - public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/circularDependency/simple/"); + @TestMetadata("circularDependencyTopLevelFunctions") + public void testCircularDependencyTopLevelFunctions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); doTest(fileName); } diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/circularDependency/simple/build.log rename to jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/dependencies.txt similarity index 100% rename from jps/jps-plugin/testData/incremental/circularDependency/simple/dependencies.txt rename to jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/dependencies.txt diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module1_a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/circularDependency/simple/module1_a.kt rename to jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module1_a.kt diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt rename to jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt.new b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/circularDependency/simple/module2_b.kt.new rename to jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/module2_b.kt.new From eb8820f549f274cebc9588129611e8f36b2b7c1b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 26 Nov 2014 18:42:24 +0300 Subject: [PATCH 0213/1557] Compilation errors are rendered to log without "Kotlin:ERROR:" prefix and without path to file. Sometimes javac adds path to file, sometimes doesn't. This had led tests to fail on some platforms. Original commit: 9c880de7358848264d836bd8074268d191ac5c1d --- .../jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 5 ++--- .../incremental/pureKotlin/classRedeclaration/build.log | 4 ++-- .../compilationErrorThenFixedOtherPackage/build.log | 4 ++-- .../compilationErrorThenFixedSamePackage/build.log | 4 ++-- .../pureKotlin/conflictingPlatformDeclarations/build.log | 4 ++-- .../incremental/pureKotlin/funRedeclaration/build.log | 2 +- .../pureKotlin/propertyRedeclaration/build.log | 2 +- .../javaUsedInKotlin/methodAddedInSuper/build.log | 4 ++-- .../withJava/javaUsedInKotlin/methodRenamed/build.log | 2 +- .../javaUsedInKotlin/samConversions/methodAdded/build.log | 8 ++++---- .../withJava/kotlinUsedInJava/funRenamed/build.log | 2 +- .../kotlinUsedInJava/methodAddedInSuper/build.log | 2 +- .../withJava/kotlinUsedInJava/propertyRenamed/build.log | 4 ++-- 13 files changed, 23 insertions(+), 24 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index f0bac02f486..e3d5cce8c0a 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -69,10 +69,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val errorMessages = buildResult .getMessages(BuildMessage.Kind.ERROR) + .map { it.getMessageText() } + .map { it.replaceAll("^[^:]+:\\d+:\\s+", "") } .joinToString("\n") - .replace(File.separatorChar, '/') - .replace("/" + workDirPath, "\$PROJECT") // Sometimes path is rendered as "/C:/foo/bar" on Windows - .replace(workDirPath, "\$PROJECT") return logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n" } else { diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log index bfc18950439..50b3c2435b7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log @@ -9,5 +9,5 @@ src/class1.kt src/class2.kt End of files COMPILATION FAILED -Kotlin:ERROR:Redeclaration: Klass -Kotlin:ERROR:Redeclaration: Klass \ No newline at end of file +Redeclaration: Klass +Redeclaration: Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index 85f35fb29cb..1e9444f5d38 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -6,7 +6,7 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Kotlin:ERROR:Expecting an expression +Expecting an expression Cleaning output files: @@ -15,4 +15,4 @@ End of files Compiling files: src/fun.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 872cccb99f3..65aedde795b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -6,9 +6,9 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Kotlin:ERROR:Expecting an expression +Expecting an expression Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index c7c84ffc8d8..da0ddacad97 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -6,6 +6,6 @@ Compiling files: src/fun2.kt End of files COMPILATION FAILED -Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): +Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): fun function(list: kotlin.List): kotlin.Unit - fun function(list: kotlin.List): kotlin.Unit + fun function(list: kotlin.List): kotlin.Unit \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index f9713085579..64909e968ed 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -6,6 +6,6 @@ Compiling files: src/fun2.kt End of files COMPILATION FAILED -Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (function()V): +Platform declaration clash: The following declarations have the same JVM signature (function()V): fun function(): kotlin.Unit fun function(): kotlin.Unit \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 15793b4067f..b605f561a83 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -6,6 +6,6 @@ Compiling files: src/prop2.kt End of files COMPILATION FAILED -Kotlin:ERROR:Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): +Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): fun (): kotlin.Int fun (): kotlin.Int \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log index a44ae0a4d8c..6f16bf547fb 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log @@ -11,5 +11,5 @@ Compiling files: src/Sub.kt End of files COMPILATION FAILED -Kotlin:ERROR:Cannot weaken access privilege 'public' for 'y' in 'Super' -Kotlin:ERROR:'y' hides member of supertype 'Super' and needs 'override' modifier \ No newline at end of file +Cannot weaken access privilege 'public' for 'y' in 'Super' +'y' hides member of supertype 'Super' and needs 'override' modifier \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index 7dcafae29b6..ab1f7d8e3de 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -15,4 +15,4 @@ src/willBeResolvedToOther.kt src/willBeUnresolved.kt End of files COMPILATION FAILED -Kotlin:ERROR:Unresolved reference: f +Unresolved reference: f \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index e31f0b60e64..0a8d4fef107 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -17,7 +17,7 @@ src/usageWithFunctionExpression.kt src/usageWithFunctionLiteral.kt End of files COMPILATION FAILED -Kotlin:ERROR:Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Kotlin:ERROR:Please specify constructor invocation; classifier 'SamInterface' does not have a class object -Kotlin:ERROR:Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Kotlin:ERROR:Please specify constructor invocation; classifier 'SamInterface' does not have a class object +Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found +Please specify constructor invocation; classifier 'SamInterface' does not have a class object +Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found +Please specify constructor invocation; classifier 'SamInterface' does not have a class object \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 0c78e0c1820..63f1f972e93 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -9,6 +9,6 @@ Compiling files: src/WillBeUnresolved.java End of files COMPILATION FAILED -java:ERROR:$PROJECT/src/WillBeUnresolved.java:3: cannot find symbol +cannot find symbol symbol : method f(java.lang.String) location: class test.TestPackage \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log index 739009bbe79..af4ae9aa96e 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -8,4 +8,4 @@ Compiling files: src/Sub.java End of files COMPILATION FAILED -java:ERROR:$PROJECT/src/Sub.java:2: y() in Sub cannot override y() in Super; overridden method is final \ No newline at end of file +y() in Sub cannot override y() in Super; overridden method is final \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 59f1f29a253..e0214e9fc16 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -9,6 +9,6 @@ Compiling files: src/WillBeUnresolved.java End of files COMPILATION FAILED -java:ERROR:$PROJECT/src/WillBeUnresolved.java:3: cannot find symbol +cannot find symbol symbol : method getProp() -location: class test.TestPackage +location: class test.TestPackage \ No newline at end of file From fb3dbd6b7ed6c25335e4e0c5228b3e2459a08cbb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 27 Nov 2014 12:22:15 +0300 Subject: [PATCH 0214/1557] Updated regexp for Windows. Hope it fixes test on buildserver... Original commit: 428109e8c4007e4ca035ab5fa40ba8c8198b6ba2 --- .../org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt index e3d5cce8c0a..0d2fba0f0cc 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractIncrementalJpsTest.kt @@ -70,7 +70,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { buildResult .getMessages(BuildMessage.Kind.ERROR) .map { it.getMessageText() } - .map { it.replaceAll("^[^:]+:\\d+:\\s+", "") } + .map { it.replaceAll("^.+:\\d+:\\s+", "").trim() } .joinToString("\n") return logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n" } From ff351925064b5d6d0873745235459f9c68bb3212 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 26 Nov 2014 16:37:41 +0300 Subject: [PATCH 0215/1557] Removed reflection-based hack for IDEA 12. Original commit: 7c1bc432db08ceb689fa8323dea9dc720befdaf1 --- .../org/jetbrains/jet/jps/build/KotlinBuilder.kt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index 860211c60d6..b5ae442a302 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -85,7 +85,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val messageCollector = MessageCollectorAdapter(context) // Workaround for Android Studio - if (!isJavaPluginEnabled(context)) { + if (!JavaBuilder.IS_ENABLED[context, true]) { messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION) return NOTHING_DONE } @@ -430,16 +430,3 @@ private fun hasKotlinDirtyOrRemovedFiles( return chunk.getTargets().any { !KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isEmpty() } } - -private fun isJavaPluginEnabled(context: CompileContext): Boolean { - try { - // Using reflection for backward compatibility with IDEA 12 - val javaPluginIsEnabledField = javaClass().getDeclaredField("IS_ENABLED") - return if (Modifier.isPublic(javaPluginIsEnabledField.getModifiers())) JavaBuilder.IS_ENABLED[context, true] else true - } - catch (e: NoSuchFieldException) { - throw IllegalArgumentException("Cannot check if Java Jps Plugin is enabled", e) - } - -} - From 3163e7406ebed64a98527a6eb438e055804e252d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 26 Nov 2014 16:38:31 +0300 Subject: [PATCH 0216/1557] Disabling Kotlin builder on Android Studio only for Java. Original commit: bf150c8dde5ad012b34f4c592eda33249aa165a9 --- jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index b5ae442a302..f396d4524e1 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -85,7 +85,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val messageCollector = MessageCollectorAdapter(context) // Workaround for Android Studio - if (!JavaBuilder.IS_ENABLED[context, true]) { + if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget()) && !JavaBuilder.IS_ENABLED[context, true]) { messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION) return NOTHING_DONE } From 2d0b81f97f431eb713260f4f705e3d2bcfc2c5b9 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 24 Nov 2014 20:47:06 +0300 Subject: [PATCH 0217/1557] Updated test data for tests according to change in JPS. These tests were not deterministic. Now they are. When package facade's sources change (files added to package, etc), all package gets recompiled now. Behavior is tolerable, but not very desirable. Original commit: 153272a1893301154b159730ef708a6497320f51 --- .../pureKotlin/filesExchangePackages/build.log | 7 ++++++- .../pureKotlin/multiplePackagesModified/build.log | 11 +++++++++++ .../incremental/pureKotlin/packageFileAdded/build.log | 11 +++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index a135c67f323..5918267bba1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -9,9 +9,14 @@ src/b.kt src/c.kt End of files Cleaning output files: +out/production/module/bar/BarPackage$b$*.class +out/production/module/bar/BarPackage.class out/production/module/foo/FooPackage$a$*.class +out/production/module/foo/FooPackage$c$*.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt -End of files +src/b.kt +src/c.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 440fbd4f235..c3ec263353b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -7,11 +7,22 @@ src/a2.kt End of files Cleaning output files: out/production/module/a/APackage$a1$*.class +out/production/module/a/APackage$a2$*.class out/production/module/a/APackage.class out/production/module/b/BPackage$b1$*.class out/production/module/b/BPackage.class End of files Compiling files: src/a1.kt +src/a2.kt src/b1.kt End of files +Cleaning output files: +out/production/module/a/APackage$a1$*.class +out/production/module/a/APackage$a2$*.class +out/production/module/a/APackage.class +End of files +Compiling files: +src/a1.kt +src/a2.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index df1bd14d31c..04d72291c96 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -3,8 +3,19 @@ src/b.kt End of files Cleaning output files: out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt +src/b.kt End of files +Cleaning output files: +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +src/b.kt +End of files \ No newline at end of file From 6e9dab923cfb3f2d3a479bddec1e9161f9ee1ed8 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 9 Dec 2014 16:26:10 +0300 Subject: [PATCH 0218/1557] KT-6409 Do not create empty PersistentHashMap instances for modules without kotlin files during build #KT-6409 fixed Original commit: d126a9711c1eecd1d6ca47b60a79455bbb005472 --- .../jet/jps/incremental/IncrementalCacheImpl.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 047cea49340..2de26c8d59a 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -44,6 +44,7 @@ import java.util.Scanner import org.jetbrains.jet.lang.resolve.java.JvmAbi import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind +import kotlin.properties.Delegates val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -63,10 +64,10 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC val FORMAT_VERSION_TXT = "format-version.txt" } - private val protoMap = ProtoMap() - private val constantsMap = ConstantsMap() - private val inlineFunctionsMap = InlineFunctionsMap() - private val packagePartMap = PackagePartMap() + private val protoMap by Delegates.lazy { ProtoMap() } + private val constantsMap by Delegates.lazy { ConstantsMap() } + private val inlineFunctionsMap by Delegates.lazy { InlineFunctionsMap() } + private val packagePartMap by Delegates.lazy { PackagePartMap() } private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) From c2f4ed810c6cf4c6bce07d49ed33fc2c99e32a68 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 9 Dec 2014 19:36:41 +0300 Subject: [PATCH 0219/1557] Fixed incremental compilation, when removing all callables from file. Original commit: 4e702e34f0d225309d27281f2fb7b16c12430a4b --- .../jps/incremental/IncrementalCacheImpl.kt | 11 +++++----- .../build/IncrementalJpsTestGenerated.java | 6 ++++++ .../Usage.java | 5 +++++ .../onlyTopLevelFunctionInFileRemoved/a.kt | 4 ++++ .../onlyTopLevelFunctionInFileRemoved/b.kt | 4 ++++ .../b.kt.new | 2 ++ .../build.log | 21 +++++++++++++++++++ 7 files changed, 48 insertions(+), 5 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 2de26c8d59a..2215ebfad89 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -146,7 +146,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } } - public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map): Collection { + public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map): Collection { return packagePartMap.getRemovedPackageParts(sourceFilesToCompileAndFqNames) } @@ -451,7 +451,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC storage.remove(sourceFile.getAbsolutePath()) } - public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { + public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { val result = HashSet() storage.processKeysWithExistingMapping { key -> @@ -463,9 +463,10 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } else { val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() - val currentPackageFqName = compiledSourceFilesToFqName[sourceFile] - if (currentPackageFqName != null && currentPackageFqName != previousPackageFqName.asString()) { - result.add(packagePartClassName) + if (sourceFile in compiledSourceFilesToFqName) { + if (compiledSourceFilesToFqName[sourceFile] != previousPackageFqName.asString()) { + result.add(packagePartClassName) + } } } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index da301120372..c3ad4afd5b4 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -493,6 +493,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("onlyTopLevelFunctionInFileRemoved") + public void testOnlyTopLevelFunctionInFileRemoved() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/"); + doTest(fileName); + } + @TestMetadata("propertyRenamed") public void testPropertyRenamed() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java new file mode 100644 index 00000000000..d1dcba0d6fa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java @@ -0,0 +1,5 @@ +class Usage { + void usage() { + test.TestPackage.a(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt new file mode 100644 index 00000000000..eeaf99f195c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt @@ -0,0 +1,4 @@ +package test + +fun a() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt new file mode 100644 index 00000000000..783ac74aae8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt @@ -0,0 +1,4 @@ +package test + +fun b() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new new file mode 100644 index 00000000000..a6bea40cf77 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new @@ -0,0 +1,2 @@ +package test + diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log new file mode 100644 index 00000000000..f4c46b3facf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -0,0 +1,21 @@ +Cleaning output files: +out/production/module/test/TestPackage$b$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/b.kt +End of files +Compiling files: +src/Usage.java +End of files +Cleaning output files: +out/production/module/Usage.class +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files +Compiling files: +src/Usage.java +End of files \ No newline at end of file From ff87c722748025fc052bd7dc8a9dad0677fb1c7d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 10 Dec 2014 15:27:19 +0300 Subject: [PATCH 0220/1557] Minor. Computing package FQ later. Original commit: fbb4ed181a394a231aecd91551569a6ec87c259b --- .../org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 2215ebfad89..9220430c45c 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -462,8 +462,8 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC result.add(packagePartClassName) } else { - val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() if (sourceFile in compiledSourceFilesToFqName) { + val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() if (compiledSourceFilesToFqName[sourceFile] != previousPackageFqName.asString()) { result.add(packagePartClassName) } From e6356c239bbde3e329bc70f02d1e76e08b3dcaee Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 24 Oct 2014 12:47:11 +0400 Subject: [PATCH 0221/1557] JS backend: JpsJsModuleUtils: remove filtering for Kotlin Javascript libraries Original commit: f5d957445ffd86edbd5509932c18a58760bcf8ee --- .../src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java index 90032353e32..f03b8fb9430 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java @@ -18,7 +18,6 @@ package org.jetbrains.jet.jps.build; import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.LibraryUtils; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.model.java.JavaSourceRootType; import org.jetbrains.jps.model.java.JpsJavaModuleType; @@ -29,7 +28,6 @@ import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import org.jetbrains.jps.util.JpsPathUtil; -import java.io.File; import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -49,11 +47,7 @@ class JpsJsModuleUtils { Set libraries = JpsUtils.getAllDependencies(target).getLibraries(); for (JpsLibrary library : libraries) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { - String path = JpsPathUtil.urlToPath(root.getUrl()); - // TODO: Do we need to add to dependency all libraries? - if (LibraryUtils.isJsRuntimeLibrary(new File(path))) { - result.add(path); - } + result.add(JpsPathUtil.urlToPath(root.getUrl())); } } } From c7aec3c466d305e4df53b0ad9133e1db9ed2325b Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 24 Oct 2014 12:52:27 +0400 Subject: [PATCH 0222/1557] JS backend: isJsRuntimeLibrary -> isKotlinJavascriptStdLibrary Original commit: 83ec20508af556c3bcaa5a81f05b2a36aefc78b9 --- jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java index 81b980b07df..6b46cf685c9 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java @@ -42,7 +42,7 @@ class JpsUtils { Set libraries = getAllDependencies(target).getLibraries(); for (JpsLibrary library : libraries) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { - if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(root.getUrl()))) + if (LibraryUtils.isKotlinJavascriptStdLibrary(JpsPathUtil.urlToFile(root.getUrl()))) return true; } } From 0a052c623469f9a98c9139d3c3e800c7c30a0a71 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 20 Nov 2014 16:15:28 +0300 Subject: [PATCH 0223/1557] JS backend: add option 'output library runtime fiies' for Kotlin Compiler Original commit: 73db22ae20d9d4563a057b0154bbb1905658a8cb --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index f396d4524e1..b4ddb05d95b 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -60,6 +60,7 @@ import org.jetbrains.jet.compiler.CompilerSettings import org.jetbrains.jps.model.JpsProject import org.jetbrains.jet.compiler.runner.OutputItemsCollector import org.jetbrains.jet.compiler.runner.SimpleOutputItem +import org.jetbrains.jet.utils.LibraryUtils public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -308,6 +309,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + if (compilerSettings.copyJsLibraryFiles) { + val outputLibraryRuntimeDirectory = File(outputDir, compilerSettings.outputDirectoryForJsLibraryFiles).getAbsolutePath() + val libraryFilesToCopy = arrayListOf() + JpsJsModuleUtils.getLibraryFiles(representativeTarget, libraryFilesToCopy) + LibraryUtils.copyJsFilesFromLibraries(libraryFilesToCopy, outputLibraryRuntimeDirectory) + } return outputItemCollector } From a275c81c1e1638e05e6d991689d7305f6659e255 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 8 Dec 2014 19:03:55 +0300 Subject: [PATCH 0224/1557] add tests for jps-plugin (Kotlin Javascript projects) Original commit: bd090d0e5f44c1596957aabf5e0c3b42e5c3307c --- .../build/AbstractKotlinJpsBuildTestCase.java | 25 +++- .../jet/jps/build/KotlinJpsBuildTest.java | 140 +++++++++++++++++- .../KotlinJavaScriptProject/kotlinProject.iml | 12 ++ .../KotlinJavaScriptProject/kotlinProject.ipr | 14 ++ .../KotlinJavaScriptProject/src/test1.kt | 3 + .../jslib-example/LibraryExample.kt | 8 + .../jslib-example/META-INF-ex/file2.js | 1 + .../jslib-example/META-INF/MANIFEST.MF | 9 ++ .../jslib-example/META-INF/ignored0.js | 1 + .../META-INF/ignoredDir/ignored1.js | 1 + .../META-INF/resources-ex/file4.js | 1 + .../jslib-example/META-INF/resources/res0.js | 1 + .../META-INF/resources/resdir/res1.js | 1 + .../jslib-example/ReadMe.md | 6 + .../jslib-example/dir/file1.js | 1 + .../jslib-example/file0.js | 1 + .../jslib-example/jslib-example.js | 37 +++++ .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 14 ++ .../src/test1.kt | 7 + .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 14 ++ .../src/test1.kt | 3 + .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 14 ++ .../src/test1.kt | 7 + .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 18 +++ .../src/test1.kt | 7 + .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 17 +++ .../src/test1.kt | 7 + 32 files changed, 422 insertions(+), 8 deletions(-) create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProject/src/test1.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/LibraryExample.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF-ex/file2.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignored0.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignoredDir/ignored1.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources-ex/file4.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/res0.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/resdir/res1.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/dir/file1.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/file0.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/src/test1.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/src/test1.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/src/test1.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/src/test1.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/src/test1.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index 33709bc39dc..2cbd42c48ed 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -81,14 +81,33 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { return addKotlinRuntimeDependency(myProject); } + protected JpsLibrary addKotlinJavaScriptStdlibDependency() { + return addKotlinJavaScriptStdlibDependency(myProject); + } + + protected JpsLibrary addKotlinJavaScriptDependency(String libraryName, File libraryFile) { + return addDependency(JpsJavaDependencyScope.COMPILE, myProject.getModules(), false, libraryName, libraryFile); + } + static JpsLibrary addKotlinRuntimeDependency(@NotNull JpsProject project) { return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); } + static JpsLibrary addKotlinJavaScriptStdlibDependency(@NotNull JpsProject project) { + return addKotlinJavaScriptStdlibDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); + } + protected static JpsLibrary addKotlinRuntimeDependency(JpsJavaDependencyScope type, Collection modules, boolean exported) { - JpsLibrary library = modules.iterator().next().getProject().addLibrary("kotlin-runtime", JpsJavaLibraryType.INSTANCE); - File runtime = PathUtil.getKotlinPathsForDistDirectory().getRuntimePath(); - library.addRoot(runtime, JpsOrderRootType.COMPILED); + return addDependency(type, modules, exported, "kotlin-runtime", PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()); + } + + protected static JpsLibrary addKotlinJavaScriptStdlibDependency(JpsJavaDependencyScope type, Collection modules, boolean exported) { + return addDependency(type, modules, exported, "KotlinJavaScript", PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()); + } + + protected static JpsLibrary addDependency(JpsJavaDependencyScope type, Collection modules, boolean exported, String libraryName, File file) { + JpsLibrary library = modules.iterator().next().getProject().addLibrary(libraryName, JpsJavaLibraryType.INSTANCE); + library.addRoot(file, JpsOrderRootType.COMPILED); for (JpsModule module : modules) { JpsModuleRootModificationUtil.addDependency(module, library, type, exported); } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 9a96e7ca41e..70197816a83 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -20,13 +20,14 @@ import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.io.ZipUtil; +import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.AsmUtil; -import org.jetbrains.jet.compiler.CompilerSettings; -import org.jetbrains.jet.jps.JpsKotlinCompilerSettings; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaExtensionService; @@ -38,9 +39,12 @@ import org.jetbrains.org.objectweb.asm.MethodVisitor; import org.jetbrains.org.objectweb.asm.Opcodes; import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; +import java.util.regex.Pattern; +import java.util.zip.ZipOutputStream; public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final String PROJECT_NAME = "kotlinProject"; @@ -48,7 +52,31 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final String[] EXCLUDE_FILES = { "Excluded.class", "YetAnotherExcluded.class" }; private static final String[] NOTHING = {}; - + private static final String KOTLIN_JS_LIBRARY = "jslib-example"; + private static final String PATH_TO_KOTLIN_JS_LIBRARY = TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY; + private static final String KOTLIN_JS_LIBRARY_JAR = KOTLIN_JS_LIBRARY + ".jar"; + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js", "lib/kotlin.js"); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js"); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = + KotlinPackage.hashSetOf( + PROJECT_NAME + ".js", + "lib/kotlin.js", + "lib/jslib-example.js", + "lib/file0.js", + "lib/dir/file1.js", + "lib/META-INF-ex/file2.js", + "lib/res0.js", + "lib/resdir/res1.js"); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = + KotlinPackage.hashSetOf( + PROJECT_NAME + ".js", + "custom/kotlin.js", + "custom/jslib-example.js", + "custom/file0.js", + "custom/dir/file1.js", + "custom/META-INF-ex/file2.js", + "custom/res0.js", + "custom/resdir/res1.js"); @Override public void setUp() throws Exception { super.setUp(); @@ -84,12 +112,77 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { makeAll().assertSuccessful(); } + public void doTestWithKotlinJavaScriptLibrary() { + initProject(); + addKotlinJavaScriptStdlibDependency(); + createKotlinJavaScriptLibraryArchive(); + addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, new File(workDir, KOTLIN_JS_LIBRARY_JAR)); + makeAll().assertSuccessful(); + } + public void testKotlinProject() { doTest(); checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")); } + public void testKotlinJavaScriptProject() { + initProject(); + addKotlinJavaScriptStdlibDependency(); + makeAll().assertSuccessful(); + + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)); + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); + } + + public void testKotlinJavaScriptProjectWithDirectoryAsStdlib() { + initProject(); + File jslibJar = PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath(); + File jslibDir = new File(workDir, "KotlinJavaScript"); + try { + ZipUtil.extract(jslibJar, jslibDir, null); + } + catch (IOException ex) { + throw new IllegalStateException(ex.getMessage()); + } + addKotlinJavaScriptDependency("KotlinJavaScript", jslibDir); + makeAll().assertSuccessful(); + + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)); + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); + } + + public void testKotlinJavaScriptProjectWithDirectoryAsLibrary() { + initProject(); + addKotlinJavaScriptStdlibDependency(); + addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, new File(workDir, KOTLIN_JS_LIBRARY)); + makeAll().assertSuccessful(); + + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)); + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); + } + + public void testKotlinJavaScriptProjectWithLibrary() { + doTestWithKotlinJavaScriptLibrary(); + + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)); + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); + } + + public void testKotlinJavaScriptProjectWithLibraryCustomOutputDir() { + doTestWithKotlinJavaScriptLibrary(); + + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR, contentOfOutputDir(PROJECT_NAME)); + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); + } + + public void testKotlinJavaScriptProjectWithLibraryNoCopy() { + doTestWithKotlinJavaScriptLibrary(); + + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY, contentOfOutputDir(PROJECT_NAME)); + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); + } + public void testExcludeFolderInSourceRoot() { doTest(); @@ -276,6 +369,43 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")); } + private void createKotlinJavaScriptLibraryArchive() { + File jarFile = new File(workDir, KOTLIN_JS_LIBRARY_JAR); + try { + ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(jarFile)); + ZipUtil.addDirToZipRecursively(zip, jarFile, new File(PATH_TO_KOTLIN_JS_LIBRARY), "", null, null); + zip.close(); + } + catch (FileNotFoundException ex) { + throw new IllegalStateException(ex.getMessage()); + } + catch (IOException ex) { + throw new IllegalStateException(ex.getMessage()); + } + } + + @NotNull + private static String[] k2jsOutput(String moduleName) { + String outputDir = "out/production/" + moduleName; + String[] result = new String[1]; + result[0] = outputDir + "/" + moduleName + ".js"; + return result; + } + + @NotNull + private Set contentOfOutputDir(String moduleName) { + String outputDir = "out/production/" + moduleName; + File baseDir = new File(workDir, outputDir); + List files = FileUtil.findFilesByMask(Pattern.compile(".*"), baseDir); + Set result = new HashSet(); + for(File file : files) { + String relativePath = FileUtil.getRelativePath(baseDir, file); + assert relativePath != null : "relativePath should not be null"; + result.add(FileUtil.toSystemIndependentName(relativePath)); + } + return result; + } + @NotNull private static Set getMethodsOfClass(@NotNull File classFile) throws IOException { final Set result = new TreeSet(); diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProject/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProject/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProject/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProject/src/test1.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProject/src/test1.kt new file mode 100644 index 00000000000..a2c4e958bb5 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProject/src/test1.kt @@ -0,0 +1,3 @@ +fun foo() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/LibraryExample.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/LibraryExample.kt new file mode 100644 index 00000000000..28569346084 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/LibraryExample.kt @@ -0,0 +1,8 @@ +package library.sample + +public fun pairAdd(p: Pair): Int = p.first + p.second + +public fun pairMul(p: Pair): Int = p.first * p.second + +public data class IntHolder(val value: Int) + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF-ex/file2.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF-ex/file2.js new file mode 100644 index 00000000000..fa48e44e0bd --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF-ex/file2.js @@ -0,0 +1 @@ +// file2.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..00281ee90c5 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF @@ -0,0 +1,9 @@ +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.9.1 +Created-By: 1.7.0_72-b14 (Oracle Corporation) +Built-By: JetBrains +Implementation-Vendor: JetBrains +Implementation-Version: snapshot +Specification-Title: Kotlin JavaScript Lib +Kotlin-JS-Module-Name: jslib-example + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignored0.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignored0.js new file mode 100644 index 00000000000..909c0013f88 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignored0.js @@ -0,0 +1 @@ +// ignored0.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignoredDir/ignored1.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignoredDir/ignored1.js new file mode 100644 index 00000000000..3bccb9f3229 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/ignoredDir/ignored1.js @@ -0,0 +1 @@ +// ignored1.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources-ex/file4.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources-ex/file4.js new file mode 100644 index 00000000000..198bed92695 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources-ex/file4.js @@ -0,0 +1 @@ +// file4.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/res0.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/res0.js new file mode 100644 index 00000000000..e69df221fdd --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/res0.js @@ -0,0 +1 @@ +// res0.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/resdir/res1.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/resdir/res1.js new file mode 100644 index 00000000000..feb4eaecdb3 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/resources/resdir/res1.js @@ -0,0 +1 @@ +// res1.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md new file mode 100644 index 00000000000..6c269930b08 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md @@ -0,0 +1,6 @@ +# jslib-example + +Path to sources: compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example + +The archive compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar should be updated after +changing some files in source folder. \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/dir/file1.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/dir/file1.js new file mode 100644 index 00000000000..4b868025b44 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/dir/file1.js @@ -0,0 +1 @@ +// file1.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/file0.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/file0.js new file mode 100644 index 00000000000..a269fd47e90 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/file0.js @@ -0,0 +1 @@ +// file0.js \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js new file mode 100644 index 00000000000..8fb2ce81d48 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js @@ -0,0 +1,37 @@ +(function (Kotlin) { + 'use strict'; + var _ = Kotlin.defineRootPackage(null, /** @lends _ */ { + library: Kotlin.definePackage(null, /** @lends _.library */ { + sample: Kotlin.definePackage(null, /** @lends _.library.sample */ { + pairAdd_bunuun$: function (p) { + return p.first + p.second; + }, + pairMul_bunuun$: function (p) { + return p.first * p.second; + }, + IntHolder: Kotlin.createClass(null, function (value) { + this.value = value; + }, /** @lends _.library.sample.IntHolder.prototype */ { + component1: function () { + return this.value; + }, + copy_za3lpa$: function (value) { + return new _.library.sample.IntHolder(value === void 0 ? this.value : value); + }, + toString: function () { + return 'IntHolder(value=' + Kotlin.toString(this.value) + ')'; + }, + hashCode: function () { + var result = 0; + result = result * 31 + Kotlin.hashCode(this.value) | 0; + return result; + }, + equals_za3rmp$: function (other) { + return this === other || (other !== null && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value))); + } + }) + }) + }) + }); + Kotlin.defineModule('jslib-example', _); +}(Kotlin)); diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/src/test1.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/src/test1.kt new file mode 100644 index 00000000000..ee0be644f22 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/src/test1.kt @@ -0,0 +1,7 @@ +import library.sample.pairAdd + +fun foo() { + val p = Pair(10, 20) + val x = pairAdd(p) + println("x=$x") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/src/test1.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/src/test1.kt new file mode 100644 index 00000000000..a2c4e958bb5 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsStdlib/src/test1.kt @@ -0,0 +1,3 @@ +fun foo() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/src/test1.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/src/test1.kt new file mode 100644 index 00000000000..ee0be644f22 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibrary/src/test1.kt @@ -0,0 +1,7 @@ +import library.sample.pairAdd + +fun foo() { + val p = Pair(10, 20) + val x = pairAdd(p) + println("x=$x") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.ipr new file mode 100644 index 00000000000..8fed56d0828 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/kotlinProject.ipr @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/src/test1.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/src/test1.kt new file mode 100644 index 00000000000..ee0be644f22 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryCustomOutputDir/src/test1.kt @@ -0,0 +1,7 @@ +import library.sample.pairAdd + +fun foo() { + val p = Pair(10, 20) + val x = pairAdd(p) + println("x=$x") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.ipr new file mode 100644 index 00000000000..12af7dde89a --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/kotlinProject.ipr @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/src/test1.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/src/test1.kt new file mode 100644 index 00000000000..ee0be644f22 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryNoCopy/src/test1.kt @@ -0,0 +1,7 @@ +import library.sample.pairAdd + +fun foo() { + val p = Pair(10, 20) + val x = pairAdd(p) + println("x=$x") +} \ No newline at end of file From 42df0d85bdb9be71a3b7dc5e092ef5f70f1483bf Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 12 Dec 2014 14:12:58 +0300 Subject: [PATCH 0225/1557] Kotlin builder: make sure that caches are lazily initialized (KT-6409) Original commit: a9d3c2c0648f653a797f22f5503477751438fb95 --- .../org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 9220430c45c..0d299781090 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -69,7 +69,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC private val inlineFunctionsMap by Delegates.lazy { InlineFunctionsMap() } private val packagePartMap by Delegates.lazy { PackagePartMap() } - private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) + private val maps by Delegates.lazy { listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) } private fun getFormatVersionFile(): File { return File(baseDir, FORMAT_VERSION_TXT) From 8bab579f93c33d713cf62744d5e7a1c82d83c920 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 12 Dec 2014 21:32:42 +0300 Subject: [PATCH 0226/1557] Kotlin builder: avoid initialization of incremental caches in 'close' method (KT-6409) Original commit: 07a1ba0ef6d7cdeebbcf3677e3f679737d0243f1 --- .../jetbrains/jet/jps/build/KotlinBuilder.kt | 11 +-- .../jps/incremental/IncrementalCacheImpl.kt | 82 ++++++++++--------- .../IncrementalCacheVersionChangedTest.kt | 3 +- 3 files changed, 49 insertions(+), 47 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index b4ddb05d95b..e457f0dd720 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -40,8 +40,6 @@ import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage import java.io.File -import java.io.IOException -import java.lang.reflect.Modifier import java.util.* import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.* @@ -51,14 +49,11 @@ import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import com.intellij.openapi.diagnostic.Logger -import org.jetbrains.jet.lang.resolve.java.JvmAbi import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.jps.builders.java.JavaBuilderUtil import com.intellij.util.containers.MultiMap import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments -import org.jetbrains.jet.compiler.CompilerSettings import org.jetbrains.jps.model.JpsProject -import org.jetbrains.jet.compiler.runner.OutputItemsCollector import org.jetbrains.jet.compiler.runner.SimpleOutputItem import org.jetbrains.jet.utils.LibraryUtils @@ -92,10 +87,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } val dataManager = context.getProjectDescriptor().dataManager - val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) } - if (incrementalCaches.values().any { it -> it.isCacheVersionIncompatible() }) { - incrementalCaches.values().forEach { it.clean() } + if (chunk.getTargets().any { CacheFormatVersion(File(dataManager.getDataPaths().getTargetDataRoot(it), IncrementalCacheImpl.DIRECTORY_NAME)).isIncompatible() }) { + chunk.getTargets().forEach { dataManager.getStorage(it, IncrementalCacheStorageProvider).clean() } return CHUNK_REBUILD_REQUIRED } @@ -106,6 +100,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION) + val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) } val environment = createCompileEnvironment(incrementalCaches) if (!environment.success()) { environment.reportErrorsTo(messageCollector) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt index 0d299781090..5d5b6dcfb7e 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt @@ -24,7 +24,6 @@ import com.intellij.util.io.IOUtil import java.io.DataInput import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.util.io.DataExternalizer -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader import org.jetbrains.jet.descriptors.serialization.BitEncoding import java.util.Arrays import org.jetbrains.org.objectweb.asm.* @@ -40,14 +39,48 @@ import java.security.MessageDigest import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.jps.builders.storage.StorageProvider import java.io.IOException -import java.util.Scanner import org.jetbrains.jet.lang.resolve.java.JvmAbi import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind -import kotlin.properties.Delegates val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" +public class CacheFormatVersion(val baseDir: File) { + class object { + // Change this when incremental cache format changes + private val INCREMENTAL_CACHE_OWN_VERSION = 1 + val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION + val FORMAT_VERSION_TXT: String = "format-version.txt" + } + + private fun getFile(): File { + return File(baseDir, "format-version.txt") + } + + public fun isIncompatible(): Boolean { + val version = load() + return version != -1 && version != CACHE_FORMAT_VERSION + } + + private fun load(): Int { + val versionFile = getFile() + if (!versionFile.exists()) return -1 + + return versionFile.readText().toInt() + } + + fun saveIfNeeded() { + val versionFile = getFile() + if (!versionFile.exists()) { + versionFile.writeText(CACHE_FORMAT_VERSION.toString()) + } + } + + fun clean() { + getFile().delete() + } +} + public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalCache { class object { val DIRECTORY_NAME = "kotlin" @@ -56,48 +89,21 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" val PACKAGE_PARTS = "package-parts.tab" - - // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 1 - public val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION - - val FORMAT_VERSION_TXT = "format-version.txt" } - private val protoMap by Delegates.lazy { ProtoMap() } - private val constantsMap by Delegates.lazy { ConstantsMap() } - private val inlineFunctionsMap by Delegates.lazy { InlineFunctionsMap() } - private val packagePartMap by Delegates.lazy { PackagePartMap() } + private val protoMap = ProtoMap() + private val constantsMap = ConstantsMap() + private val inlineFunctionsMap = InlineFunctionsMap() + private val packagePartMap = PackagePartMap() - private val maps by Delegates.lazy { listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) } + private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) - private fun getFormatVersionFile(): File { - return File(baseDir, FORMAT_VERSION_TXT) - } - - public fun isCacheVersionIncompatible(): Boolean { - val version = loadCacheFormatVersion() - return version != -1 && version != CACHE_FORMAT_VERSION - } - - private fun loadCacheFormatVersion(): Int { - val versionFile = getFormatVersionFile() - if (!versionFile.exists()) return -1 - - return versionFile.readText().toInt() - } - - private fun saveCacheFormatVersionIfNeeded() { - val versionFile = getFormatVersionFile() - if (!versionFile.exists()) { - versionFile.writeText(CACHE_FORMAT_VERSION.toString()) - } - } + private val cacheFormatVersion = CacheFormatVersion(baseDir) public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { if (classFile.extension.toLowerCase() != "class") return DO_NOTHING - saveCacheFormatVersionIfNeeded() + cacheFormatVersion.saveIfNeeded() val kotlinClass = LocalFileKotlinClass.create(classFile) if (kotlinClass == null) return DO_NOTHING @@ -160,7 +166,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC public override fun clean() { maps.forEach { it.clean() } - getFormatVersionFile().delete() + cacheFormatVersion.clean() } public override fun close() { diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt index 945a66d5cdf..01e72da5452 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalCacheVersionChangedTest.kt @@ -21,6 +21,7 @@ import java.io.File import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl import kotlin.test.assertTrue +import org.jetbrains.jet.jps.incremental.CacheFormatVersion public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() { fun testCacheVersionChanged() { @@ -36,7 +37,7 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() { override fun performAdditionalModifications() { val storageForTargetType = BuildDataPathsImpl(myDataStorageRoot).getTargetTypeDataRoot(JavaModuleBuildTargetType.PRODUCTION) - val relativePath = "module/${File.separator}${IncrementalCacheImpl.DIRECTORY_NAME}/${IncrementalCacheImpl.FORMAT_VERSION_TXT}" + val relativePath = "module/${File.separator}${IncrementalCacheImpl.DIRECTORY_NAME}/${CacheFormatVersion.FORMAT_VERSION_TXT}" val cacheVersionFile = File(storageForTargetType, relativePath) assertTrue(cacheVersionFile.exists()) From 3a3e5a547e6f77cf218f8cff369286b32924c1dd Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 15 Dec 2014 16:46:20 +0300 Subject: [PATCH 0227/1557] Added test checking that we don't create Kotlin incremental caches for targets without Kotlin. Original commit: 8de11e466492c969571c61abb6e937a420334396 --- .../jet/jps/build/KotlinJpsBuildTest.java | 11 +++++++++++ .../kotlinProject.iml | 13 +++++++++++++ .../kotlinProject.ipr | 14 ++++++++++++++ .../src/Src.java | 2 ++ .../test/test.kt | 3 +++ 5 files changed, 43 insertions(+) create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 70197816a83..1dfc85f9b2f 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -19,6 +19,7 @@ package org.jetbrains.jet.jps.build; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightVirtualFile; +import com.intellij.util.Processor; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.io.ZipUtil; import kotlin.KotlinPackage; @@ -29,6 +30,7 @@ import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.builders.BuildResult; +import org.jetbrains.jps.builders.impl.BuildDataPathsImpl; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaExtensionService; import org.jetbrains.jps.model.module.JpsModule; @@ -432,6 +434,15 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { makeAll().assertSuccessful(); } + public void testDoNotCreateUselessKotlinIncrementalCaches() throws InterruptedException { + initProject(); + makeAll().assertSuccessful(); + + File storageRoot = new BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot(); + assertTrue(new File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()); + assertFalse(new File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()); + } + @NotNull private JpsModule findModule(@NotNull String name) { for (JpsModule module : myProject.getModules()) { diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml new file mode 100644 index 00000000000..a441b33e10b --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java new file mode 100644 index 00000000000..9afa4b2097c --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/src/Src.java @@ -0,0 +1,2 @@ +class Src { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt new file mode 100644 index 00000000000..c133c83fce7 --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCaches/test/test.kt @@ -0,0 +1,3 @@ +fun test() { + val x = 5 + 5 +} \ No newline at end of file From 5eba550aef24833f94018ea000eceaeef0be8e2d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 15 Dec 2014 19:46:57 +0300 Subject: [PATCH 0228/1557] Added test for KT-6454 Obsolete class-files for lambdas aren't removed from output when 'inline' annotation is added to function. The bug is reproducible only for non-incremental compilation mode, which will be deprecated soon. #KT-6454 can't reproduce Original commit: 79245683552c5ef899be2a62a65ddc6d44616650 --- .../jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../pureKotlin/functionBecameInline/build.log | 15 +++++++++++++++ .../pureKotlin/functionBecameInline/fun.kt | 5 +++++ .../pureKotlin/functionBecameInline/fun.kt.new | 5 +++++ .../pureKotlin/functionBecameInline/usage.kt | 5 +++++ 5 files changed, 36 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index c3ad4afd5b4..73621ad3274 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -171,6 +171,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("functionBecameInline") + public void testFunctionBecameInline() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/"); + doTest(fileName); + } + @TestMetadata("independentClasses") public void testIndependentClasses() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log new file mode 100644 index 00000000000..2692bd03c99 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/Y.class +End of files +Compiling files: +src/fun.kt +End of files +Cleaning output files: +out/production/module/X$main$1.class +out/production/module/X.class +out/production/module/Y.class +End of files +Compiling files: +src/fun.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt new file mode 100644 index 00000000000..98d04fc4df3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt @@ -0,0 +1,5 @@ +class Y { + fun foo(f: () -> Unit) { + f() + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new new file mode 100644 index 00000000000..299cd80a410 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/fun.kt.new @@ -0,0 +1,5 @@ +class Y { + inline fun foo(f: () -> Unit) { + f() + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/usage.kt new file mode 100644 index 00000000000..ac2a7aff554 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/usage.kt @@ -0,0 +1,5 @@ +class X { + fun main() { + Y().foo {} + } +} \ No newline at end of file From c2c19e70dace064721b47d119736bf96529ace1c Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Tue, 16 Dec 2014 20:58:03 +0300 Subject: [PATCH 0229/1557] do not copy js files from libraries in case of compile errors Original commit: d909a66d4da6432bbfa095d9ebce5d59ee648063 --- .../jetbrains/jet/jps/build/KotlinBuilder.kt | 14 ++++++++++++-- .../jet/jps/build/KotlinJpsBuildTest.java | 10 ++++++++++ .../kotlinProject.iml | 12 ++++++++++++ .../kotlinProject.ipr | 17 +++++++++++++++++ .../src/test1.kt | 7 +++++++ 5 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/src/test1.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index e457f0dd720..a2d0fef9845 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -142,7 +142,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (compilationErrors) { return ABORT } - + + if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { + copyJsLibraryFilesIfNeeded(chunk, project) + } + if (IncrementalCompilation.ENABLED) { if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { allCompiledFiles.clear() @@ -304,13 +308,19 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + return outputItemCollector + } + + private fun copyJsLibraryFilesIfNeeded(chunk: ModuleChunk, project: JpsProject) { + val representativeTarget = chunk.representativeTarget() + val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) + val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) if (compilerSettings.copyJsLibraryFiles) { val outputLibraryRuntimeDirectory = File(outputDir, compilerSettings.outputDirectoryForJsLibraryFiles).getAbsolutePath() val libraryFilesToCopy = arrayListOf() JpsJsModuleUtils.getLibraryFiles(representativeTarget, libraryFilesToCopy) LibraryUtils.copyJsFilesFromLibraries(libraryFilesToCopy, outputLibraryRuntimeDirectory) } - return outputItemCollector } // if null is returned, nothing was done diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java index 1dfc85f9b2f..da4377aba83 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTest.java @@ -185,6 +185,16 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); } + public void testKotlinJavaScriptProjectWithLibraryAndErrors() { + initProject(); + addKotlinJavaScriptStdlibDependency(); + createKotlinJavaScriptLibraryArchive(); + addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, new File(workDir, KOTLIN_JS_LIBRARY_JAR)); + makeAll().assertFailed(); + + assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)); + } + public void testExcludeFolderInSourceRoot() { doTest(); diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.ipr new file mode 100644 index 00000000000..12af7dde89a --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/kotlinProject.ipr @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/src/test1.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/src/test1.kt new file mode 100644 index 00000000000..f1204a3d82e --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithLibraryAndErrors/src/test1.kt @@ -0,0 +1,7 @@ +import library.sample.pairAdd + +fun foo() { + val p = Pair1(10, 20) + val x = pairAdd(p) + println("x=$x") +} \ No newline at end of file From 97551f9a1179fec86ae2c683f42c7ee7239ffc56 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 19 Dec 2014 23:10:04 +0300 Subject: [PATCH 0230/1557] Updated test data according to JPS. Behavior is still wrong, but it is work in progress on IDEA side. Original commit: c6c3e5a4c67a18c5efc1e688d7bb723fc1e3d1f0 --- .../incremental/pureKotlin/multiplePackagesModified/build.log | 2 -- .../testData/incremental/pureKotlin/packageFileAdded/build.log | 2 -- 2 files changed, 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index c3ec263353b..b1fbc2c646e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -19,10 +19,8 @@ src/b1.kt End of files Cleaning output files: out/production/module/a/APackage$a1$*.class -out/production/module/a/APackage$a2$*.class out/production/module/a/APackage.class End of files Compiling files: src/a1.kt -src/a2.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 04d72291c96..94c3c5ea613 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -12,10 +12,8 @@ src/b.kt End of files Cleaning output files: out/production/module/test/TestPackage$a$*.class -out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -src/b.kt End of files \ No newline at end of file From 81d88090be21966098b9d2360286e2dbb2385cc2 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 23 Dec 2014 14:41:00 +0300 Subject: [PATCH 0231/1557] fixed typo in file name Original commit: 2a60c6d7598d1f2046f0a5c14b41b945a55ef03d --- ...mentlaCacheProviderImpl.kt => IncrementalCacheProviderImpl.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/{IncrementlaCacheProviderImpl.kt => IncrementalCacheProviderImpl.kt} (100%) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheProviderImpl.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementlaCacheProviderImpl.kt rename to jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheProviderImpl.kt From e709b0f3f6cd9a93a46632a5f4d64f58f2955f83 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 25 Dec 2014 20:00:28 +0300 Subject: [PATCH 0232/1557] Don't store class loader in CompilerEnvironment Modules jps-plugin and ide-compiler-runner are loaded by the same class loader Original commit: 0d671141d0b7121b3e8be33b2d78c1802ce40be7 --- .../src/org/jetbrains/jet/jps/build/KotlinBuilder.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt index a2d0fef9845..122c01b7ea0 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt @@ -169,16 +169,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) .build() - val environment = CompilerEnvironment.getEnvironmentFor( + return CompilerEnvironment.getEnvironmentFor( PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), - javaClass.getClassLoader(), { className -> - className!!.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") + className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") || className == "org.jetbrains.jet.config.Services" }, compilerServices ) - return environment } private fun getOutputItemsAndTargets( From d27f8f896fec0a0003faf61d7e39f98d68629441 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 3 Jan 2015 00:20:28 +0300 Subject: [PATCH 0233/1557] Regenerate tests Original commit: 7f90dc3934b85d5535057312e0bbaa6bf0873113 --- .../jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 73621ad3274..0e312e657c2 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import java.io.File; import java.util.regex.Pattern; -/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @InnerTestClasses({IncrementalJpsTestGenerated.MultiModule.class, IncrementalJpsTestGenerated.PureKotlin.class, IncrementalJpsTestGenerated.WithJava.class}) @RunWith(JUnit3RunnerWithInners.class) From d188aa147de4e194bfa3b5c8c715f3da3d2726f5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 3 Jan 2015 12:41:47 +0300 Subject: [PATCH 0234/1557] Rename package jet -> kotlin in bare-plugin org.jetbrains.jet.plugin.bare -> org.jetbrains.kotlin.plugin.bare Original commit: f58b151d58ea6902c17169205cc15bf22c1f5e20 --- jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml | 2 +- .../{jet => kotlin}/plugin/bare/BareJpsPluginRegistrar.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename jps/jps-plugin/bare-plugin/src/org/jetbrains/{jet => kotlin}/plugin/bare/BareJpsPluginRegistrar.kt (95%) diff --git a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml index 38797001f0b..7b12e79ab69 100644 --- a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml +++ b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml @@ -16,7 +16,7 @@ - org.jetbrains.jet.plugin.bare.BareJpsPluginRegistrar + org.jetbrains.kotlin.plugin.bare.BareJpsPluginRegistrar diff --git a/jps/jps-plugin/bare-plugin/src/org/jetbrains/jet/plugin/bare/BareJpsPluginRegistrar.kt b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/plugin/bare/BareJpsPluginRegistrar.kt similarity index 95% rename from jps/jps-plugin/bare-plugin/src/org/jetbrains/jet/plugin/bare/BareJpsPluginRegistrar.kt rename to jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/plugin/bare/BareJpsPluginRegistrar.kt index e5f87180f9b..188e5b8b1e3 100644 --- a/jps/jps-plugin/bare-plugin/src/org/jetbrains/jet/plugin/bare/BareJpsPluginRegistrar.kt +++ b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/plugin/bare/BareJpsPluginRegistrar.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.plugin.bare +package org.jetbrains.kotlin.plugin.bare import com.intellij.compiler.server.CompileServerPlugin import com.intellij.ide.plugins.IdeaPluginDescriptor From 6df5ca513024a29864850f30be58a0db2d765fec Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 3 Jan 2015 12:46:05 +0300 Subject: [PATCH 0235/1557] Rename package jet -> kotlin in kannotator-jps-plugin-test org.jetbrains.jet.jps.build.kannotator -> org.jetbrains.kotlin.jps.build.kannotator Original commit: 2fdd63fa53a1d8b65617c85826a674e87c40f13c --- .../jps/build/kannotator/KAnnotatorJpsBuildTestCase.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/{jet => kotlin}/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java (95%) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java similarity index 95% rename from jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java rename to jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java index 47ec7b8c5ae..3e96fafcbd3 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/jet/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build.kannotator; +package org.jetbrains.kotlin.jps.build.kannotator; import com.intellij.openapi.util.io.FileUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.jps.build.AbstractKotlinJpsBuildTestCase; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.module.JpsModule; @@ -81,6 +82,7 @@ public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { System.out.println("'Rebuild all' finished"); } + @NotNull @Override protected BuildResult makeAll() { System.out.println("'Make all' started"); From 286e8861cd297b51e9cd18bbc1ec7cb1b9457ad4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 5 Jan 2015 19:43:16 +0300 Subject: [PATCH 0236/1557] Move module script-related code to org.jetbrains.kotlin.modules Original commit: 36feb4dfdc8ccb577a43216c2e001900f5e9f298 --- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java index 4bf4e25a006..4152b19420a 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -22,9 +22,6 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder; -import org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilderFactory; -import org.jetbrains.jet.compiler.runner.KotlinModuleXmlBuilderFactory; import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; @@ -41,14 +38,17 @@ import org.jetbrains.jps.model.module.JpsDependencyElement; import org.jetbrains.jps.model.module.JpsLibraryDependency; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsSdkDependency; +import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder; +import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilderFactory; +import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilderFactory; import java.io.File; import java.io.IOException; import java.util.*; -import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProcessor; -import static org.jetbrains.jet.compiler.runner.KotlinModuleDescriptionBuilder.DependencyProvider; import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies; +import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProcessor; +import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProvider; public class KotlinBuilderModuleScriptGenerator { From aff262481f13a3b10dddc5bfd5578bc37065fd68 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 5 Jan 2015 19:54:21 +0300 Subject: [PATCH 0237/1557] Rename package jet -> kotlin in jps-plugin org.jetbrains.jet.jps -> org.jetbrains.kotlin.jps Original commit: 3f7d2e461e10f8ed68fd4441a39fb2f47f72082f --- .../build/kannotator/KAnnotatorJpsBuildTestCase.java | 2 +- .../org.jetbrains.jps.incremental.BuilderService | 2 +- ...jps.model.serialization.JpsModelSerializerExtension | 2 +- .../{jet => kotlin}/jps/JpsKotlinCompilerSettings.java | 4 ++-- .../{jet => kotlin}/jps/build/JpsJsModuleUtils.java | 6 +++--- .../jetbrains/{jet => kotlin}/jps/build/JpsUtils.java | 4 ++-- .../{jet => kotlin}/jps/build/KotlinBuilder.kt | 8 ++++---- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 6 +++--- .../jps/build/KotlinBuilderService.java | 4 ++-- .../jps/build/KotlinSourceFileCollector.java | 4 ++-- .../jps/incremental/IncrementalCacheImpl.kt | 6 +++--- .../jps/incremental/IncrementalCacheProviderImpl.kt | 6 ++---- .../jps/incremental/LocalFileKotlinClass.kt | 4 ++-- .../model/Kotlin2JsCompilerArgumentsSerializer.java | 6 +++--- .../model/Kotlin2JvmCompilerArgumentsSerializer.java | 8 ++++---- .../model/KotlinCommonCompilerArgumentsSerializer.java | 6 +++--- .../jps/model/KotlinCompilerSettingsSerializer.java | 8 ++++---- .../jps/model/KotlinModelSerializerService.java | 4 ++-- .../jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- .../jps/build/AbstractKotlinJpsBuildTestCase.java | 4 ++-- .../jps/build/IncrementalCacheVersionChangedTest.kt | 10 +++++----- .../jps/build/IncrementalJpsTestGenerated.java | 2 +- .../{jet => kotlin}/jps/build/KotlinJpsBuildTest.java | 5 ++--- .../jps/build/SimpleKotlinJpsBuildTest.kt | 4 ++-- .../{jet => kotlin}/jps/build/classFilesComparison.kt | 7 +++---- 25 files changed, 61 insertions(+), 65 deletions(-) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/JpsKotlinCompilerSettings.java (98%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/build/JpsJsModuleUtils.java (96%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/build/JpsUtils.java (96%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/build/KotlinBuilder.kt (99%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/build/KotlinBuilderModuleScriptGenerator.java (98%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/build/KotlinBuilderService.java (92%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/build/KotlinSourceFileCollector.java (98%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/incremental/IncrementalCacheImpl.kt (99%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/incremental/IncrementalCacheProviderImpl.kt (90%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/incremental/LocalFileKotlinClass.kt (95%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/model/Kotlin2JsCompilerArgumentsSerializer.java (92%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java (92%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/model/KotlinCommonCompilerArgumentsSerializer.java (92%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/model/KotlinCompilerSettingsSerializer.java (92%) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/model/KotlinModelSerializerService.java (94%) rename jps/jps-plugin/test/org/jetbrains/{jet => kotlin}/jps/build/AbstractIncrementalJpsTest.kt (99%) rename jps/jps-plugin/test/org/jetbrains/{jet => kotlin}/jps/build/AbstractKotlinJpsBuildTestCase.java (98%) rename jps/jps-plugin/test/org/jetbrains/{jet => kotlin}/jps/build/IncrementalCacheVersionChangedTest.kt (88%) rename jps/jps-plugin/test/org/jetbrains/{jet => kotlin}/jps/build/IncrementalJpsTestGenerated.java (99%) rename jps/jps-plugin/test/org/jetbrains/{jet => kotlin}/jps/build/KotlinJpsBuildTest.java (99%) rename jps/jps-plugin/test/org/jetbrains/{jet => kotlin}/jps/build/SimpleKotlinJpsBuildTest.kt (98%) rename jps/jps-plugin/test/org/jetbrains/{jet => kotlin}/jps/build/classFilesComparison.kt (96%) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java index 3e96fafcbd3..be7abede23e 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.jps.build.kannotator; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.jps.build.AbstractKotlinJpsBuildTestCase; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; +import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase; import java.io.File; diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService index dbf52b9ce3b..caf9af82251 100644 --- a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService +++ b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.incremental.BuilderService @@ -1 +1 @@ -org.jetbrains.jet.jps.build.KotlinBuilderService \ No newline at end of file +org.jetbrains.kotlin.jps.build.KotlinBuilderService \ No newline at end of file diff --git a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension index 6026c57ec4b..6310ade24c5 100644 --- a/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension +++ b/jps/jps-plugin/src/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension @@ -1 +1 @@ -org.jetbrains.jet.jps.model.KotlinModelSerializerService +org.jetbrains.kotlin.jps.model.KotlinModelSerializerService \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java similarity index 98% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java index e22c1971769..7af9b0f7551 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps; +package org.jetbrains.kotlin.jps; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java similarity index 96% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java index f03b8fb9430..8aadbb2ffba 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsJsModuleUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build; +package org.jetbrains.kotlin.jps.build; import com.intellij.util.Consumer; import org.jetbrains.annotations.NotNull; @@ -66,4 +66,4 @@ class JpsJsModuleUtils { } }); } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java similarity index 96% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java index 6b46cf685c9..4492c006cec 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build; +package org.jetbrains.kotlin.jps.build; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.utils.LibraryUtils; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt similarity index 99% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 122c01b7ea0..b3c5e815feb 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build +package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.Key import com.intellij.openapi.util.io.FileUtil @@ -28,8 +28,8 @@ import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl import org.jetbrains.jet.config.Services import org.jetbrains.jet.config.IncrementalCompilation -import org.jetbrains.jet.jps.JpsKotlinCompilerSettings -import org.jetbrains.jet.jps.incremental.* +import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings +import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.jet.utils.PathUtil import org.jetbrains.jps.ModuleChunk diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java similarity index 98% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 4152b19420a..89d695eab4e 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build; +package org.jetbrains.kotlin.jps.build; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -46,7 +46,7 @@ import java.io.File; import java.io.IOException; import java.util.*; -import static org.jetbrains.jet.jps.build.JpsUtils.getAllDependencies; +import static org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies; import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProcessor; import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProvider; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.java similarity index 92% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.java index 08de8142505..2ad701e4433 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilderService.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderService.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build; +package org.jetbrains.kotlin.jps.build; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.incremental.BuilderService; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceFileCollector.java similarity index 98% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceFileCollector.java index 353d99f2dbb..5fc6f77ddc5 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinSourceFileCollector.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinSourceFileCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build; +package org.jetbrains.kotlin.jps.build; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt similarity index 99% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 5d5b6dcfb7e..05cc268cc43 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.incremental +package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.jet.jps.incremental.IncrementalCacheImpl.RecompilationDecision.* +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.* import java.io.File import com.intellij.util.io.PersistentHashMap import java.io.DataOutput diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt similarity index 90% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheProviderImpl.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt index b174b864cee..9fdc78be502 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheProviderImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,12 +14,11 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.incremental +package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache -import kotlin.properties.Delegates public class IncrementalCacheProviderImpl(caches: Map): IncrementalCacheProvider { private val idToCache = caches.mapKeys { it.key.getId()!! } @@ -28,4 +27,3 @@ public class IncrementalCacheProviderImpl(caches: Map Date: Tue, 6 Jan 2015 04:06:29 +0300 Subject: [PATCH 0238/1557] Rename package jet -> kotlin in ide-compiler-runner org.jetbrains.jet.compiler.runner -> org.jetbrains.kotlin.compilerRunner org.jetbrains.jet.compiler -> org.jetbrains.kotlin.config Original commit: 98faeb864764f97ba57c74fc5bb296c082cc74bd --- .../kotlin/jps/JpsKotlinCompilerSettings.java | 2 +- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 14 +++++++------- .../Kotlin2JsCompilerArgumentsSerializer.java | 4 ++-- .../Kotlin2JvmCompilerArgumentsSerializer.java | 4 ++-- .../KotlinCommonCompilerArgumentsSerializer.java | 4 ++-- .../model/KotlinCompilerSettingsSerializer.java | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java index 7af9b0f7551..738b89f51e0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java @@ -20,11 +20,11 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.ex.JpsElementBase; import org.jetbrains.jps.model.ex.JpsElementChildRoleBase; +import org.jetbrains.kotlin.config.CompilerSettings; public class JpsKotlinCompilerSettings extends JpsElementBase { static final JpsElementChildRole ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b3c5e815feb..2e79eda708c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -23,9 +23,9 @@ import org.jetbrains.jet.cli.common.KotlinVersion import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity import org.jetbrains.jet.cli.common.messages.MessageCollector -import org.jetbrains.jet.compiler.runner.CompilerEnvironment -import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants -import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl +import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment +import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants +import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.jet.config.Services import org.jetbrains.jet.config.IncrementalCompilation import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings @@ -43,9 +43,9 @@ import java.io.File import java.util.* import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.* -import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX -import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler -import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler +import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX +import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler +import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler import org.jetbrains.jet.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import com.intellij.openapi.diagnostic.Logger @@ -54,7 +54,7 @@ import org.jetbrains.jps.builders.java.JavaBuilderUtil import com.intellij.util.containers.MultiMap import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject -import org.jetbrains.jet.compiler.runner.SimpleOutputItem +import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem import org.jetbrains.jet.utils.LibraryUtils public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index 502d34f9266..a2200c34dd7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java @@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { Kotlin2JsCompilerArgumentsSerializer() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index 545a80396c8..ad810fdc2e8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java @@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { Kotlin2JvmCompilerArgumentsSerializer() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 173b8fcc9e7..563ee48671a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java @@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { KotlinCommonCompilerArgumentsSerializer() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java index 109bdef9672..c27f8cbbc6e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java @@ -19,13 +19,13 @@ package org.jetbrains.kotlin.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.compiler.CompilerSettings; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; +import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer { KotlinCompilerSettingsSerializer() { From 82d7ed7cf90225681abf215413e021a7437ea20f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 8 Jan 2015 20:30:27 +0300 Subject: [PATCH 0239/1557] Rename package jet -> kotlin in cli, cli-common org.jetbrains.jet.cli -> org.jetbrains.kotlin.cli Also fix some minor warnings Original commit: 8ca803775fef30305a8251292215aefcb5ff2a86 --- .../kotlin/jps/JpsKotlinCompilerSettings.java | 6 +++--- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 14 +++++++------- .../Kotlin2JsCompilerArgumentsSerializer.java | 2 +- .../Kotlin2JvmCompilerArgumentsSerializer.java | 2 +- .../KotlinCommonCompilerArgumentsSerializer.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java index 738b89f51e0..6095da08422 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java @@ -17,9 +17,9 @@ package org.jetbrains.kotlin.jps; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jps.model.JpsElementChildRole; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.ex.JpsElementBase; diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 2e79eda708c..53a80307bd0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -19,10 +19,10 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.Key import com.intellij.openapi.util.io.FileUtil import gnu.trove.THashSet -import org.jetbrains.jet.cli.common.KotlinVersion -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.jet.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.common.KotlinVersion +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl @@ -41,8 +41,8 @@ import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage import java.io.File import java.util.* -import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION -import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.* +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler @@ -52,7 +52,7 @@ import com.intellij.openapi.diagnostic.Logger import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.jps.builders.java.JavaBuilderUtil import com.intellij.util.containers.MultiMap -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem import org.jetbrains.jet.utils.LibraryUtils diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index a2200c34dd7..10ead8134d8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index ad810fdc2e8..09f10c25233 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 563ee48671a..70c60de3245 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.model; import com.intellij.util.xmlb.XmlSerializer; import org.jdom.Element; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.jps.model.JpsProject; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; From 8f5b3b58de420a54c12acdf92d9cdd156b451f05 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 8 Jan 2015 21:20:12 +0300 Subject: [PATCH 0240/1557] Rename package jet -> kotlin in util, util-runtime org.jetbrains.jet.config -> org.jetbrains.kotlin.config org.jetbrains.jet.utils -> org.jetbrains.kotlin.utils Also move coreLib.kt to package 'org.jetbrains.kotlin.utils' Original commit: f37e2f173d3908469f614494b70427cb8ec41d16 --- .../src/org/jetbrains/kotlin/jps/build/JpsUtils.java | 2 +- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 12 ++++++------ .../build/KotlinBuilderModuleScriptGenerator.java | 2 +- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- .../jps/build/AbstractKotlinJpsBuildTestCase.java | 2 +- .../kotlin/jps/build/KotlinJpsBuildTest.java | 2 +- .../kotlin/jps/build/classFilesComparison.kt | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java index 4492c006cec..86562fc6785 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.LibraryUtils; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.model.java.JpsJavaClasspathKind; import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; @@ -26,6 +25,7 @@ import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.JpsLibraryRoot; import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.utils.LibraryUtils; import java.util.Set; diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 53a80307bd0..a643d8fddf7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -26,12 +26,12 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl -import org.jetbrains.jet.config.Services -import org.jetbrains.jet.config.IncrementalCompilation +import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider -import org.jetbrains.jet.utils.PathUtil +import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.builders.DirtyFilesHolder import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor @@ -46,7 +46,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler -import org.jetbrains.jet.utils.keysToMap +import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import com.intellij.openapi.diagnostic.Logger import org.jetbrains.org.objectweb.asm.ClassReader @@ -55,7 +55,7 @@ import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem -import org.jetbrains.jet.utils.LibraryUtils +import org.jetbrains.kotlin.utils.LibraryUtils public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -173,7 +173,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), { className -> className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") - || className == "org.jetbrains.jet.config.Services" + || className == "org.jetbrains.kotlin.config.Services" }, compilerServices ) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 89d695eab4e..cd90906e6c8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -22,7 +22,6 @@ import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.config.IncrementalCompilation; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; @@ -38,6 +37,7 @@ import org.jetbrains.jps.model.module.JpsDependencyElement; import org.jetbrains.jps.model.module.JpsLibraryDependency; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsSdkDependency; +import org.jetbrains.kotlin.config.IncrementalCompilation; import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder; import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilderFactory; import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilderFactory; diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 15f6dd75629..54c7769a8af 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -26,12 +26,12 @@ import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.jet.config.IncrementalCompilation +import org.jetbrains.kotlin.config.IncrementalCompilation import java.util.ArrayList import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import kotlin.test.fail import java.util.HashMap -import org.jetbrains.jet.utils.keysToMap +import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.jps.incremental.messages.BuildMessage import kotlin.test.assertFalse import java.util.regex.Pattern diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index 3c3ab6ccd8e..2d58b1bf060 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -18,7 +18,6 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.PathUtil; import org.jetbrains.jps.builders.JpsBuildTestCase; import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.JpsModuleRootModificationUtil; @@ -33,6 +32,7 @@ import org.jetbrains.jps.model.library.JpsTypedLibrary; import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; import java.io.IOException; diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 071e50a59cf..d0fa9d3b9ae 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -27,7 +27,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.jet.codegen.AsmUtil; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.utils.PathUtil; +import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.builders.impl.BuildDataPathsImpl; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt index b12ee084c48..f5cbc3d3be1 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt @@ -22,7 +22,7 @@ import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor import java.io.PrintWriter import org.jetbrains.org.objectweb.asm.ClassReader import java.io.StringWriter -import org.jetbrains.jet.utils.Printer +import org.jetbrains.kotlin.utils.Printer import com.google.common.io.Files import com.google.common.hash.Hashing import com.intellij.openapi.util.io.FileUtil From 2c26ffabfdbff8ed9049f906e30d8d2d2317a08c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 8 Jan 2015 22:00:59 +0300 Subject: [PATCH 0241/1557] Rename package jet -> kotlin in backend org.jetbrains.jet.codegen -> org.jetbrains.kotlin.codegen Original commit: de6e8a749318f7d3e0914f335194eaae5a0e7eb6 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index d0fa9d3b9ae..10c17122b72 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -24,7 +24,7 @@ import com.intellij.util.io.ZipUtil; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.codegen.AsmUtil; +import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.kotlin.utils.PathUtil; From 4038efbe2147237e2f00f81ee3629c9ca853dc01 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 9 Jan 2015 14:06:45 +0300 Subject: [PATCH 0242/1557] Rename java -> jvm, jet -> kotlin in module serialization.java org.jetbrains.jet.descriptors.serialization -> org.jetbrains.kotlin.serialization.jvm Original commit: 00878cc31af33c721a48a113d6ea0bbca379554e --- jps/jps-plugin/jps-plugin.iml | 5 ++--- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 2 +- .../org/jetbrains/kotlin/jps/build/classFilesComparison.kt | 6 +++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index d96c403f498..a4e8a5a1756 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -17,10 +17,9 @@ - + - - + \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 05cc268cc43..50440dc36e5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -24,7 +24,7 @@ import com.intellij.util.io.IOUtil import java.io.DataInput import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.util.io.DataExternalizer -import org.jetbrains.jet.descriptors.serialization.BitEncoding +import org.jetbrains.kotlin.serialization.jvm.BitEncoding import java.util.Arrays import org.jetbrains.org.objectweb.asm.* import com.intellij.util.io.EnumeratorStringDescriptor diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt index f5cbc3d3be1..215ee7895d4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt @@ -28,8 +28,8 @@ import com.google.common.hash.Hashing import com.intellij.openapi.util.io.FileUtil import com.google.common.collect.Sets import java.util.HashSet -import org.jetbrains.jet.descriptors.serialization.BitEncoding -import org.jetbrains.jet.descriptors.serialization.DebugJavaProtoBuf +import org.jetbrains.kotlin.serialization.jvm.BitEncoding +import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf import com.google.protobuf.ExtensionRegistry import java.io.ByteArrayInputStream import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf @@ -158,7 +158,7 @@ fun classFileToString(classFile: File): String { fun getExtensionRegistry(): ExtensionRegistry { val registry = ExtensionRegistry.newInstance()!! - DebugJavaProtoBuf.registerAllExtensions(registry) + DebugJvmProtoBuf.registerAllExtensions(registry) return registry } From e9e4dc2bd65ce347a8bf3bedc8c92426ee579361 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 9 Jan 2015 14:13:26 +0300 Subject: [PATCH 0243/1557] Rename jet -> kotlin and regroup files in serialization org.jetbrains.jet.descriptors.serialization -> org.jetbrains.kotlin.serialization Deserialization goes to subpackage deserialization, built-ins-related stuff goes to subpackage builtins Original commit: 05eaf81ba6dcd519cc997e52df4400d6510dffbb --- .../test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt index 215ee7895d4..853343ed937 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf import com.google.protobuf.ExtensionRegistry import java.io.ByteArrayInputStream -import org.jetbrains.jet.descriptors.serialization.DebugProtoBuf +import org.jetbrains.kotlin.serialization.DebugProtoBuf import java.util.Arrays import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind From a23abe8c0d74ae3360cca2270aaae975efe05221 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 10 Jan 2015 15:49:44 +0300 Subject: [PATCH 0244/1557] Rename jet -> kotlin in descriptors, types, names org.jetbrains.jet.lang.descriptors -> org.jetbrains.kotlin.descriptors org.jetbrains.jet.lang.types -> org.jetbrains.kotlin.types org.jetbrains.jet.lang.resolve.name -> org.jetbrains.kotlin.name Original commit: 524fdc25279909cd0d24f9ed5701db7bdbcf5434 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 2 +- .../jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt | 2 +- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 50440dc36e5..dd7578f9f1c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -22,7 +22,7 @@ import com.intellij.util.io.PersistentHashMap import java.io.DataOutput import com.intellij.util.io.IOUtil import java.io.DataInput -import org.jetbrains.jet.lang.resolve.name.FqName +import org.jetbrains.kotlin.name.FqName import com.intellij.util.io.DataExternalizer import org.jetbrains.kotlin.serialization.jvm.BitEncoding import java.util.Arrays diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index cca30f8be06..0a7dee9ad5b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader -import org.jetbrains.jet.lang.resolve.name.ClassId +import org.jetbrains.kotlin.name.ClassId import java.io.File class LocalFileKotlinClass private( diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 10c17122b72..1dc8b222646 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.jet.lang.resolve.name.FqName; +import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.builders.impl.BuildDataPathsImpl; From 9a43996589a7e56eca89c3913917914b71564fc0 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 11 Jan 2015 02:47:46 +0300 Subject: [PATCH 0245/1557] Rename jet -> kotlin in descriptor.loader.java, frontend.java Split package 'lang/resolve/java' into two semantically different packages: 'resolve/jvm' and 'load/java'. Also rename 'lang/resolve/kotlin' to 'load/kotlin' Original commit: 8affc3130333a07184baf763cb37117768f97982 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++-- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 14 +++++++------- .../incremental/IncrementalCacheProviderImpl.kt | 4 ++-- .../kotlin/jps/incremental/LocalFileKotlinClass.kt | 4 ++-- .../kotlin/jps/build/KotlinJpsBuildTest.java | 8 ++++---- .../kotlin/jps/build/classFilesComparison.kt | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a643d8fddf7..1e9a13a32fd 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.builders.DirtyFilesHolder @@ -172,7 +172,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return CompilerEnvironment.getEnvironmentFor( PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), { className -> - className.startsWith("org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.") + className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.cache.") || className == "org.jetbrains.kotlin.config.Services" }, compilerServices diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index dd7578f9f1c..ea16f56a11f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -28,20 +28,20 @@ import org.jetbrains.kotlin.serialization.jvm.BitEncoding import java.util.Arrays import org.jetbrains.org.objectweb.asm.* import com.intellij.util.io.EnumeratorStringDescriptor -import org.jetbrains.jet.lang.resolve.java.JvmAnnotationNames -import org.jetbrains.jet.lang.resolve.java.JvmClassName +import org.jetbrains.kotlin.load.java.JvmAnnotationNames +import org.jetbrains.kotlin.resolve.jvm.JvmClassName import java.util.HashSet -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import java.util.HashMap -import org.jetbrains.jet.lang.resolve.java.PackageClassUtils +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import com.intellij.openapi.util.io.FileUtil import java.security.MessageDigest import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.jps.builders.storage.StorageProvider import java.io.IOException -import org.jetbrains.jet.lang.resolve.java.JvmAbi -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.java.JvmAbi +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt index 9fdc78be502..34eb8261fac 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt @@ -16,9 +16,9 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCacheProvider +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.jet.lang.resolve.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache public class IncrementalCacheProviderImpl(caches: Map): IncrementalCacheProvider { private val idToCache = caches.mapKeys { it.key.getId()!! } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 0a7dee9ad5b..202f0ce01fa 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -16,8 +16,8 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass -import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.name.ClassId import java.io.File diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 1dc8b222646..c30fbd6c73e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -24,16 +24,16 @@ import com.intellij.util.io.ZipUtil; import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.codegen.AsmUtil; -import org.jetbrains.jet.lang.resolve.kotlin.PackagePartClassUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.builders.impl.BuildDataPathsImpl; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaExtensionService; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.codegen.AsmUtil; +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; +import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; import org.jetbrains.org.objectweb.asm.MethodVisitor; diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt index 853343ed937..21046e7ad22 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt @@ -35,8 +35,8 @@ import java.io.ByteArrayInputStream import org.jetbrains.kotlin.serialization.DebugProtoBuf import java.util.Arrays import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatibleClassKind -import org.jetbrains.jet.lang.resolve.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind // Set this to true if you want to dump all bytecode (test will fail in this case) val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" From 8d4457f748cdaed3262cdfcc8d18750756d2296f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 00:24:12 +0300 Subject: [PATCH 0246/1557] Rename jet -> kotlin in compiler-tests (except resolve) Move test-related code to org.jetbrains.kotlin.test, also move some tests to packages with better names Original commit: 3b81d633347797926b2a989a64a8d5314bd10c60 --- .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 842ccd9ec46..04a01820fee 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -17,10 +17,10 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.jet.JUnit3RunnerWithInners; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; +import org.jetbrains.kotlin.test.InnerTestClasses; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; import java.io.File; From a790153333af51da265e1ecb37a4f32ba310ec26 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 23 Dec 2014 18:58:12 +0300 Subject: [PATCH 0247/1557] incremental compiler caches: code cleanup and simplification Original commit: 6e9f94d1eafd0761056a80e596cc1f2cc2844034 --- .../kotlin/jps/build/KotlinBuilder.kt | 9 +-- .../jps/incremental/IncrementalCacheImpl.kt | 56 +++++++++---------- .../IncrementalCacheProviderImpl.kt | 2 +- .../IncrementalCacheVersionChangedTest.kt | 2 +- 4 files changed, 35 insertions(+), 34 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1e9a13a32fd..8e3967849c5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -56,6 +56,7 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem import org.jetbrains.kotlin.utils.LibraryUtils +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -88,8 +89,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val dataManager = context.getProjectDescriptor().dataManager - if (chunk.getTargets().any { CacheFormatVersion(File(dataManager.getDataPaths().getTargetDataRoot(it), IncrementalCacheImpl.DIRECTORY_NAME)).isIncompatible() }) { - chunk.getTargets().forEach { dataManager.getStorage(it, IncrementalCacheStorageProvider).clean() } + if (chunk.getTargets().any { dataManager.getDataPaths().getKotlinCacheVersion(it).isIncompatible() }) { + chunk.getTargets().forEach { dataManager.getKotlinCache(it).clean() } return CHUNK_REBUILD_REQUIRED } @@ -100,7 +101,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION) - val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getStorage(it, IncrementalCacheStorageProvider) } + val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getKotlinCache(it) } val environment = createCompileEnvironment(incrementalCaches) if (!environment.success()) { environment.reportErrorsTo(messageCollector) @@ -164,7 +165,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return OK } - private fun createCompileEnvironment(incrementalCaches: Map): CompilerEnvironment { + private fun createCompileEnvironment(incrementalCaches: Map): CompilerEnvironment { val compilerServices = Services.Builder() .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) .build() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index ea16f56a11f..1e1cc3401a3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -42,63 +42,59 @@ import java.io.IOException import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.jps.incremental.storage.BuildDataManager +import org.jetbrains.jps.builders.BuildTarget +import org.jetbrains.jps.builders.storage.BuildDataPaths val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" -public class CacheFormatVersion(val baseDir: File) { +private val CACHE_DIRECTORY_NAME = "kotlin" + + +class CacheFormatVersion(targetDataRoot: File) { class object { // Change this when incremental cache format changes private val INCREMENTAL_CACHE_OWN_VERSION = 1 - val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION - val FORMAT_VERSION_TXT: String = "format-version.txt" + private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION + val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" } - private fun getFile(): File { - return File(baseDir, "format-version.txt") - } + private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) public fun isIncompatible(): Boolean { - val version = load() - return version != -1 && version != CACHE_FORMAT_VERSION - } + if (!file.exists()) return false - private fun load(): Int { - val versionFile = getFile() - if (!versionFile.exists()) return -1 - - return versionFile.readText().toInt() + return file.readText().toInt() != CACHE_FORMAT_VERSION } fun saveIfNeeded() { - val versionFile = getFile() - if (!versionFile.exists()) { - versionFile.writeText(CACHE_FORMAT_VERSION.toString()) + if (!file.exists()) { + file.writeText(CACHE_FORMAT_VERSION.toString()) } } fun clean() { - getFile().delete() + file.delete() } } -public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalCache { +public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, IncrementalCache { class object { - val DIRECTORY_NAME = "kotlin" - val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" val PACKAGE_PARTS = "package-parts.tab" } + private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) private val protoMap = ProtoMap() private val constantsMap = ConstantsMap() private val inlineFunctionsMap = InlineFunctionsMap() private val packagePartMap = PackagePartMap() - private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) + private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) - private val cacheFormatVersion = CacheFormatVersion(baseDir) + private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { if (classFile.extension.toLowerCase() != "class") return DO_NOTHING @@ -510,12 +506,16 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC } } -public object IncrementalCacheStorageProvider : StorageProvider() { - override fun createStorage(targetDataDir: File?): IncrementalCacheImpl { - return IncrementalCacheImpl(File(targetDataDir, IncrementalCacheImpl.DIRECTORY_NAME)) +private val storageProvider = object: StorageProvider() { + override fun createStorage(targetDataDir: File): IncrementalCacheImpl { + return IncrementalCacheImpl(targetDataDir) } } +public fun BuildDataPaths.getKotlinCacheVersion(target: BuildTarget<*>): CacheFormatVersion = CacheFormatVersion(getTargetDataRoot(target)) + +public fun BuildDataManager.getKotlinCache(target: BuildTarget<*>): IncrementalCacheImpl = getStorage(target, storageProvider) + private fun ByteArray.md5(): Long { val d = MessageDigest.getInstance("MD5").digest(this)!! return ((d[0].toLong() and 0xFFL) @@ -530,8 +530,8 @@ private fun ByteArray.md5(): Long { } private object ByteArrayExternalizer: DataExternalizer { - override fun save(out: DataOutput, value: ByteArray?) { - out.writeInt(value!!.size) + override fun save(out: DataOutput, value: ByteArray) { + out.writeInt(value.size()) out.write(value) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt index 34eb8261fac..299432c43ce 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvid import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache -public class IncrementalCacheProviderImpl(caches: Map): IncrementalCacheProvider { +public class IncrementalCacheProviderImpl(caches: Map): IncrementalCacheProvider { private val idToCache = caches.mapKeys { it.key.getId()!! } override fun getIncrementalCache(moduleId: String): IncrementalCache { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt index 1744b5d2c99..fa8aeacc9de 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt @@ -37,7 +37,7 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() { override fun performAdditionalModifications() { val storageForTargetType = BuildDataPathsImpl(myDataStorageRoot).getTargetTypeDataRoot(JavaModuleBuildTargetType.PRODUCTION) - val relativePath = "module/${File.separator}${IncrementalCacheImpl.DIRECTORY_NAME}/${CacheFormatVersion.FORMAT_VERSION_TXT}" + val relativePath = "module/${CacheFormatVersion.FORMAT_VERSION_FILE_PATH}" val cacheVersionFile = File(storageForTargetType, relativePath) assertTrue(cacheVersionFile.exists()) From 641dced1fbdb84f6386650538a4c36ad8667eb42 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 12 Jan 2015 16:29:35 +0300 Subject: [PATCH 0248/1557] Rename org.jetbrains.kotlin.plugin -> org.jetbrains.kotlin.idea Original commit: 17227bb4fe495289caf6702e588d68be4a19753d --- jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml | 2 +- .../kotlin/{plugin => idea}/bare/BareJpsPluginRegistrar.kt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) rename jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/{plugin => idea}/bare/BareJpsPluginRegistrar.kt (95%) diff --git a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml index 7b12e79ab69..e4d5917f809 100644 --- a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml +++ b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml @@ -16,7 +16,7 @@ - org.jetbrains.kotlin.plugin.bare.BareJpsPluginRegistrar + org.jetbrains.kotlin.idea.bare.BareJpsPluginRegistrar diff --git a/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/plugin/bare/BareJpsPluginRegistrar.kt b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt similarity index 95% rename from jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/plugin/bare/BareJpsPluginRegistrar.kt rename to jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt index 188e5b8b1e3..3763e86d5ec 100644 --- a/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/plugin/bare/BareJpsPluginRegistrar.kt +++ b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.jetbrains.kotlin.plugin.bare +package org.jetbrains.kotlin.idea.bare import com.intellij.compiler.server.CompileServerPlugin -import com.intellij.ide.plugins.IdeaPluginDescriptor import com.intellij.ide.plugins.PluginManager import com.intellij.openapi.components.ApplicationComponent import com.intellij.openapi.extensions.Extensions From c5bc52a1b0ff009d948514be49d08dffab151cff Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 16 Jan 2015 20:19:37 +0300 Subject: [PATCH 0249/1557] Updated test data according to changes in IDEA. Original commit: 2b438a286ff1263d651edafddd0a6f67fb6d22c2 --- .../withJava/kotlinUsedInJava/constantChanged/build.log | 3 --- 1 file changed, 3 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index 7cafe0b9fe4..78e27d0e4e4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -5,9 +5,6 @@ End of files Compiling files: src/const.kt End of files -Compiling files: -src/Usage.java -End of files Cleaning output files: out/production/module/Usage.class out/production/module/test/Klass$object.class From 2f3028e45eed1c09ec32bd95ea9fa7ef12869bf2 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 12 Nov 2014 20:19:02 +0300 Subject: [PATCH 0250/1557] Added multi-module tests on incremental compilation. Changing code wasn't required, Java's incremental caches were enough. Original commit: 967f470b1648afde40fe062410e28fc40a16a5ca --- .../jps/build/AbstractIncrementalJpsTest.kt | 6 ++-- .../build/IncrementalJpsTestGenerated.java | 30 +++++++++++++++++++ .../circularDependencyClasses/build.log | 14 +++++++++ .../dependencies.txt | 2 ++ .../circularDependencyClasses/module1_a.kt | 5 ++++ .../circularDependencyClasses/module2_b.kt | 8 +++++ .../module2_b.kt.new | 11 +++++++ .../multiModule/simpleDependency/build.log | 15 ++++++++++ .../simpleDependency/dependencies.txt | 2 ++ .../multiModule/simpleDependency/module1_a.kt | 6 ++++ .../simpleDependency/module1_a.kt.new | 7 +++++ .../multiModule/simpleDependency/module2_b.kt | 5 ++++ .../simpleDependencyUnchanged/build.log | 8 +++++ .../dependencies.txt | 2 ++ .../simpleDependencyUnchanged/module1_a.kt | 7 +++++ .../module1_a.kt.new | 7 +++++ .../simpleDependencyUnchanged/module2_b.kt | 5 ++++ .../transitiveDependency/build.log | 15 ++++++++++ .../transitiveDependency/dependencies.txt | 3 ++ .../transitiveDependency/module1_a.kt | 6 ++++ .../transitiveDependency/module1_a.kt.new | 7 +++++ .../transitiveDependency/module2_b.kt | 9 ++++++ .../transitiveDependency/module3_c.kt | 5 ++++ .../multiModule/twoDependants/build.log | 22 ++++++++++++++ .../twoDependants/dependencies.txt | 3 ++ .../multiModule/twoDependants/module1_a.kt | 6 ++++ .../twoDependants/module1_a.kt.new | 7 +++++ .../multiModule/twoDependants/module2_b.kt | 5 ++++ .../multiModule/twoDependants/module3_c.kt | 5 ++++ 29 files changed, 231 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependency/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module3_c.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/twoDependants/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/twoDependants/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/twoDependants/module3_c.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 54c7769a8af..55ff1b7858f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -36,6 +36,8 @@ import org.jetbrains.jps.incremental.messages.BuildMessage import kotlin.test.assertFalse import java.util.regex.Pattern import kotlin.test.assertEquals +import org.jetbrains.jps.model.java.JpsJavaDependencyExtension +import org.jetbrains.jps.model.JpsModuleRootModificationUtil public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { class object { @@ -182,7 +184,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { for (line in dependenciesTxt.readLines()) { val split = line.split("->") val module = split[0] - val dependencies = split[1].split(",") + val dependencies = if (split.size > 1) split[1].split(",") else array() result[module] = dependencies.toList() } @@ -253,7 +255,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { for ((moduleName, dependencies) in moduleDependencies) { val module = nameToModule[moduleName]!! for (dependency in dependencies) { - module.getDependenciesList().addModuleDependency(nameToModule[dependency]!!) + JpsModuleRootModificationUtil.addDependency(module, nameToModule[dependency]) } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 04a01820fee..254a7d209bc 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -40,12 +40,42 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("circularDependencyClasses") + public void testCircularDependencyClasses() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyClasses/"); + doTest(fileName); + } + @TestMetadata("circularDependencyTopLevelFunctions") public void testCircularDependencyTopLevelFunctions() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); doTest(fileName); } + @TestMetadata("simpleDependency") + public void testSimpleDependency() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); + doTest(fileName); + } + + @TestMetadata("simpleDependencyUnchanged") + public void testSimpleDependencyUnchanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"); + doTest(fileName); + } + + @TestMetadata("transitiveDependency") + public void testTransitiveDependency() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveDependency/"); + doTest(fileName); + } + + @TestMetadata("twoDependants") + public void testTwoDependants() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); + doTest(fileName); + } + } @TestMetadata("jps-plugin/testData/incremental/pureKotlin") diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log new file mode 100644 index 00000000000..6d84c7b51a9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module2/b/B.class +out/production/module2/b/BB.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +Cleaning output files: +out/production/module1/a/A.class +out/production/module1/a/AA.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/dependencies.txt new file mode 100644 index 00000000000..02d5c8ca1a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/dependencies.txt @@ -0,0 +1,2 @@ +module1->module2 +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module1_a.kt new file mode 100644 index 00000000000..653e6a5b31f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module1_a.kt @@ -0,0 +1,5 @@ +package a + +open class A + +class AA: b.BB() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt new file mode 100644 index 00000000000..1cc0414c989 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt @@ -0,0 +1,8 @@ +package b + +class B: a.A() { +} + +open class BB { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt.new b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt.new new file mode 100644 index 00000000000..dd98580a43e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/module2_b.kt.new @@ -0,0 +1,11 @@ +package b + +class B: a.A() { + fun f() { + } +} + +open class BB { + fun f() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log new file mode 100644 index 00000000000..ec0b0e5da7c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module1/a/A.class +out/production/module1/a/APackage$module1_a$*.class +out/production/module1/a/APackage.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/b/BPackage$module2_b$*.class +out/production/module2/b/BPackage.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt new file mode 100644 index 00000000000..a3470c00a84 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt @@ -0,0 +1,6 @@ +package a + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt.new new file mode 100644 index 00000000000..38e7ea70acf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module1_a.kt.new @@ -0,0 +1,7 @@ +package a + +class A + +fun a(): String { + return ":)" +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_b.kt new file mode 100644 index 00000000000..5c19b61add7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_b.kt @@ -0,0 +1,5 @@ +package b + +fun b(param: a.A) { + a.a() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log new file mode 100644 index 00000000000..490a4ad2f8a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module1/a/A.class +out/production/module1/a/APackage$module1_a$*.class +out/production/module1/a/APackage.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt new file mode 100644 index 00000000000..3f615e23d4e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt @@ -0,0 +1,7 @@ +package a + +class A + +fun a() { + println("I'm an old body") +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt.new new file mode 100644 index 00000000000..8579ae24e37 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module1_a.kt.new @@ -0,0 +1,7 @@ +package a + +class A + +fun a() { + println("I'm a new body") +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module2_b.kt new file mode 100644 index 00000000000..5c19b61add7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/module2_b.kt @@ -0,0 +1,5 @@ +package b + +fun b(param: a.A) { + a.a() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log new file mode 100644 index 00000000000..ec0b0e5da7c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module1/a/A.class +out/production/module1/a/APackage$module1_a$*.class +out/production/module1/a/APackage.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/b/BPackage$module2_b$*.class +out/production/module2/b/BPackage.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/dependencies.txt new file mode 100644 index 00000000000..0341c1ffd5c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3->module2 diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt new file mode 100644 index 00000000000..a3470c00a84 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt @@ -0,0 +1,6 @@ +package a + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt.new new file mode 100644 index 00000000000..38e7ea70acf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module1_a.kt.new @@ -0,0 +1,7 @@ +package a + +class A + +fun a(): String { + return ":)" +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module2_b.kt new file mode 100644 index 00000000000..64f75565c38 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module2_b.kt @@ -0,0 +1,9 @@ +package b + +fun b(param: a.A) { + a.a() +} + +fun bb() { + +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module3_c.kt b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module3_c.kt new file mode 100644 index 00000000000..e45bff75ab8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/module3_c.kt @@ -0,0 +1,5 @@ +package c + +fun c() { + b.bb() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log new file mode 100644 index 00000000000..0bcfc0ab0e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -0,0 +1,22 @@ +Cleaning output files: +out/production/module1/a/A.class +out/production/module1/a/APackage$module1_a$*.class +out/production/module1/a/APackage.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module3/c/CPackage$module3_c$*.class +out/production/module3/c/CPackage.class +End of files +Compiling files: +module3/src/module3_c.kt +End of files +Cleaning output files: +out/production/module2/b/BPackage$module2_b$*.class +out/production/module2/b/BPackage.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/dependencies.txt new file mode 100644 index 00000000000..1365e57e135 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt new file mode 100644 index 00000000000..a3470c00a84 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt @@ -0,0 +1,6 @@ +package a + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt.new new file mode 100644 index 00000000000..38e7ea70acf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module1_a.kt.new @@ -0,0 +1,7 @@ +package a + +class A + +fun a(): String { + return ":)" +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module2_b.kt new file mode 100644 index 00000000000..5c19b61add7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module2_b.kt @@ -0,0 +1,5 @@ +package b + +fun b(param: a.A) { + a.a() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module3_c.kt b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module3_c.kt new file mode 100644 index 00000000000..68a8f9a70f0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/module3_c.kt @@ -0,0 +1,5 @@ +package c + +fun c(param: a.A) { + a.a() +} From 72fdd2c6bab4ddc7ab08a6c961429b648ce9d6af Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 13 Nov 2014 19:11:56 +0300 Subject: [PATCH 0251/1557] Test with Java and Kotlin changed simultaneously. Original commit: 00f2ba5124202e30834770ab5e0579b699dca494 --- .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../javaAndKotlinChangedSimultaneously/JavaClass.java | 4 ++++ .../JavaClass.java.new | 7 +++++++ .../javaAndKotlinChangedSimultaneously/build.log | 11 +++++++++++ .../javaAndKotlinChangedSimultaneously/usage.kt | 3 +++ .../javaAndKotlinChangedSimultaneously/usage.kt.new | 4 ++++ 6 files changed, 35 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 254a7d209bc..dc3279a3245 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -436,6 +436,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("javaAndKotlinChangedSimultaneously") + public void testJavaAndKotlinChangedSimultaneously() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/"); + doTest(fileName); + } + @TestMetadata("methodAddedInSuper") public void testMethodAddedInSuper() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/"); diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java new file mode 100644 index 00000000000..3d21230b981 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java @@ -0,0 +1,4 @@ +public class JavaClass { + public void foo() { + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new new file mode 100644 index 00000000000..55262a600a8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/JavaClass.java.new @@ -0,0 +1,7 @@ +public class JavaClass { + public void foo() { + } + + public void bar() { + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log new file mode 100644 index 00000000000..3a58b62b68c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/JavaClass.class +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files +Compiling files: +src/JavaClass.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt new file mode 100644 index 00000000000..8285440f8f2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + JavaClass().foo() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new new file mode 100644 index 00000000000..e1200efb2d2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/usage.kt.new @@ -0,0 +1,4 @@ +fun main(args: Array) { + JavaClass().foo() + JavaClass().bar() +} \ No newline at end of file From 41522a3b65b871c065581fa02da7811aee472229 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 26 Nov 2014 19:04:59 +0300 Subject: [PATCH 0252/1557] Rebuilding dependent modules. Original commit: 72687758a55b45c186839c2eba0c0b7265487e54 --- .../kotlin/jps/build/KotlinBuilder.kt | 6 ++-- .../build/IncrementalJpsTestGenerated.java | 24 +++++++++++++++ .../constantValueChanged/build.log | 13 ++++++++ .../constantValueChanged/dependencies.txt | 2 ++ .../constantValueChanged/module1_const.kt | 3 ++ .../constantValueChanged/module1_const.kt.new | 3 ++ .../constantValueChanged/module2_usage.kt | 4 +++ .../inlineFunctionChanged/build.log | 23 ++++++++++++++ .../inlineFunctionChanged/dependencies.txt | 2 ++ .../inlineFunctionChanged/module1_inline.kt | 6 ++++ .../module1_inline.kt.new | 6 ++++ .../inlineFunctionChanged/module1_other.kt | 4 +++ .../inlineFunctionChanged/module2_usage.kt | 5 ++++ .../inlineFunctionInlined/build.log | 23 ++++++++++++++ .../inlineFunctionInlined/dependencies.txt | 2 ++ .../inlineFunctionInlined/module1_inline.kt | 6 ++++ .../module1_inline.kt.new | 6 ++++ .../inlineFunctionInlined/module1_other.kt | 4 +++ .../inlineFunctionInlined/module2_usage.kt | 6 ++++ .../multiModule/transitiveInlining/build.log | 30 +++++++++++++++++++ .../transitiveInlining/dependencies.txt | 3 ++ .../transitiveInlining/module1_a.kt | 6 ++++ .../transitiveInlining/module1_a.kt.new | 6 ++++ .../transitiveInlining/module1_other.kt | 4 +++ .../transitiveInlining/module2_b.kt | 6 ++++ .../transitiveInlining/module3_c.kt | 6 ++++ 26 files changed, 206 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_other.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_other.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module2_usage.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_other.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module3_c.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 8e3967849c5..1da4e83c697 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -151,11 +151,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (IncrementalCompilation.ENABLED) { if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { allCompiledFiles.clear() - return CHUNK_REBUILD_REQUIRED + val targetsCompletelyMarkedDirty = FSOperations.getTargetsCompletelyMarkedDirty(context) + FSOperations.markDirtyRecursively(context, chunk) } if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.COMPILE_OTHERS) { - // TODO should mark dependencies as dirty, as well - FSOperations.markDirty(context, chunk, { file -> + FSOperations.markDirtyRecursively(context, chunk, { file -> KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles }) } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index dc3279a3245..9db726d6502 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -52,6 +52,24 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("constantValueChanged") + public void testConstantValueChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionChanged") + public void testInlineFunctionChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionInlined") + public void testInlineFunctionInlined() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); + doTest(fileName); + } + @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); @@ -70,6 +88,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("transitiveInlining") + public void testTransitiveInlining() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveInlining/"); + doTest(fileName); + } + @TestMetadata("twoDependants") public void testTwoDependants() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log new file mode 100644 index 00000000000..3d42c783058 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module1/test/TestPackage$module1_const$*.class +out/production/module1/test/TestPackage.class +End of files +Compiling files: +module1/src/module1_const.kt +End of files +Cleaning output files: +out/production/module2/usage/Usage.class +End of files +Compiling files: +module2/src/module2_usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt new file mode 100644 index 00000000000..e79d6d05129 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt @@ -0,0 +1,3 @@ +package test + +public val CONST: String = "BF" diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new new file mode 100644 index 00000000000..d6250846ebf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new @@ -0,0 +1,3 @@ +package test + +public val CONST: String = "Ae" diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt new file mode 100644 index 00000000000..50c87e8aeb3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt @@ -0,0 +1,4 @@ +package usage + +deprecated(test.CONST + test.CONST) +class Usage diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log new file mode 100644 index 00000000000..54958ea07a8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module1/inline/InlinePackage$module1_inline$*.class +out/production/module1/inline/InlinePackage.class +End of files +Compiling files: +module1/src/module1_inline.kt +End of files +Cleaning output files: +out/production/module1/inline/InlinePackage$module1_inline$*.class +out/production/module1/inline/InlinePackage$module1_other$*.class +out/production/module1/inline/InlinePackage.class +End of files +Compiling files: +module1/src/module1_inline.kt +module1/src/module1_other.kt +End of files +Cleaning output files: +out/production/module2/usage/UsagePackage$module2_usage$*.class +out/production/module2/usage/UsagePackage.class +End of files +Compiling files: +module2/src/module2_usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt.new b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt.new new file mode 100644 index 00000000000..87422d45d88 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt.new @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + body() + println("i'm inline function") +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_other.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_other.kt new file mode 100644 index 00000000000..4af04d89ad7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_other.kt @@ -0,0 +1,4 @@ +package inline + +fun other() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt new file mode 100644 index 00000000000..3f8161245b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + inline.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log new file mode 100644 index 00000000000..54958ea07a8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module1/inline/InlinePackage$module1_inline$*.class +out/production/module1/inline/InlinePackage.class +End of files +Compiling files: +module1/src/module1_inline.kt +End of files +Cleaning output files: +out/production/module1/inline/InlinePackage$module1_inline$*.class +out/production/module1/inline/InlinePackage$module1_other$*.class +out/production/module1/inline/InlinePackage.class +End of files +Compiling files: +module1/src/module1_inline.kt +module1/src/module1_other.kt +End of files +Cleaning output files: +out/production/module2/usage/UsagePackage$module2_usage$*.class +out/production/module2/usage/UsagePackage.class +End of files +Compiling files: +module2/src/module2_usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt.new b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt.new new file mode 100644 index 00000000000..87422d45d88 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_inline.kt.new @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + body() + println("i'm inline function") +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_other.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_other.kt new file mode 100644 index 00000000000..4af04d89ad7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module1_other.kt @@ -0,0 +1,4 @@ +package inline + +fun other() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module2_usage.kt new file mode 100644 index 00000000000..8e3cf423a25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/module2_usage.kt @@ -0,0 +1,6 @@ +package usage + +inline fun inlineUsage(body: () -> Unit) { + inline.f { println("to be inlined") } + body() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log new file mode 100644 index 00000000000..4a046b83b59 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -0,0 +1,30 @@ +Cleaning output files: +out/production/module1/a/APackage$module1_a$*.class +out/production/module1/a/APackage.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module1/a/APackage$module1_a$*.class +out/production/module1/a/APackage$module1_other$*.class +out/production/module1/a/APackage.class +End of files +Compiling files: +module1/src/module1_a.kt +module1/src/module1_other.kt +End of files +Cleaning output files: +out/production/module2/b/BPackage$module2_b$*.class +out/production/module2/b/BPackage.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +Cleaning output files: +out/production/module3/c/CPackage$module3_c$*.class +out/production/module3/c/CPackage.class +End of files +Compiling files: +module3/src/module3_c.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/dependencies.txt new file mode 100644 index 00000000000..0341c1ffd5c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3->module2 diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt new file mode 100644 index 00000000000..cbd343133d9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt @@ -0,0 +1,6 @@ +package a + +inline fun a(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt.new new file mode 100644 index 00000000000..7b25135b533 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_a.kt.new @@ -0,0 +1,6 @@ +package a + +inline fun a(body: () -> Unit) { + println("i am inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_other.kt b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_other.kt new file mode 100644 index 00000000000..7e2bad9ae9f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module1_other.kt @@ -0,0 +1,4 @@ +package a + +fun other() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module2_b.kt new file mode 100644 index 00000000000..00b43177b18 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module2_b.kt @@ -0,0 +1,6 @@ +package b + +inline fun b(body: () -> Unit) { + a.a { println("to be inlined into b") } + body() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module3_c.kt b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module3_c.kt new file mode 100644 index 00000000000..799cfd1e836 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/module3_c.kt @@ -0,0 +1,6 @@ +package c + +inline fun c(body: () -> Unit) { + b.b { println("to be inlined into b") } + body() +} From fadeb20c5c763b71c04746bde95fa37ea318e29b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 28 Nov 2014 16:25:06 +0300 Subject: [PATCH 0253/1557] Rebuilding dependants fully only when constants/inline functions changed. This is not 100% precise, but it is faster. It is a compromise until we implement preciser incremental compilation. Original commit: c60797e306b7d4dac5c1a54cc66931ccbe017dc4 --- .../kotlin/jps/build/KotlinBuilder.kt | 31 ++++++++++++------- .../jps/incremental/IncrementalCacheImpl.kt | 23 +++++++++++--- .../multiModule/simpleDependency/module2_c.kt | 5 +++ 3 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_c.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1da4e83c697..44f30bef277 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -54,9 +54,12 @@ import org.jetbrains.jps.builders.java.JavaBuilderUtil import com.intellij.util.containers.MultiMap import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject +import java.io.FileFilter +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.* import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem import org.jetbrains.kotlin.utils.LibraryUtils import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.jps.incremental.fs.CompilationRound public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -133,7 +136,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val recompilationDecision: IncrementalCacheImpl.RecompilationDecision if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { - recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING + recompilationDecision = DO_NOTHING } else { recompilationDecision = updateKotlinIncrementalCache(compilationErrors, dirtyFilesHolder, incrementalCaches, outputsItemsAndTargets) @@ -149,15 +152,21 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (IncrementalCompilation.ENABLED) { - if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL) { - allCompiledFiles.clear() - val targetsCompletelyMarkedDirty = FSOperations.getTargetsCompletelyMarkedDirty(context) - FSOperations.markDirtyRecursively(context, chunk) + val fileFilter = FileFilter { file -> + KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles } - if (recompilationDecision == IncrementalCacheImpl.RecompilationDecision.COMPILE_OTHERS) { - FSOperations.markDirtyRecursively(context, chunk, { file -> - KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles - }) + + when (recompilationDecision) { + RECOMPILE_ALL_CHUNK_AND_DEPENDANTS -> { + allCompiledFiles.clear() + FSOperations.markDirtyRecursively(context, chunk) + } + RECOMPILE_OTHERS_WITH_DEPENDANTS -> { + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, fileFilter) + } + RECOMPILE_OTHERS_IN_CHUNK -> { + FSOperations.markDirty(context, chunk, fileFilter) + } } return ADDITIONAL_PASS_REQUIRED } @@ -254,7 +263,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR outputsItemsAndTargets: List> ): IncrementalCacheImpl.RecompilationDecision { if (!IncrementalCompilation.ENABLED) { - return IncrementalCacheImpl.RecompilationDecision.DO_NOTHING + return DO_NOTHING } for ((target, cache) in incrementalCaches) { @@ -265,7 +274,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ) } - var recompilationDecision = IncrementalCacheImpl.RecompilationDecision.DO_NOTHING + var recompilationDecision = DO_NOTHING for ((outputItem, target) in outputsItemsAndTargets) { val newDecision = incrementalCaches[target]!!.saveFileToCache(outputItem.getSourceFiles(), outputItem.getOutputFile()) recompilationDecision = recompilationDecision.merge(newDecision) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 1e1cc3401a3..9871da6f3fc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -113,26 +113,38 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment val data = BitEncoding.decodeBytes(annotationDataEncoded) when { header.isCompatiblePackageFacadeKind() -> { - return if (protoMap.put(className, data)) COMPILE_OTHERS else DO_NOTHING + return if (protoMap.put(className, data)) RECOMPILE_OTHERS_IN_CHUNK else DO_NOTHING } header.isCompatibleClassKind() -> { val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) val protoChanged = protoMap.put(className, data) val constantsChanged = constantsMap.process(className, fileBytes) - return if (inlinesChanged) RECOMPILE_ALL else if (protoChanged || constantsChanged) COMPILE_OTHERS else DO_NOTHING + return when { + inlinesChanged -> RECOMPILE_ALL_CHUNK_AND_DEPENDANTS + constantsChanged -> RECOMPILE_OTHERS_WITH_DEPENDANTS + protoChanged -> RECOMPILE_OTHERS_IN_CHUNK + else -> DO_NOTHING + } } else -> { throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}, isCompatible: ${header.isCompatibleAbiVersion}") } } } + if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } + packagePartMap.putPackagePartSourceData(sourceFiles.first(), className) val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) val constantsChanged = constantsMap.process(className, fileBytes) - return if (inlinesChanged) RECOMPILE_ALL else if (constantsChanged) COMPILE_OTHERS else DO_NOTHING + + return when { + inlinesChanged -> RECOMPILE_ALL_CHUNK_AND_DEPENDANTS + constantsChanged -> RECOMPILE_OTHERS_WITH_DEPENDANTS + else -> DO_NOTHING + } } return DO_NOTHING @@ -497,8 +509,9 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment enum class RecompilationDecision { DO_NOTHING - COMPILE_OTHERS - RECOMPILE_ALL + RECOMPILE_OTHERS_IN_CHUNK + RECOMPILE_OTHERS_WITH_DEPENDANTS + RECOMPILE_ALL_CHUNK_AND_DEPENDANTS fun merge(other: RecompilationDecision): RecompilationDecision { return if (other.ordinal() > this.ordinal()) other else this diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_c.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_c.kt new file mode 100644 index 00000000000..c4fab8fb00b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/module2_c.kt @@ -0,0 +1,5 @@ +package c + +fun c() { + // This file doesn't use anything from module1, so it won't be recompiled after change +} \ No newline at end of file From 183a056c101773de6cefee7dda2e4d4607b2edbb Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 27 Jan 2015 16:43:01 +0300 Subject: [PATCH 0254/1557] Added workaround for linkage error in IDEA 14.0-14.0.2 Original commit: a6362dda225e8af74e2460d7366a4bc477d4692d --- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 44f30bef277..3c3aa7470ab 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -162,7 +162,15 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR FSOperations.markDirtyRecursively(context, chunk) } RECOMPILE_OTHERS_WITH_DEPENDANTS -> { - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, fileFilter) + // Workaround for IDEA 14.0-14.0.2: extended version of markDirtyRecursively is not available + try { + Class.forName("org.jetbrains.jps.incremental.fs.CompilationRound") + + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, fileFilter) + } catch (e: ClassNotFoundException) { + allCompiledFiles.clear() + FSOperations.markDirtyRecursively(context, chunk) + } } RECOMPILE_OTHERS_IN_CHUNK -> { FSOperations.markDirty(context, chunk, fileFilter) From 2be92c8bedd38fe88c565c9e834050b70bdbae72 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 21 Jan 2015 19:21:30 +0300 Subject: [PATCH 0255/1557] Minor, don't add external annotation roots multiple times Original commit: eb3588bd0ad4288a0a72c640912809c9edb3e2d0 --- .../KotlinBuilderModuleScriptGenerator.java | 26 +++---------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index cd90906e6c8..1da65710ab5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; +import kotlin.KotlinPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.ModuleChunk; @@ -34,7 +35,6 @@ import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.library.sdk.JpsSdkType; import org.jetbrains.jps.model.module.JpsDependencyElement; -import org.jetbrains.jps.model.module.JpsLibraryDependency; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsSdkDependency; import org.jetbrains.kotlin.config.IncrementalCompilation; @@ -60,9 +60,7 @@ public class KotlinBuilderModuleScriptGenerator { ModuleChunk chunk, MultiMap sourceFiles, // ignored for non-incremental compilation boolean hasRemovedFiles - ) - throws IOException, ProjectBuildException - { + ) throws IOException, ProjectBuildException { KotlinModuleDescriptionBuilder builder = FACTORY.create(); boolean noSources = true; @@ -130,7 +128,6 @@ public class KotlinBuilderModuleScriptGenerator { @NotNull private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { - return getAllDependencies(target).classes().getRoots(); } @@ -149,7 +146,7 @@ public class KotlinBuilderModuleScriptGenerator { @NotNull private static List findAnnotationRoots(@NotNull ModuleBuildTarget target) { - List annotationRootFiles = ContainerUtil.newArrayList(); + LinkedHashSet annotationRootFiles = new LinkedHashSet(); JpsModule module = target.getModule(); JpsSdk sdk = module.getSdk(getSdkType(module)); @@ -171,7 +168,7 @@ public class KotlinBuilderModuleScriptGenerator { } } - return annotationRootFiles; + return KotlinPackage.toList(annotationRootFiles); } @NotNull @@ -184,20 +181,5 @@ public class KotlinBuilderModuleScriptGenerator { return JpsJavaSdkType.INSTANCE; } - @Nullable - private static JpsLibrary getLibrary(@NotNull JpsDependencyElement dependencyElement) { - if (dependencyElement instanceof JpsSdkDependency) { - JpsSdkDependency sdkDependency = (JpsSdkDependency) dependencyElement; - return sdkDependency.resolveSdk(); - } - - if (dependencyElement instanceof JpsLibraryDependency) { - JpsLibraryDependency libraryDependency = (JpsLibraryDependency) dependencyElement; - return libraryDependency.getLibrary(); - } - - return null; - } - private KotlinBuilderModuleScriptGenerator() {} } From e98c929be69264008e5d7a2c4319dfe4dd2f7585 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 22 Jan 2015 16:40:01 +0300 Subject: [PATCH 0256/1557] Modules.xml: add Java sources right after Kotlin sources Java sources should appear before classpath dependencies because they should have higher priority if the same symbol is located in the module source and in the classpath. This is so because by default module source has the highest priority in IDEA except the JDK. Ideally this will be handled later by full support of modules in the compiler Original commit: fa2116040e9673f1807dbfa0052c37a9245d4d90 --- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 1da65710ab5..46b8b5828f5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -89,8 +89,9 @@ public class KotlinBuilderModuleScriptGenerator { builder.addModule( target.getId(), outputDir.getAbsolutePath(), - getKotlinModuleDependencies(context, target), + getKotlinModuleDependencies(target), moduleSources, + findSourceRoots(context, target), target.isTests(), // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs @@ -115,12 +116,11 @@ public class KotlinBuilderModuleScriptGenerator { return outputDir; } - private static DependencyProvider getKotlinModuleDependencies(final CompileContext context, final ModuleBuildTarget target) { + private static DependencyProvider getKotlinModuleDependencies(final ModuleBuildTarget target) { return new DependencyProvider() { @Override public void processClassPath(@NotNull DependencyProcessor processor) { processor.processClassPathSection("Classpath", findClassPathRoots(target)); - processor.processClassPathSection("Java Source Roots", findSourceRoots(context, target)); processor.processAnnotationRoots(findAnnotationRoots(target)); } }; @@ -132,9 +132,9 @@ public class KotlinBuilderModuleScriptGenerator { } @NotNull - private static Collection findSourceRoots(@NotNull CompileContext context, @NotNull ModuleBuildTarget target) { + private static List findSourceRoots(@NotNull CompileContext context, @NotNull ModuleBuildTarget target) { List roots = context.getProjectDescriptor().getBuildRootIndex().getTargetRoots(target, context); - Collection result = ContainerUtil.newArrayList(); + List result = ContainerUtil.newArrayList(); for (JavaSourceRootDescriptor root : roots) { File file = root.getRootFile(); if (file.exists()) { From 8436a8e1194c065537661908240c0a2b29bf1209 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 22 Jan 2015 17:16:06 +0300 Subject: [PATCH 0257/1557] Simplify code in module script/xml generation Pass classpath and annotation roots explicitly instead of wrapped in a callback Original commit: 3ea59117aca9346a54f4bdb5bafd0ee9e56cb302 --- .../build/KotlinBuilderModuleScriptGenerator.java | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 46b8b5828f5..de324ea1d05 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -47,8 +47,6 @@ import java.io.IOException; import java.util.*; import static org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies; -import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProcessor; -import static org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder.DependencyProvider; public class KotlinBuilderModuleScriptGenerator { @@ -89,9 +87,10 @@ public class KotlinBuilderModuleScriptGenerator { builder.addModule( target.getId(), outputDir.getAbsolutePath(), - getKotlinModuleDependencies(target), moduleSources, findSourceRoots(context, target), + findClassPathRoots(target), + findAnnotationRoots(target), target.isTests(), // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs @@ -116,16 +115,6 @@ public class KotlinBuilderModuleScriptGenerator { return outputDir; } - private static DependencyProvider getKotlinModuleDependencies(final ModuleBuildTarget target) { - return new DependencyProvider() { - @Override - public void processClassPath(@NotNull DependencyProcessor processor) { - processor.processClassPathSection("Classpath", findClassPathRoots(target)); - processor.processAnnotationRoots(findAnnotationRoots(target)); - } - }; - } - @NotNull private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { return getAllDependencies(target).classes().getRoots(); From ecae29aa3c9b6b8ef08740426cb632d1ba109513 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 27 Jan 2015 22:35:13 +0300 Subject: [PATCH 0258/1557] Reorder and optimize dependencies between modules and libraries - drop 'kotlin-runtime' and other dependencies which are exported by other modules ('util' and 'util.runtime' in case of 'kotlin-runtime') - make all Kotlin modules from the compiler depend on 'util' for clarity - put 'util' and 'util.runtime' to the bottom of the list everywhere: when kotlin-runtime gets reflection, classes from core/ should have higher priority than their previous versions from kotlin-runtime.jar Original commit: 5903b8c4a7861087d2ad4982fc6b72b996a107ca --- jps/jps-plugin/bare-plugin/bare-plugin.iml | 7 +++---- jps/jps-plugin/jps-plugin.iml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/bare-plugin/bare-plugin.iml b/jps/jps-plugin/bare-plugin/bare-plugin.iml index 80ba7107224..feff85211d8 100644 --- a/jps/jps-plugin/bare-plugin/bare-plugin.iml +++ b/jps/jps-plugin/bare-plugin/bare-plugin.iml @@ -7,9 +7,8 @@ - - + + - - + \ No newline at end of file diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index a4e8a5a1756..6878e4f6683 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -10,16 +10,16 @@ - - + + \ No newline at end of file From 7e4998684770f843f5eb7e95e1cd88dd4f72f424 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 28 Jan 2015 14:05:26 +0300 Subject: [PATCH 0259/1557] Simple changing temp directory in JPS test for easier debugging. Original commit: 1e3558afc689c54976a525ec8cd53ca4678a4372 --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 55ff1b7858f..70b954886d4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -38,10 +38,14 @@ import java.util.regex.Pattern import kotlin.test.assertEquals import org.jetbrains.jps.model.java.JpsJavaDependencyExtension import org.jetbrains.jps.model.JpsModuleRootModificationUtil +import com.intellij.openapi.util.io.FileUtilRt public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { class object { val COMPILATION_FAILED = "COMPILATION FAILED" + + // change to "/tmp" or anything when default is too long (for easier debugging) + val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) } private var testDataDir: File by Delegates.notNull() @@ -198,7 +202,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } testDataDir = File(testDataPath) - workDir = FileUtil.createTempDirectory("jps-build", null) + workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) val moduleNames = configureModules() initialMake() From 09715786fec542e10c14d12a0586a9af49075538 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 29 Jan 2015 21:58:57 +0300 Subject: [PATCH 0260/1557] Minor. Swapped test data. "other" and "same" packages were confused. Original commit: c1b6e3a63de383107fdd94d9daa74fd55c2c1989 --- .../compilationErrorThenFixedOtherPackage/build.log | 8 ++------ .../compilationErrorThenFixedOtherPackage/fun.kt | 2 ++ .../compilationErrorThenFixedOtherPackage/usage.kt | 4 +++- .../compilationErrorThenFixedOtherPackage/usage.kt.new.1 | 4 +++- .../compilationErrorThenFixedOtherPackage/usage.kt.new.2 | 4 +++- .../compilationErrorThenFixedSamePackage/build.log | 8 ++++++-- .../compilationErrorThenFixedSamePackage/fun.kt | 2 -- .../compilationErrorThenFixedSamePackage/usage.kt | 4 +--- .../compilationErrorThenFixedSamePackage/usage.kt.new.1 | 4 +--- .../compilationErrorThenFixedSamePackage/usage.kt.new.2 | 4 +--- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index 1e9444f5d38..65aedde795b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class -out/production/module/_DefaultPackage.class +out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt @@ -9,10 +9,6 @@ COMPILATION FAILED Expecting an expression -Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class -End of files Compiling files: -src/fun.kt src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt index 99cec0dbea1..2171b8f5fcf 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/fun.kt @@ -1,2 +1,4 @@ +package f + fun f() { } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt index 05a6473592e..406f84ac5b6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt @@ -1,3 +1,5 @@ +package usage + fun main(args: Array) { - f() + f.f() } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 index c7eec515ee8..568fde17ee6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.1 @@ -1,3 +1,5 @@ +package usage + fun main(args: Array) { - f( + f.f( } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 index 05a6473592e..406f84ac5b6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/usage.kt.new.2 @@ -1,3 +1,5 @@ +package usage + fun main(args: Array) { - f() + f.f() } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 65aedde795b..1e9444f5d38 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class -out/production/module/usage/UsagePackage.class +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt @@ -9,6 +9,10 @@ COMPILATION FAILED Expecting an expression +Cleaning output files: +out/production/module/_DefaultPackage$fun$*.class +End of files Compiling files: +src/fun.kt src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt index 2171b8f5fcf..99cec0dbea1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/fun.kt @@ -1,4 +1,2 @@ -package f - fun f() { } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt index 406f84ac5b6..05a6473592e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt @@ -1,5 +1,3 @@ -package usage - fun main(args: Array) { - f.f() + f() } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 index 568fde17ee6..c7eec515ee8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.1 @@ -1,5 +1,3 @@ -package usage - fun main(args: Array) { - f.f( + f( } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 index 406f84ac5b6..05a6473592e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/usage.kt.new.2 @@ -1,5 +1,3 @@ -package usage - fun main(args: Array) { - f.f() + f() } \ No newline at end of file From 561af169749a3ebc805e55331b555d4142214a25 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Feb 2015 16:47:14 +0300 Subject: [PATCH 0261/1557] Minor. Green code. Original commit: 84ca0a5b4e76cb344380278dd7b68ce55969a477 --- .../jps/incremental/IncrementalCacheImpl.kt | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 9871da6f3fc..7791427fc3a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -134,7 +134,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { - assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } + assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.putPackagePartSourceData(sourceFiles.first(), className) val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) @@ -307,7 +307,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment private object ConstantsMapExternalizer: DataExternalizer> { override fun save(out: DataOutput, map: Map?) { - out.writeInt(map!!.size) + out.writeInt(map!!.size()) for (name in map.keySet().toSortedList()) { IOUtil.writeString(name, out) val value = map[name]!! @@ -425,7 +425,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment private object InlineFunctionsMapExternalizer: DataExternalizer> { override fun save(out: DataOutput, map: Map?) { - out.writeInt(map!!.size) + out.writeInt(map!!.size()) for (name in map.keySet()) { IOUtil.writeString(name, out) out.writeLong(map[name]!!) @@ -489,22 +489,6 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment return result } - - public fun getPackages(): Set { - val result = HashSet() - - storage.processKeysWithExistingMapping { key -> - val packagePartClassName = storage[key!!]!! - - val packageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() - - result.add(packageFqName) - - true - } - - return result - } } enum class RecompilationDecision { From cfaaeb811829003b4c33490e1fce5028972681f9 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Feb 2015 17:15:57 +0300 Subject: [PATCH 0262/1557] Minor. Green code and formatting. Original commit: 512ea72e695f13054b4062e5512a849658bfcaa9 --- .../jps/incremental/IncrementalCacheImpl.kt | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7791427fc3a..8056f2536a2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -78,7 +78,7 @@ class CacheFormatVersion(targetDataRoot: File) { } } -public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, IncrementalCache { +public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache { class object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" @@ -87,10 +87,10 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) - private val protoMap = ProtoMap() - private val constantsMap = ConstantsMap() - private val inlineFunctionsMap = InlineFunctionsMap() - private val packagePartMap = PackagePartMap() + private val protoMap = ProtoMap() + private val constantsMap = ConstantsMap() + private val inlineFunctionsMap = InlineFunctionsMap() + private val packagePartMap = PackagePartMap() private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) @@ -98,7 +98,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { if (classFile.extension.toLowerCase() != "class") return DO_NOTHING - + cacheFormatVersion.saveIfNeeded() val kotlinClass = LocalFileKotlinClass.create(classFile) @@ -217,7 +217,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private abstract class ClassFileBasedMap: BasicMap() { + private abstract class ClassFileBasedMap : BasicMap() { // TODO may be too expensive, because it traverses all files in out directory public fun clearOutdated(outDirectory: File) { @@ -239,7 +239,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private inner class ProtoMap: ClassFileBasedMap() { + private inner class ProtoMap : ClassFileBasedMap() { override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PROTO_MAP), EnumeratorStringDescriptor(), @@ -261,7 +261,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private inner class ConstantsMap: ClassFileBasedMap>() { + private inner class ConstantsMap : ClassFileBasedMap>() { override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), @@ -305,7 +305,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private object ConstantsMapExternalizer: DataExternalizer> { + private object ConstantsMapExternalizer : DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size()) for (name in map.keySet().toSortedList()) { @@ -363,7 +363,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private inner class InlineFunctionsMap: ClassFileBasedMap>() { + private inner class InlineFunctionsMap : ClassFileBasedMap>() { override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, INLINE_FUNCTIONS), EnumeratorStringDescriptor(), @@ -423,7 +423,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } - private object InlineFunctionsMapExternalizer: DataExternalizer> { + private object InlineFunctionsMapExternalizer : DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size()) for (name in map.keySet()) { @@ -449,7 +449,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } - private inner class PackagePartMap: BasicMap() { + private inner class PackagePartMap : BasicMap() { // Format of serialization to string: --> override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PACKAGE_PARTS), @@ -503,7 +503,7 @@ public class IncrementalCacheImpl(targetDataRoot: File): StorageOwner, Increment } } -private val storageProvider = object: StorageProvider() { +private val storageProvider = object : StorageProvider() { override fun createStorage(targetDataDir: File): IncrementalCacheImpl { return IncrementalCacheImpl(targetDataDir) } @@ -516,17 +516,17 @@ public fun BuildDataManager.getKotlinCache(target: BuildTarget<*>): IncrementalC private fun ByteArray.md5(): Long { val d = MessageDigest.getInstance("MD5").digest(this)!! return ((d[0].toLong() and 0xFFL) - or ((d[1].toLong() and 0xFFL) shl 8) - or ((d[2].toLong() and 0xFFL) shl 16) - or ((d[3].toLong() and 0xFFL) shl 24) - or ((d[4].toLong() and 0xFFL) shl 32) - or ((d[5].toLong() and 0xFFL) shl 40) - or ((d[6].toLong() and 0xFFL) shl 48) - or ((d[7].toLong() and 0xFFL) shl 56) - ) + or ((d[1].toLong() and 0xFFL) shl 8) + or ((d[2].toLong() and 0xFFL) shl 16) + or ((d[3].toLong() and 0xFFL) shl 24) + or ((d[4].toLong() and 0xFFL) shl 32) + or ((d[5].toLong() and 0xFFL) shl 40) + or ((d[6].toLong() and 0xFFL) shl 48) + or ((d[7].toLong() and 0xFFL) shl 56) + ) } -private object ByteArrayExternalizer: DataExternalizer { +private object ByteArrayExternalizer : DataExternalizer { override fun save(out: DataOutput, value: ByteArray) { out.writeInt(value.size()) out.write(value) From 143ab5dad295ac858999b82784b5db5559393f76 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Feb 2015 17:18:17 +0300 Subject: [PATCH 0263/1557] Simplified process of filtering out obsolete package parts and loading descriptors from incremental caches. Now when file is deleted or dirty (compiled right now), its old package part is used. Current package of file doesn't matter. Original commit: f071802e19da0676229f094da24cf14393b15176 --- .../kotlin/jps/build/KotlinBuilder.kt | 11 ++++ .../jps/incremental/IncrementalCacheImpl.kt | 65 ++++++++++++------- .../build/IncrementalJpsTestGenerated.java | 12 ++++ .../build.log | 30 +++++++++ .../fun.kt | 2 + .../other.kt | 3 + .../other.kt.delete.1 | 0 .../usage.kt | 3 + .../usage.kt.new.1 | 3 + .../usage.kt.new.2 | 3 + .../build.log | 30 +++++++++ .../fun.kt | 2 + .../other.kt | 3 + .../other.kt.new.1 | 5 ++ .../usage.kt | 3 + .../usage.kt.new.1 | 3 + .../usage.kt.new.2 | 3 + 17 files changed, 156 insertions(+), 25 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 3c3aa7470ab..cf73a90692f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -105,6 +105,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION) val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getKotlinCache(it) } + + for (target in chunk.getTargets()) { + val removedFiles = dirtyFilesHolder.getRemovedFiles(target) + val cache = incrementalCaches[target]!! + removedFiles.forEach { cache.fileIsDeleted(File(it)) } + } + val environment = createCompileEnvironment(incrementalCaches) if (!environment.success()) { environment.reportErrorsTo(messageCollector) @@ -274,6 +281,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return DO_NOTHING } + if (!compilationErrors) { + incrementalCaches.values().forEach { it.clearRemovedPackageParts () } + } + for ((target, cache) in incrementalCaches) { cache.clearCacheForRemovedFiles( KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 8056f2536a2..831473cf1b4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -45,6 +45,8 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths +import com.intellij.util.io.BooleanDataDescriptor +import java.util.ArrayList val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -54,7 +56,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin" class CacheFormatVersion(targetDataRoot: File) { class object { // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 1 + private val INCREMENTAL_CACHE_OWN_VERSION = 2 private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" } @@ -84,6 +86,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" val PACKAGE_PARTS = "package-parts.tab" + val REMOVED_PACKAGE_PARTS = "removed-package-parts.tab" } private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) @@ -91,8 +94,9 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private val constantsMap = ConstantsMap() private val inlineFunctionsMap = InlineFunctionsMap() private val packagePartMap = PackagePartMap() + private val removedPackagePartMap = RemovedPackagePartMap() - private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap) + private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap, removedPackagePartMap) private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) @@ -150,9 +154,21 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return DO_NOTHING } - public fun clearCacheForRemovedFiles(removedSourceFiles: Collection, outDirectory: File, compilationSuccessful: Boolean) { - removedSourceFiles.forEach { packagePartMap.remove(it) } + public fun fileIsDeleted(sourceFile: File) { + val wasPackagePart = packagePartMap[sourceFile] + packagePartMap.remove(sourceFile) + if (wasPackagePart != null) { + removedPackagePartMap.add(wasPackagePart) + } + } + public fun clearRemovedPackageParts() { + removedPackagePartMap.clear() + } + + // TODO transitional function + deprecated("transitional function") + public fun clearCacheForRemovedFiles(removedSourceFiles: Collection, outDirectory: File, compilationSuccessful: Boolean) { if (compilationSuccessful) { inlineFunctionsMap.clearOutdated(outDirectory) constantsMap.clearOutdated(outDirectory) @@ -160,8 +176,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - public override fun getRemovedPackageParts(sourceFilesToCompileAndFqNames: Map): Collection { - return packagePartMap.getRemovedPackageParts(sourceFilesToCompileAndFqNames) + public override fun getObsoletePackageParts(sourceFilesToCompile: Collection): Collection { + return (removedPackagePartMap.getRemovedParts() + sourceFilesToCompile.map { packagePartMap[it] }.filterNotNull()).toSet() } public override fun getPackageData(fqName: String): ByteArray? { @@ -465,29 +481,28 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen storage.remove(sourceFile.getAbsolutePath()) } - public fun getRemovedPackageParts(compiledSourceFilesToFqName: Map): Collection { - val result = HashSet() + public fun get(sourceFile: File): String? { + return storage[sourceFile.getAbsolutePath()] + } + } - storage.processKeysWithExistingMapping { key -> - val sourceFile = File(key!!) + private inner class RemovedPackagePartMap : BasicMap() { + override fun createMap(): PersistentHashMap = PersistentHashMap( + File(baseDir, REMOVED_PACKAGE_PARTS), + EnumeratorStringDescriptor(), + BooleanDataDescriptor.INSTANCE + ) - val packagePartClassName = storage[key]!! - if (!sourceFile.exists()) { - result.add(packagePartClassName) - } - else { - if (sourceFile in compiledSourceFilesToFqName) { - val previousPackageFqName = JvmClassName.byInternalName(packagePartClassName).getPackageFqName() - if (compiledSourceFilesToFqName[sourceFile] != previousPackageFqName.asString()) { - result.add(packagePartClassName) - } - } - } + public fun add(name: String) { + storage.put(name, true) + } - true - } + public fun getRemovedParts(): Collection { + return storage.getAllKeysWithExistingMapping() + } - return result + public fun clear() { + storage.getAllKeysWithExistingMapping().forEach { storage.remove(it) } } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 9db726d6502..1dfdbd8ab87 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -183,6 +183,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("compilationErrorThenFixedWithPhantomPart") + public void testCompilationErrorThenFixedWithPhantomPart() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/"); + doTest(fileName); + } + + @TestMetadata("compilationErrorThenFixedWithPhantomPart2") + public void testCompilationErrorThenFixedWithPhantomPart2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/"); + doTest(fileName); + } + @TestMetadata("conflictingPlatformDeclarations") public void testConflictingPlatformDeclarations() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log new file mode 100644 index 00000000000..ba859e438ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -0,0 +1,30 @@ +Cleaning output files: +out/production/module/_DefaultPackage$other$*.class +out/production/module/_DefaultPackage.class +End of files +Cleaning output files: +out/production/module/_DefaultPackage$usage$*.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Expecting an expression + + +Cleaning output files: +out/production/module/_DefaultPackage$fun$*.class +End of files +Compiling files: +src/fun.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/_DefaultPackage$fun$*.class +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/fun.kt +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt new file mode 100644 index 00000000000..99cec0dbea1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/fun.kt @@ -0,0 +1,2 @@ +fun f() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt new file mode 100644 index 00000000000..81a9dfacc10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt @@ -0,0 +1,3 @@ +fun other() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/other.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt new file mode 100644 index 00000000000..05a6473592e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1 new file mode 100644 index 00000000000..c7eec515ee8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.1 @@ -0,0 +1,3 @@ +fun main(args: Array) { + f( +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2 new file mode 100644 index 00000000000..05a6473592e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/usage.kt.new.2 @@ -0,0 +1,3 @@ +fun main(args: Array) { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log new file mode 100644 index 00000000000..dae6fabaaff --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -0,0 +1,30 @@ +Cleaning output files: +out/production/module/_DefaultPackage$other$*.class +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/other.kt +src/usage.kt +End of files +COMPILATION FAILED +Expecting an expression + + +Cleaning output files: +out/production/module/_DefaultPackage$fun$*.class +End of files +Compiling files: +src/fun.kt +src/other.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/_DefaultPackage$fun$*.class +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/fun.kt +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt new file mode 100644 index 00000000000..99cec0dbea1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/fun.kt @@ -0,0 +1,2 @@ +fun f() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt new file mode 100644 index 00000000000..81a9dfacc10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt @@ -0,0 +1,3 @@ +fun other() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1 new file mode 100644 index 00000000000..7eddc99ab2b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/other.kt.new.1 @@ -0,0 +1,5 @@ +package new + +fun other() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt new file mode 100644 index 00000000000..05a6473592e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1 new file mode 100644 index 00000000000..c7eec515ee8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.1 @@ -0,0 +1,3 @@ +fun main(args: Array) { + f( +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2 new file mode 100644 index 00000000000..05a6473592e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/usage.kt.new.2 @@ -0,0 +1,3 @@ +fun main(args: Array) { + f() +} \ No newline at end of file From 75e5ee2fbf860e4007b458cb7a165d577cbdf6aa Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Feb 2015 19:43:07 +0300 Subject: [PATCH 0264/1557] Checking incremental cache dump after make. Comparing it with dump after rebuild. Original commit: 602642715cee6cb200ff19327a0603da6b22a9b1 --- .../jps/incremental/IncrementalCacheImpl.kt | 61 +++++++++++++++ .../jps/build/AbstractIncrementalJpsTest.kt | 74 ++++++++++++------- 2 files changed, 108 insertions(+), 27 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 831473cf1b4..fd8e1219255 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -47,6 +47,8 @@ import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import com.intellij.util.io.BooleanDataDescriptor import java.util.ArrayList +import org.jetbrains.annotations.TestOnly +import org.jetbrains.kotlin.utils.Printer val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -100,6 +102,11 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) + TestOnly + public fun dump(): String { + return maps.map { it.dump() }.join("\n\n") + } + public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { if (classFile.extension.toLowerCase() != "class") return DO_NOTHING @@ -231,6 +238,26 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen public fun close() { storage.close() } + + TestOnly + public fun dump(): String { + return with(StringBuilder()) { + with(Printer(this)) { + println(this@BasicMap.javaClass.getSimpleName()) + pushIndent() + + for (key in storage.getAllKeysWithExistingMapping().sort()) { + println("$key -> ${dumpValue(storage[key])}") + } + + popIndent() + } + + this + }.toString() + } + + protected abstract fun dumpValue(value: V): String } private abstract class ClassFileBasedMap : BasicMap() { @@ -275,6 +302,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen public fun get(className: JvmClassName): ByteArray? { return storage[className.getInternalName()] } + + override fun dumpValue(value: ByteArray): String { + return java.lang.Long.toHexString(value.md5()) + } } private inner class ConstantsMap : ClassFileBasedMap>() { @@ -319,6 +350,19 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } return true } + + override fun dumpValue(value: Map): String { + return StringBuilder { + append("{") + for (key in value.keySet().sort()) { + if (length() != 1) { + append(", ") + } + append("$key -> ${value[key]}") + } + append("}") + }.toString() + } } private object ConstantsMapExternalizer : DataExternalizer> { @@ -437,6 +481,19 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } return true } + + override fun dumpValue(value: Map): String { + return StringBuilder { + append("{") + for (key in value.keySet().sort()) { + if (length() != 1) { + append(", ") + } + append("$key -> ${java.lang.Long.toHexString(value[key]!!)}") + } + append("}") + }.toString() + } } private object InlineFunctionsMapExternalizer : DataExternalizer> { @@ -484,6 +541,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen public fun get(sourceFile: File): String? { return storage[sourceFile.getAbsolutePath()] } + + override fun dumpValue(value: String) = value } private inner class RemovedPackagePartMap : BasicMap() { @@ -504,6 +563,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen public fun clear() { storage.getAllKeysWithExistingMapping().forEach { storage.remove(it) } } + + override fun dumpValue(value: Boolean) = "" } enum class RecompilationDecision { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 70b954886d4..1bb35a2852e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -36,9 +36,11 @@ import org.jetbrains.jps.incremental.messages.BuildMessage import kotlin.test.assertFalse import java.util.regex.Pattern import kotlin.test.assertEquals -import org.jetbrains.jps.model.java.JpsJavaDependencyExtension import org.jetbrains.jps.model.JpsModuleRootModificationUtil import com.intellij.openapi.util.io.FileUtilRt +import org.jetbrains.jps.cmdline.ProjectDescriptor +import junit.framework.TestCase +import org.jetbrains.kotlin.jps.incremental.getKotlinCache public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { class object { @@ -65,7 +67,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { protected open val customTest: Boolean get() = false - fun buildGetLog(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): String { + fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) val logger = MyLogger(workDirPath) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) @@ -78,10 +80,10 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { .map { it.getMessageText() } .map { it.replaceAll("^.+:\\d+:\\s+", "").trim() } .joinToString("\n") - return logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n" + return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null) } else { - return logger.log + return MakeResult(logger.log, false, createMappingsDump(descriptor)) } } finally { descriptor.release() @@ -89,16 +91,16 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } private fun initialMake() { - val log = buildGetLog() - assertFalse(COMPILATION_FAILED in log, "Initial make failed:\n$log") + val makeResult = build() + assertFalse(makeResult.makeFailed, "Initial make failed:\n$makeResult") } - private fun make(): String { - return buildGetLog() + private fun make(): MakeResult { + return build() } - private fun rebuild(): String { - return buildGetLog(CompileScopeTestBuilder.rebuild().allModules()) + private fun rebuild(): MakeResult { + return build(CompileScopeTestBuilder.rebuild().allModules()) } private fun getModificationsToPerform(moduleNames: Collection?): List> { @@ -160,24 +162,28 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } } - private fun rebuildAndCheckOutput(lastMakeFailed: Boolean) { + private fun rebuildAndCheckOutput(makeOverallResult: MakeResult) { val outDir = File(getAbsolutePath("out")) val outAfterMake = File(getAbsolutePath("out-after-make")) FileUtil.copyDir(outDir, outAfterMake) - val rebuildLog = rebuild() - val rebuildFailed = rebuildLog.contains(COMPILATION_FAILED) - assertEquals(rebuildFailed, lastMakeFailed, "Rebuild failed: $rebuildFailed, last make failed: $lastMakeFailed. Rebuild log: $rebuildLog") + val rebuildResult = rebuild() + assertEquals(rebuildResult.makeFailed, makeOverallResult.makeFailed, + "Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult") - assertEqualDirectories(outDir, outAfterMake, lastMakeFailed) + assertEqualDirectories(outDir, outAfterMake, makeOverallResult.makeFailed) + + if (!makeOverallResult.makeFailed) { + TestCase.assertEquals(rebuildResult.mappingsDump, makeOverallResult.mappingsDump) + } FileUtil.delete(outAfterMake) } - private fun clearCachesRebuildAndCheckOutput(lastMakeFailed: Boolean) { + private fun clearCachesRebuildAndCheckOutput(makeOverallResult: MakeResult) { FileUtil.delete(BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot()!!) - rebuildAndCheckOutput(lastMakeFailed) + rebuildAndCheckOutput(makeOverallResult) } private fun readModuleDependencies(): Map>? { @@ -207,31 +213,45 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val moduleNames = configureModules() initialMake() - val (log, lastMakeFailed) = performModificationsAndMake(moduleNames) - UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), log) + val makeOverallResult = performModificationsAndMake(moduleNames) + UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), makeOverallResult.log) - rebuildAndCheckOutput(lastMakeFailed) - clearCachesRebuildAndCheckOutput(lastMakeFailed) + rebuildAndCheckOutput(makeOverallResult) + clearCachesRebuildAndCheckOutput(makeOverallResult) } + private fun createMappingsDump(project: ProjectDescriptor) = + createKotlinIncrementalCacheDump(project) - private data class MakeLogAndFailureFlag(val log: String, val makeFailed: Boolean) + private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { + return StringBuilder { + for (target in project.getBuildTargetIndex().getAllTargets().sortBy { it.getPresentableName() }) { + append("\n") + append(project.dataManager.getKotlinCache(target).dump()) + append("\n\n\n") + } + }.toString() + } - private fun performModificationsAndMake(moduleNames: Set?): MakeLogAndFailureFlag { + private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?) + + private fun performModificationsAndMake(moduleNames: Set?): MakeResult { val logs = ArrayList() val modifications = getModificationsToPerform(moduleNames) var lastCompilationFailed = false + var lastMappingsDump: String? = null for (step in modifications) { step.forEach { it.perform(workDir) } performAdditionalModifications() - val log = make() - lastCompilationFailed = log.contains(COMPILATION_FAILED) - logs.add(log) + val makeResult = make() + logs.add(makeResult.log) + lastCompilationFailed = makeResult.makeFailed + lastMappingsDump = makeResult.mappingsDump } - return MakeLogAndFailureFlag(logs.join("\n\n"), lastCompilationFailed) + return MakeResult(logs.join("\n\n"), lastCompilationFailed, lastMappingsDump) } protected open fun performAdditionalModifications() { From 3d6d7ba14d4e155f14e8a5307387bb1bb7209230 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 4 Feb 2015 21:50:45 +0300 Subject: [PATCH 0265/1557] Clearing incremental cache for removed files without scanning output directory. Original commit: 89f3d21ba465f3e022400efdb3aff680a960a1f6 --- .../kotlin/jps/build/KotlinBuilder.kt | 34 ++-- .../jps/incremental/IncrementalCacheImpl.kt | 188 ++++++++++-------- 2 files changed, 124 insertions(+), 98 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index cf73a90692f..8066a99462e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -106,12 +106,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getKotlinCache(it) } - for (target in chunk.getTargets()) { - val removedFiles = dirtyFilesHolder.getRemovedFiles(target) - val cache = incrementalCaches[target]!! - removedFiles.forEach { cache.fileIsDeleted(File(it)) } - } - val environment = createCompileEnvironment(incrementalCaches) if (!environment.success()) { environment.reportErrorsTo(messageCollector) @@ -129,6 +123,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR compileToJs(chunk, commonArguments, environment, messageCollector, project) } else { + if (IncrementalCompilation.ENABLED) { + for (target in chunk.getTargets()) { + val cache = incrementalCaches[target]!! + val removedAndDirtyFiles = filesToCompile[target] + dirtyFilesHolder.getRemovedFiles(target).map { File(it) } + cache.markOutputClassesDirty(removedAndDirtyFiles) + } + } + compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) } @@ -146,7 +148,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR recompilationDecision = DO_NOTHING } else { - recompilationDecision = updateKotlinIncrementalCache(compilationErrors, dirtyFilesHolder, incrementalCaches, outputsItemsAndTargets) + recompilationDecision = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, outputsItemsAndTargets) updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, outputsItemsAndTargets) } @@ -273,7 +275,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun updateKotlinIncrementalCache( compilationErrors: Boolean, - dirtyFilesHolder: DirtyFilesHolder, incrementalCaches: Map, outputsItemsAndTargets: List> ): IncrementalCacheImpl.RecompilationDecision { @@ -281,23 +282,16 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return DO_NOTHING } - if (!compilationErrors) { - incrementalCaches.values().forEach { it.clearRemovedPackageParts () } - } - - for ((target, cache) in incrementalCaches) { - cache.clearCacheForRemovedFiles( - KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target), - target.getOutputDir()!!, - !compilationErrors - ) - } - var recompilationDecision = DO_NOTHING for ((outputItem, target) in outputsItemsAndTargets) { val newDecision = incrementalCaches[target]!!.saveFileToCache(outputItem.getSourceFiles(), outputItem.getOutputFile()) recompilationDecision = recompilationDecision.merge(newDecision) } + + if (!compilationErrors) { + incrementalCaches.values().forEach { it.clearCacheForRemovedClasses() } + } + return recompilationDecision } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index fd8e1219255..483a57b52a6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -49,6 +49,7 @@ import com.intellij.util.io.BooleanDataDescriptor import java.util.ArrayList import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.utils.Printer +import java.io.DataInputStream val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -88,7 +89,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" val PACKAGE_PARTS = "package-parts.tab" - val REMOVED_PACKAGE_PARTS = "removed-package-parts.tab" + val SOURCE_TO_CLASSES = "source-to-classes.tab" + val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" } private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) @@ -96,9 +98,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private val constantsMap = ConstantsMap() private val inlineFunctionsMap = InlineFunctionsMap() private val packagePartMap = PackagePartMap() - private val removedPackagePartMap = RemovedPackagePartMap() + private val sourceToClassesMap = SourceToClassesMap() + private val dirtyOutputClassesMap = DirtyOutputClassesMap() - private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap, removedPackagePartMap) + private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap, sourceToClassesMap, dirtyOutputClassesMap) private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) @@ -107,6 +110,15 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return maps.map { it.dump() }.join("\n\n") } + public fun markOutputClassesDirty(removedAndCompiledSources: List) { + for (sourceFile in removedAndCompiledSources) { + val classes = sourceToClassesMap[sourceFile] + classes.forEach { dirtyOutputClassesMap.markDirty(it.getInternalName()) } + + sourceToClassesMap.clearOutputsForSource(sourceFile) + } + } + public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { if (classFile.extension.toLowerCase() != "class") return DO_NOTHING @@ -119,6 +131,9 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val className = JvmClassName.byClassId(kotlinClass.getClassId()) val header = kotlinClass.getClassHeader() + dirtyOutputClassesMap.notDirty(className.getInternalName()) + sourceFiles.forEach { sourceToClassesMap.addSourceToClass(it, className) } + val annotationDataEncoded = header.annotationData if (annotationDataEncoded != null) { val data = BitEncoding.decodeBytes(annotationDataEncoded) @@ -147,7 +162,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } - packagePartMap.putPackagePartSourceData(sourceFiles.first(), className) + packagePartMap.addPackagePart(className) val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) val constantsChanged = constantsMap.process(className, fileBytes) @@ -161,30 +176,19 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return DO_NOTHING } - public fun fileIsDeleted(sourceFile: File) { - val wasPackagePart = packagePartMap[sourceFile] - packagePartMap.remove(sourceFile) - if (wasPackagePart != null) { - removedPackagePartMap.add(wasPackagePart) - } - } - - public fun clearRemovedPackageParts() { - removedPackagePartMap.clear() - } - - // TODO transitional function - deprecated("transitional function") - public fun clearCacheForRemovedFiles(removedSourceFiles: Collection, outDirectory: File, compilationSuccessful: Boolean) { - if (compilationSuccessful) { - inlineFunctionsMap.clearOutdated(outDirectory) - constantsMap.clearOutdated(outDirectory) - protoMap.clearOutdated(outDirectory) + public fun clearCacheForRemovedClasses() { + for (internalClassName in dirtyOutputClassesMap.getDirtyOutputClasses()) { + val className = JvmClassName.byInternalName(internalClassName) + protoMap.remove(className) + packagePartMap.remove(className) + constantsMap.remove(className) + inlineFunctionsMap.remove(className) } + dirtyOutputClassesMap.clear() } public override fun getObsoletePackageParts(sourceFilesToCompile: Collection): Collection { - return (removedPackagePartMap.getRemovedParts() + sourceFilesToCompile.map { packagePartMap[it] }.filterNotNull()).toSet() + return dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } } public override fun getPackageData(fqName: String): ByteArray? { @@ -260,29 +264,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen protected abstract fun dumpValue(value: V): String } - private abstract class ClassFileBasedMap : BasicMap() { - - // TODO may be too expensive, because it traverses all files in out directory - public fun clearOutdated(outDirectory: File) { - val keysToRemove = HashSet() - - storage.processKeysWithExistingMapping { key -> - val className = JvmClassName.byInternalName(key!!) - val classFile = File(outDirectory, FileUtil.toSystemDependentName(className.getInternalName()) + ".class") - if (!classFile.exists()) { - keysToRemove.add(key) - } - - true - } - - for (key in keysToRemove) { - storage.remove(key) - } - } - } - - private inner class ProtoMap : ClassFileBasedMap() { + private inner class ProtoMap : BasicMap() { override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PROTO_MAP), EnumeratorStringDescriptor(), @@ -303,12 +285,16 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return storage[className.getInternalName()] } + public fun remove(className: JvmClassName) { + storage.remove(className.getInternalName()) + } + override fun dumpValue(value: ByteArray): String { return java.lang.Long.toHexString(value.md5()) } } - private inner class ConstantsMap : ClassFileBasedMap>() { + private inner class ConstantsMap : BasicMap>() { override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, CONSTANTS_MAP), EnumeratorStringDescriptor(), @@ -351,6 +337,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return true } + public fun remove(className: JvmClassName) { + put(className, null) + } + override fun dumpValue(value: Map): String { return StringBuilder { append("{") @@ -423,7 +413,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - private inner class InlineFunctionsMap : ClassFileBasedMap>() { + private inner class InlineFunctionsMap : BasicMap>() { override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, INLINE_FUNCTIONS), EnumeratorStringDescriptor(), @@ -482,6 +472,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return true } + public fun remove(className: JvmClassName) { + put(className, null) + } + override fun dumpValue(value: Map): String { return StringBuilder { append("{") @@ -521,42 +515,66 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } - - private inner class PackagePartMap : BasicMap() { - // Format of serialization to string: --> - override fun createMap(): PersistentHashMap = PersistentHashMap( - File(baseDir, PACKAGE_PARTS), - EnumeratorStringDescriptor(), - EnumeratorStringDescriptor() - ) - - public fun putPackagePartSourceData(sourceFile: File, className: JvmClassName) { - storage.put(sourceFile.getAbsolutePath(), className.getInternalName()) - } - - public fun remove(sourceFile: File) { - storage.remove(sourceFile.getAbsolutePath()) - } - - public fun get(sourceFile: File): String? { - return storage[sourceFile.getAbsolutePath()] - } - - override fun dumpValue(value: String) = value - } - - private inner class RemovedPackagePartMap : BasicMap() { + private inner class PackagePartMap : BasicMap() { override fun createMap(): PersistentHashMap = PersistentHashMap( - File(baseDir, REMOVED_PACKAGE_PARTS), + File(baseDir, PACKAGE_PARTS), EnumeratorStringDescriptor(), BooleanDataDescriptor.INSTANCE ) - public fun add(name: String) { - storage.put(name, true) + public fun addPackagePart(className: JvmClassName) { + storage.put(className.getInternalName(), true) } - public fun getRemovedParts(): Collection { + public fun remove(className: JvmClassName) { + storage.remove(className.getInternalName()) + } + + public fun isPackagePart(className: JvmClassName): Boolean { + return storage.containsMapping(className.getInternalName()) + } + + override fun dumpValue(value: Boolean) = "" + } + + private inner class SourceToClassesMap : BasicMap>() { + override fun createMap(): PersistentHashMap> = PersistentHashMap( + File(baseDir, SOURCE_TO_CLASSES), + EnumeratorStringDescriptor(), + StringListExternalizer + ) + + public fun clearOutputsForSource(sourceFile: File) { + storage.remove(sourceFile.getAbsolutePath()) + } + + public fun addSourceToClass(sourceFile: File, className: JvmClassName) { + storage.appendData(sourceFile.getAbsolutePath(), { out -> IOUtil.writeUTF(out, className.getInternalName()) }) + } + + public fun get(sourceFile: File): Collection { + return storage[sourceFile.getAbsolutePath()].orEmpty().map { JvmClassName.byInternalName(it) } + } + + override fun dumpValue(value: List) = value.toString() + } + + private inner class DirtyOutputClassesMap : BasicMap() { + override fun createMap(): PersistentHashMap = PersistentHashMap( + File(baseDir, DIRTY_OUTPUT_CLASSES), + EnumeratorStringDescriptor(), + BooleanDataDescriptor.INSTANCE + ) + + public fun markDirty(className: String) { + storage.put(className, true) + } + + public fun notDirty(className: String) { + storage.remove(className) + } + + public fun getDirtyOutputClasses(): Collection { return storage.getAllKeysWithExistingMapping() } @@ -615,3 +633,17 @@ private object ByteArrayExternalizer : DataExternalizer { return buf } } + +private object StringListExternalizer : DataExternalizer> { + override fun save(out: DataOutput, value: List) { + value.forEach { IOUtil.writeUTF(out, it) } + } + + override fun read(`in`: DataInput): List { + val result = ArrayList() + while ((`in` as DataInputStream).available() > 0) { + result.add(IOUtil.readUTF(`in`)) + } + return result + } +} From 618e37a080b3add6ed134e6dc52edd5bae3d6157 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 4 Feb 2015 22:05:18 +0300 Subject: [PATCH 0266/1557] Minor. Simplified getObsoletePackageParts() and similar functions. Original commit: 5b89f88447c643e4d467457abbddb67796bba2e2 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 483a57b52a6..047e36da0a1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -187,7 +187,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen dirtyOutputClassesMap.clear() } - public override fun getObsoletePackageParts(sourceFilesToCompile: Collection): Collection { + public override fun getObsoletePackageParts(): Collection { return dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } } From 8d02c74ddde8f96ddd3b0b3d65ffb5473189747d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 5 Feb 2015 16:06:37 +0300 Subject: [PATCH 0267/1557] Correctly processing disappeared protos, files with constants/inline function. Original commit: c5593a5b80c8d236b95425da632dd74cbaf17556 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 5 ++++- .../jps/incremental/IncrementalCacheImpl.kt | 15 ++++++++++++++- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../pureKotlin/classRecreated/build.log | 9 ++++++++- .../pureKotlin/fileWithConstantRemoved/build.log | 16 ++++++++++++++++ .../pureKotlin/fileWithConstantRemoved/const.kt | 3 +++ .../fileWithConstantRemoved/const.kt.delete | 0 .../pureKotlin/fileWithConstantRemoved/usage.kt | 5 +++++ .../fileWithInlineFunctionRemoved/build.log | 15 +++++++++++++++ .../fileWithInlineFunctionRemoved/inline.kt | 6 ++++++ .../inline.kt.delete | 0 .../fileWithInlineFunctionRemoved/usage.kt | 7 +++++++ 12 files changed, 90 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 8066a99462e..3d33cdead4d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -289,7 +289,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (!compilationErrors) { - incrementalCaches.values().forEach { it.clearCacheForRemovedClasses() } + incrementalCaches.values().forEach { + val newDecision = it.clearCacheForRemovedClasses() + recompilationDecision = recompilationDecision.merge(newDecision) + } } return recompilationDecision diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 047e36da0a1..1d720f8f2e1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -176,15 +176,26 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return DO_NOTHING } - public fun clearCacheForRemovedClasses() { + public fun clearCacheForRemovedClasses(): RecompilationDecision { + var recompilationDecision = DO_NOTHING for (internalClassName in dirtyOutputClassesMap.getDirtyOutputClasses()) { val className = JvmClassName.byInternalName(internalClassName) + + val newDecision = when { + internalClassName in inlineFunctionsMap -> RECOMPILE_ALL_CHUNK_AND_DEPENDANTS + internalClassName in constantsMap -> RECOMPILE_OTHERS_WITH_DEPENDANTS + internalClassName in protoMap -> RECOMPILE_OTHERS_IN_CHUNK + else -> DO_NOTHING + } + recompilationDecision = recompilationDecision.merge(newDecision) + protoMap.remove(className) packagePartMap.remove(className) constantsMap.remove(className) inlineFunctionsMap.remove(className) } dirtyOutputClassesMap.clear() + return recompilationDecision } public override fun getObsoletePackageParts(): Collection { @@ -213,6 +224,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen protected abstract fun createMap(): PersistentHashMap + public fun contains(key: String): Boolean = storage.containsMapping(key) + public fun clean() { try { storage.close() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 1dfdbd8ab87..061b7694af7 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -225,6 +225,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("fileWithConstantRemoved") + public void testFileWithConstantRemoved() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/"); + doTest(fileName); + } + + @TestMetadata("fileWithInlineFunctionRemoved") + public void testFileWithInlineFunctionRemoved() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/"); + doTest(fileName); + } + @TestMetadata("filesExchangePackages") public void testFilesExchangePackages() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index c326658bdd5..e3cde4f577a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -3,6 +3,13 @@ out/production/module/test/A.class End of files Compiling files: End of files +Cleaning output files: +out/production/module/test/TestPackage$other$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/other.kt +End of files Compiling files: @@ -14,4 +21,4 @@ out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log new file mode 100644 index 00000000000..f7973c4cece --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/test/TestPackage$const$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Unresolved reference: test +An annotation parameter must be a compile-time constant \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt new file mode 100644 index 00000000000..1572968f89f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt @@ -0,0 +1,3 @@ +package test + +val CONST = "foo" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt new file mode 100644 index 00000000000..2781036fbd6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt @@ -0,0 +1,5 @@ +package usage + +deprecated(test.CONST) +val usage = "" + diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log new file mode 100644 index 00000000000..e7e60e954c6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Unresolved reference: f \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt new file mode 100644 index 00000000000..6e64d97cde2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt @@ -0,0 +1,7 @@ +package usage + +fun main(args: Array) { + inline.f { + println("to be inlined") + } +} From 60d7e39c98bfe23512b1da0f767f577636e36514 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 5 Feb 2015 18:17:37 +0300 Subject: [PATCH 0268/1557] Checking source to output mapping after rebuild. Original commit: 432408e1a8aea97754e51107bfe90b3952df70dc --- .../jps/build/AbstractIncrementalJpsTest.kt | 32 ++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 1bb35a2852e..02eb45b76b8 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -38,6 +38,7 @@ import java.util.regex.Pattern import kotlin.test.assertEquals import org.jetbrains.jps.model.JpsModuleRootModificationUtil import com.intellij.openapi.util.io.FileUtilRt +import org.jetbrains.kotlin.utils.Printer import org.jetbrains.jps.cmdline.ProjectDescriptor import junit.framework.TestCase import org.jetbrains.kotlin.jps.incremental.getKotlinCache @@ -221,7 +222,8 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } private fun createMappingsDump(project: ProjectDescriptor) = - createKotlinIncrementalCacheDump(project) + createKotlinIncrementalCacheDump(project) + "\n\n\n" + + createCommonMappingsDump(project) private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { return StringBuilder { @@ -233,6 +235,34 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { }.toString() } + private fun createCommonMappingsDump(project: ProjectDescriptor): String { + val resultBuf = StringBuilder() + val result = Printer(resultBuf) + + result.println("Begin of SourceToOutputMap") + result.pushIndent() + + for (target in project.getBuildTargetIndex().getAllTargets()) { + result.println(target) + result.pushIndent() + + val mapping = project.dataManager.getSourceToOutputMap(target) + mapping.getSources().forEach { + val outputs = mapping.getOutputs(it).sort() + if (outputs.isNotEmpty()) { + result.println("source $it -> " + outputs) + } + } + + result.popIndent() + } + + result.popIndent() + result.println("End of SourceToOutputMap") + + return resultBuf.toString() + } + private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?) private fun performModificationsAndMake(moduleNames: Set?): MakeResult { From 06875cc4b6de8cc24d64d00e76b294dbd9c2e806 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 6 Feb 2015 16:01:28 +0300 Subject: [PATCH 0269/1557] Extracted common function getRecompilationDecision. Original commit: 478118c12a79be675d693a3ea9d88d2571646559 --- .../jps/incremental/IncrementalCacheImpl.kt | 61 ++++++++++--------- 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 1d720f8f2e1..ca9757d846b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -119,6 +119,14 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } + private fun getRecompilationDecision(protoChanged: Boolean, constantsChanged: Boolean, inlinesChanged: Boolean) = + when { + inlinesChanged -> RECOMPILE_ALL_CHUNK_AND_DEPENDANTS + constantsChanged -> RECOMPILE_OTHERS_WITH_DEPENDANTS + protoChanged -> RECOMPILE_OTHERS_IN_CHUNK + else -> DO_NOTHING + } + public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { if (classFile.extension.toLowerCase() != "class") return DO_NOTHING @@ -137,22 +145,19 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val annotationDataEncoded = header.annotationData if (annotationDataEncoded != null) { val data = BitEncoding.decodeBytes(annotationDataEncoded) - when { - header.isCompatiblePackageFacadeKind() -> { - return if (protoMap.put(className, data)) RECOMPILE_OTHERS_IN_CHUNK else DO_NOTHING - } - header.isCompatibleClassKind() -> { - val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) - val protoChanged = protoMap.put(className, data) - val constantsChanged = constantsMap.process(className, fileBytes) - - return when { - inlinesChanged -> RECOMPILE_ALL_CHUNK_AND_DEPENDANTS - constantsChanged -> RECOMPILE_OTHERS_WITH_DEPENDANTS - protoChanged -> RECOMPILE_OTHERS_IN_CHUNK - else -> DO_NOTHING - } - } + return when { + header.isCompatiblePackageFacadeKind() -> + getRecompilationDecision( + protoChanged = protoMap.put(className, data), + constantsChanged = false, + inlinesChanged = false + ) + header.isCompatibleClassKind() -> + getRecompilationDecision( + protoChanged = protoMap.put(className, data), + constantsChanged = constantsMap.process(className, fileBytes), + inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + ) else -> { throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}, isCompatible: ${header.isCompatibleAbiVersion}") } @@ -163,14 +168,12 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) - val inlinesChanged = inlineFunctionsMap.process(className, fileBytes) - val constantsChanged = constantsMap.process(className, fileBytes) - return when { - inlinesChanged -> RECOMPILE_ALL_CHUNK_AND_DEPENDANTS - constantsChanged -> RECOMPILE_OTHERS_WITH_DEPENDANTS - else -> DO_NOTHING - } + return getRecompilationDecision( + protoChanged = false, + constantsChanged = constantsMap.process(className, fileBytes), + inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + ) } return DO_NOTHING @@ -181,12 +184,12 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen for (internalClassName in dirtyOutputClassesMap.getDirtyOutputClasses()) { val className = JvmClassName.byInternalName(internalClassName) - val newDecision = when { - internalClassName in inlineFunctionsMap -> RECOMPILE_ALL_CHUNK_AND_DEPENDANTS - internalClassName in constantsMap -> RECOMPILE_OTHERS_WITH_DEPENDANTS - internalClassName in protoMap -> RECOMPILE_OTHERS_IN_CHUNK - else -> DO_NOTHING - } + val newDecision = getRecompilationDecision( + protoChanged = internalClassName in protoMap, + constantsChanged = internalClassName in constantsMap, + inlinesChanged = internalClassName in inlineFunctionsMap + ) + recompilationDecision = recompilationDecision.merge(newDecision) protoMap.remove(className) From a0ea638bc8cc62bc999779769451c088e83dbda4 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 19 Nov 2014 13:38:15 +0300 Subject: [PATCH 0270/1557] Checking Java mappings after rebuild (failing now for partially compiled package facades) Original commit: 02faa02a358304660b1a7706c091541d91d952d8 --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 02eb45b76b8..d147c27c157 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -42,6 +42,8 @@ import org.jetbrains.kotlin.utils.Printer import org.jetbrains.jps.cmdline.ProjectDescriptor import junit.framework.TestCase import org.jetbrains.kotlin.jps.incremental.getKotlinCache +import java.io.ByteArrayOutputStream +import java.io.PrintStream public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { class object { @@ -223,7 +225,8 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { private fun createMappingsDump(project: ProjectDescriptor) = createKotlinIncrementalCacheDump(project) + "\n\n\n" + - createCommonMappingsDump(project) + createCommonMappingsDump(project) + "\n\n\n" + + createJavaMappingsDump(project) private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { return StringBuilder { @@ -263,6 +266,14 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { return resultBuf.toString() } + private fun createJavaMappingsDump(project: ProjectDescriptor): String { + val byteArrayOutputStream = ByteArrayOutputStream() + PrintStream(byteArrayOutputStream).use { + project.dataManager.getMappings().toStream(it) + } + return byteArrayOutputStream.toString() + } + private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?) private fun performModificationsAndMake(moduleNames: Set?): MakeResult { From c7a26e4522f817163b235fed27f6027bf814b03f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 26 Nov 2014 16:52:22 +0300 Subject: [PATCH 0271/1557] Reverted wrong test data for tests where files are added to package. Let them fail. Original commit: 1a486bf9694e0d9213a6bfeacc54e9af3cc5c4e6 --- .../pureKotlin/filesExchangePackages/build.log | 5 ----- .../pureKotlin/multiplePackagesModified/build.log | 9 --------- .../incremental/pureKotlin/packageFileAdded/build.log | 9 --------- 3 files changed, 23 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 5918267bba1..288ef01ba57 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -9,14 +9,9 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/bar/BarPackage$b$*.class -out/production/module/bar/BarPackage.class out/production/module/foo/FooPackage$a$*.class -out/production/module/foo/FooPackage$c$*.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt -src/b.kt -src/c.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index b1fbc2c646e..c7370bec287 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -7,20 +7,11 @@ src/a2.kt End of files Cleaning output files: out/production/module/a/APackage$a1$*.class -out/production/module/a/APackage$a2$*.class out/production/module/a/APackage.class out/production/module/b/BPackage$b1$*.class out/production/module/b/BPackage.class End of files Compiling files: src/a1.kt -src/a2.kt src/b1.kt -End of files -Cleaning output files: -out/production/module/a/APackage$a1$*.class -out/production/module/a/APackage.class -End of files -Compiling files: -src/a1.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 94c3c5ea613..88792b62b39 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -3,15 +3,6 @@ src/b.kt End of files Cleaning output files: out/production/module/test/TestPackage$a$*.class -out/production/module/test/TestPackage$b$*.class -out/production/module/test/TestPackage.class -End of files -Compiling files: -src/a.kt -src/b.kt -End of files -Cleaning output files: -out/production/module/test/TestPackage$a$*.class out/production/module/test/TestPackage.class End of files Compiling files: From b778ecd0ba9bc1a3ca1483b3e3557163ca777d94 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 11 Feb 2015 16:27:14 +0300 Subject: [PATCH 0272/1557] Corrected updating Java mappings for package facade classes. We report all source files for it, not only currently compiled. Original commit: d3d30106a4266370a4bd2e249bda218e681ee0eb --- .../kotlin/jps/build/KotlinBuilder.kt | 37 ++++++++++++++++--- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 3d33cdead4d..1989aa73f36 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -60,6 +60,10 @@ import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem import org.jetbrains.kotlin.utils.LibraryUtils import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import org.jetbrains.jps.incremental.fs.CompilationRound +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.jps.builders.java.dependencyView.Mappings +import org.jetbrains.kotlin.resolve.jvm.JvmClassName public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -247,18 +251,41 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR filesToCompile: MultiMap, outputsItemsAndTargets: List> ) { + fun getOldSourceFiles(outputFile: File, previousMappings: Mappings, target: ModuleBuildTarget): Collection { + if (!outputFile.getName().endsWith(PackageClassUtils.PACKAGE_CLASS_NAME_SUFFIX + ".class")) return emptySet() + + val kotlinClass = LocalFileKotlinClass.create(outputFile) + if (kotlinClass == null || !kotlinClass.getClassHeader().isCompatiblePackageFacadeKind()) return emptySet() + + val classInternalName = JvmClassName.byClassId(kotlinClass.getClassId()).getInternalName() + val oldClassSources = previousMappings.getClassSources(previousMappings.getName(classInternalName)) + if (oldClassSources == null) return emptySet() + + val sources = THashSet(FileUtil.FILE_HASHING_STRATEGY) + sources.addAll(oldClassSources) + sources.removeAll(filesToCompile[target]) + sources.removeAll(dirtyFilesHolder.getRemovedFiles(target).map { File(it) }) + return sources + } + if (!IncrementalCompilation.ENABLED) { return } - val delta = context.getProjectDescriptor().dataManager.getMappings()!!.createDelta() - val callback = delta!!.getCallback()!! + val previousMappings = context.getProjectDescriptor().dataManager.getMappings() + val delta = previousMappings.createDelta() + val callback = delta.getCallback() - for ((outputItem, _) in outputsItemsAndTargets) { + for ((outputItem, target) in outputsItemsAndTargets) { val outputFile = outputItem.getOutputFile() + val classReader = ClassReader(outputFile.readBytes()) + + // For package facade classes: we need to report all source files for it, not only currently compiled + val allSourcesIncludingOld = getOldSourceFiles(outputFile, previousMappings, target) + outputItem.getSourceFiles() + callback.associate(FileUtil.toSystemIndependentName(outputFile.getAbsolutePath()), - outputItem.getSourceFiles().map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, - ClassReader(outputFile.readBytes()) + allSourcesIncludingOld.map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, + classReader ) } From a58c801984c6ab9145986001f32ce3f50e8237ea Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 12 Feb 2015 17:37:51 +0300 Subject: [PATCH 0273/1557] Moved parts of ide-compiler-runner to direct modules. Original commit: 3e1b8690705bf99f3fa10b3fafdf0bc2bcbefa45 --- jps/jps-plugin/jps-plugin.iml | 2 +- .../kotlin/compilerRunner/ArgumentUtils.java | 101 ++++++++++ .../compilerRunner/CompilerEnvironment.java | 78 ++++++++ .../compilerRunner/CompilerOutputParser.java | 188 ++++++++++++++++++ .../compilerRunner/CompilerRunnerUtil.java | 94 +++++++++ .../compilerRunner/KotlinCompilerRunner.java | 176 ++++++++++++++++ .../compilerRunner/OutputItemsCollector.java | 24 +++ .../OutputItemsCollectorImpl.java | 38 ++++ .../compilerRunner/SimpleOutputItem.java | 47 +++++ .../kotlin/jps/build/KotlinBuilder.kt | 4 +- .../KotlinModuleDescriptionBuilder.java | 37 ++++ ...KotlinModuleDescriptionBuilderFactory.java | 22 ++ .../KotlinModuleScriptBuilderFactory.java | 125 ++++++++++++ .../KotlinModuleXmlBuilderFactory.java | 154 ++++++++++++++ .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 57 ++++++ .../modules/KotlinModuleXmlGeneratorTest.java | 80 ++++++++ 16 files changed, 1224 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 6878e4f6683..23016075fe8 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -12,7 +12,7 @@ - + diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java new file mode 100644 index 00000000000..f2329867d68 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java @@ -0,0 +1,101 @@ +/* + * Copyright 2010-2015 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.kotlin.compilerRunner; + +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.Function; +import com.intellij.util.containers.ComparatorUtil; +import com.sampullara.cli.Argument; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; + +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; + +public class ArgumentUtils { + private ArgumentUtils() {} + + @NotNull + public static List convertArgumentsToStringList(@NotNull CommonCompilerArguments arguments) + throws InstantiationException, IllegalAccessException { + List result = new ArrayList(); + convertArgumentsToStringList(arguments, arguments.getClass().newInstance(), arguments.getClass(), result); + result.addAll(arguments.freeArgs); + return result; + } + + private static void convertArgumentsToStringList( + @NotNull CommonCompilerArguments arguments, + @NotNull CommonCompilerArguments defaultArguments, + @NotNull Class clazz, + @NotNull List result + ) throws IllegalAccessException, InstantiationException { + for (Field field : clazz.getDeclaredFields()) { + Argument argument = field.getAnnotation(Argument.class); + if (argument == null) continue; + + Object value; + Object defaultValue; + try { + value = field.get(arguments); + defaultValue = field.get(defaultArguments); + } + catch (IllegalAccessException ignored) { + // skip this field + continue; + } + + if (ComparatorUtil.equalsNullable(value, defaultValue)) continue; + + String name = getAlias(argument); + if (name == null) { + name = getName(argument, field); + } + + Class fieldType = field.getType(); + + if (fieldType.isArray()) { + Object[] values = (Object[]) value; + if (values.length == 0) continue; + //noinspection unchecked + value = StringUtil.join(values, Function.TO_STRING, argument.delimiter()); + } + + result.add(argument.prefix() + name); + + if (fieldType == boolean.class || fieldType == Boolean.class) continue; + + result.add(value.toString()); + } + + Class superClazz = clazz.getSuperclass(); + if (superClazz != null) { + convertArgumentsToStringList(arguments, defaultArguments, superClazz, result); + } + } + + private static String getAlias(Argument argument) { + String alias = argument.alias(); + return alias.isEmpty() ? null : alias; + } + + private static String getName(Argument argument, Field field) { + String name = argument.value(); + return name.isEmpty() ? field.getName() : name; + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java new file mode 100644 index 00000000000..c4df720924d --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java @@ -0,0 +1,78 @@ +/* + * Copyright 2010-2015 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.kotlin.compilerRunner; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.config.Services; +import org.jetbrains.kotlin.preloading.ClassCondition; +import org.jetbrains.kotlin.utils.KotlinPaths; +import org.jetbrains.kotlin.utils.PathUtil; + +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; + +public class CompilerEnvironment { + @NotNull + public static CompilerEnvironment getEnvironmentFor( + @NotNull KotlinPaths kotlinPaths, + @NotNull ClassCondition classesToLoadByParent, + @NotNull Services compilerServices + ) { + return new CompilerEnvironment(kotlinPaths, classesToLoadByParent, compilerServices); + } + + private final KotlinPaths kotlinPaths; + private final ClassCondition classesToLoadByParent; + private final Services services; + + private CompilerEnvironment( + @NotNull KotlinPaths kotlinPaths, + @NotNull ClassCondition classesToLoadByParent, + @NotNull Services services + ) { + this.kotlinPaths = kotlinPaths; + this.classesToLoadByParent = classesToLoadByParent; + this.services = services; + } + + public boolean success() { + return kotlinPaths.getHomePath().exists(); + } + + @NotNull + public KotlinPaths getKotlinPaths() { + return kotlinPaths; + } + + @NotNull + public ClassCondition getClassesToLoadByParent() { + return classesToLoadByParent; + } + + public void reportErrorsTo(@NotNull MessageCollector messageCollector) { + if (!kotlinPaths.getHomePath().exists()) { + messageCollector.report(ERROR, "Cannot find kotlinc home: " + kotlinPaths.getHomePath() + ". Make sure plugin is properly installed, " + + "or specify " + PathUtil.JPS_KOTLIN_HOME_PROPERTY + " system property", NO_LOCATION); + } + } + + @NotNull + public Services getServices() { + return services; + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java new file mode 100644 index 00000000000..e5bb3d4ea3d --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java @@ -0,0 +1,188 @@ +/* + * Copyright 2010-2015 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.kotlin.compilerRunner; + +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.containers.Stack; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; +import java.io.IOException; +import java.io.Reader; +import java.util.Map; + +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*; +import static org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil.reportException; + +public class CompilerOutputParser { + public static void parseCompilerMessagesFromReader(MessageCollector messageCollector, final Reader reader, OutputItemsCollector collector) { + // Sometimes the compiler doesn't output valid XML. + // Example: error in command line arguments passed to the compiler. + // The compiler will print the usage and the SAX parser will break. + // In this case, we want to read everything from this stream and report it as an IDE error. + final StringBuilder stringBuilder = new StringBuilder(); + Reader wrappingReader = new Reader() { + @Override + public int read(@NotNull char[] cbuf, int off, int len) throws IOException { + int read = reader.read(cbuf, off, len); + stringBuilder.append(cbuf, off, len); + return read; + } + + @Override + public void close() throws IOException { + // Do nothing: + // If the SAX parser sees a syntax error, it throws an exception + // and calls close() on the reader. + // We prevent hte reader from being closed here, and close it later, + // when all the text is read from it + } + }; + try { + SAXParserFactory factory = SAXParserFactory.newInstance(); + SAXParser parser = factory.newSAXParser(); + parser.parse(new InputSource(wrappingReader), new CompilerOutputSAXHandler(messageCollector, collector)); + } + catch (Throwable e) { + // Load all the text into the stringBuilder + try { + // This will not close the reader (see the wrapper above) + FileUtil.loadTextAndClose(wrappingReader); + } + catch (IOException ioException) { + reportException(messageCollector, ioException); + } + String message = stringBuilder.toString(); + reportException(messageCollector, new IllegalStateException(message, e)); + messageCollector.report(ERROR, message, NO_LOCATION); + } + finally { + try { + reader.close(); + } + catch (IOException e) { + reportException(messageCollector, e); + } + } + } + + private static class CompilerOutputSAXHandler extends DefaultHandler { + private static final Map CATEGORIES = new ContainerUtil.ImmutableMapBuilder() + .put("error", ERROR) + .put("warning", WARNING) + .put("logging", LOGGING) + .put("output", OUTPUT) + .put("exception", EXCEPTION) + .put("info", INFO) + .put("messages", INFO) // Root XML element + .build(); + + private final MessageCollector messageCollector; + private final OutputItemsCollector collector; + + private final StringBuilder message = new StringBuilder(); + private final Stack tags = new Stack(); + private String path; + private int line; + private int column; + + public CompilerOutputSAXHandler(MessageCollector messageCollector, OutputItemsCollector collector) { + this.messageCollector = messageCollector; + this.collector = collector; + } + + @Override + public void startElement(@NotNull String uri, @NotNull String localName, @NotNull String qName, @NotNull Attributes attributes) + throws SAXException { + tags.push(qName); + + message.setLength(0); + + path = attributes.getValue("path"); + line = safeParseInt(attributes.getValue("line"), -1); + column = safeParseInt(attributes.getValue("column"), -1); + } + + @Override + public void characters(char[] ch, int start, int length) throws SAXException { + if (tags.size() == 1) { + // We're directly inside the root tag: + String message = new String(ch, start, length); + if (!message.trim().isEmpty()) { + messageCollector.report(ERROR, "Unhandled compiler output: " + message, NO_LOCATION); + } + } + else { + message.append(ch, start, length); + } + } + + @Override + public void endElement(String uri, @NotNull String localName, @NotNull String qName) throws SAXException { + if (tags.size() == 1) { + // We're directly inside the root tag: + return; + } + String qNameLowerCase = qName.toLowerCase(); + CompilerMessageSeverity category = CATEGORIES.get(qNameLowerCase); + if (category == null) { + messageCollector.report(ERROR, "Unknown compiler message tag: " + qName, NO_LOCATION); + category = INFO; + } + String text = message.toString(); + + if (category == OUTPUT) { + reportToCollector(text); + } + else { + messageCollector.report(category, text, CompilerMessageLocation.create(path, line, column)); + } + tags.pop(); + } + + private void reportToCollector(String text) { + OutputMessageUtil.Output output = OutputMessageUtil.parseOutputMessage(text); + if (output != null) { + collector.add(output.sourceFiles, output.outputFile); + } + } + + private static int safeParseInt(@Nullable String value, int defaultValue) { + if (value == null) { + return defaultValue; + } + try { + return Integer.parseInt(value.trim()); + } + catch (NumberFormatException e) { + return defaultValue; + } + } + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java new file mode 100644 index 00000000000..75036a84842 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -0,0 +1,94 @@ +/* + * Copyright 2010-2015 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.kotlin.compilerRunner; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.preloading.ClassPreloadingUtils; +import org.jetbrains.kotlin.utils.KotlinPaths; + +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.lang.ref.SoftReference; +import java.lang.reflect.Method; +import java.util.Collections; + +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; + +public class CompilerRunnerUtil { + + private static SoftReference ourClassLoaderRef = new SoftReference(null); + + @NotNull + private static synchronized ClassLoader getOrCreateClassLoader( + @NotNull CompilerEnvironment environment, + @NotNull File libPath + ) throws IOException { + ClassLoader classLoader = ourClassLoaderRef.get(); + if (classLoader == null) { + classLoader = ClassPreloadingUtils.preloadClasses( + Collections.singletonList(new File(libPath, "kotlin-compiler.jar")), + /* estimatedClassNumber = */ 4096, + CompilerRunnerUtil.class.getClassLoader(), + environment.getClassesToLoadByParent() + ); + ourClassLoaderRef = new SoftReference(classLoader); + } + return classLoader; + } + + @Nullable + private static File getLibPath(@NotNull KotlinPaths paths, @NotNull MessageCollector messageCollector) { + File libs = paths.getLibPath(); + if (libs.exists() && !libs.isFile()) return libs; + + messageCollector.report( + ERROR, + "Broken compiler at '" + libs.getAbsolutePath() + "'. Make sure plugin is properly installed", + NO_LOCATION + ); + + return null; + } + + @Nullable + public static Object invokeExecMethod( + @NotNull String compilerClassName, + @NotNull String[] arguments, + @NotNull CompilerEnvironment environment, + @NotNull MessageCollector messageCollector, + @NotNull PrintStream out + ) throws Exception { + File libPath = getLibPath(environment.getKotlinPaths(), messageCollector); + if (libPath == null) return null; + + ClassLoader classLoader = getOrCreateClassLoader(environment, libPath); + + Class kompiler = Class.forName(compilerClassName, true, classLoader); + Method exec = kompiler.getMethod( + "execAndOutputXml", + PrintStream.class, + Class.forName("org.jetbrains.kotlin.config.Services", true, classLoader), + String[].class + ); + + return exec.invoke(kompiler.newInstance(), out, environment.getServices(), arguments); + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java new file mode 100644 index 00000000000..22515bce97f --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -0,0 +1,176 @@ +/* + * Copyright 2010-2015 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.kotlin.compilerRunner; + +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.util.ArrayUtil; +import com.intellij.util.Function; +import com.intellij.util.containers.ContainerUtil; +import com.intellij.util.xmlb.Accessor; +import com.intellij.util.xmlb.XmlSerializerUtil; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.kotlin.cli.common.ExitCode; +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector; +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; +import org.jetbrains.kotlin.config.CompilerSettings; + +import java.io.*; +import java.util.Collection; +import java.util.List; + +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; +import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO; + +public class KotlinCompilerRunner { + private static final String K2JVM_COMPILER = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"; + private static final String K2JS_COMPILER = "org.jetbrains.kotlin.cli.js.K2JSCompiler"; + private static final String INTERNAL_ERROR = ExitCode.INTERNAL_ERROR.toString(); + + public static void runK2JvmCompiler( + CommonCompilerArguments commonArguments, + K2JVMCompilerArguments k2jvmArguments, + CompilerSettings compilerSettings, + MessageCollector messageCollector, + CompilerEnvironment environment, + File moduleFile, + OutputItemsCollector collector + ) { + K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments); + setupK2JvmArguments(moduleFile, arguments); + + runCompiler(K2JVM_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment); + } + + public static void runK2JsCompiler( + CommonCompilerArguments commonArguments, + K2JSCompilerArguments k2jsArguments, + CompilerSettings compilerSettings, + MessageCollector messageCollector, + CompilerEnvironment environment, + OutputItemsCollector collector, + Collection sourceFiles, + List libraryFiles, + File outputFile + ) { + K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); + setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments); + + runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment); + } + + private static void runCompiler( + String compilerClassName, + CommonCompilerArguments arguments, + String additionalArguments, + MessageCollector messageCollector, + OutputItemsCollector collector, + CompilerEnvironment environment + ) { + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + PrintStream out = new PrintStream(stream); + + String exitCode = execCompiler(compilerClassName, arguments, additionalArguments, environment, out, messageCollector); + + BufferedReader reader = new BufferedReader(new StringReader(stream.toString())); + CompilerOutputParser.parseCompilerMessagesFromReader(messageCollector, reader, collector); + + if (INTERNAL_ERROR.equals(exitCode)) { + messageCollector.report(ERROR, "Compiler terminated with internal error", NO_LOCATION); + } + } + + @NotNull + private static String execCompiler( + String compilerClassName, + CommonCompilerArguments arguments, + String additionalArguments, + CompilerEnvironment environment, + PrintStream out, + MessageCollector messageCollector + ) { + try { + messageCollector.report(INFO, "Using kotlin-home = " + environment.getKotlinPaths().getHomePath(), NO_LOCATION); + + List argumentsList = ArgumentUtils.convertArgumentsToStringList(arguments); + argumentsList.addAll(StringUtil.split(additionalArguments, " ")); + + Object rc = CompilerRunnerUtil.invokeExecMethod( + compilerClassName, ArrayUtil.toStringArray(argumentsList), environment, messageCollector, out + ); + + // exec() returns an ExitCode object, class of which is loaded with a different class loader, + // so we take it's contents through reflection + return getReturnCodeFromObject(rc); + } + catch (Throwable e) { + MessageCollectorUtil.reportException(messageCollector, e); + return INTERNAL_ERROR; + } + } + + @NotNull + private static String getReturnCodeFromObject(@Nullable Object rc) throws Exception { + if (rc == null) { + return INTERNAL_ERROR; + } + else if (ExitCode.class.getName().equals(rc.getClass().getName())) { + return rc.toString(); + } + else { + throw new IllegalStateException("Unexpected return: " + rc); + } + } + + private static T mergeBeans(F from, T to) { + T copy = XmlSerializerUtil.createCopy(to); + + for (Accessor accessor : XmlSerializerUtil.getAccessors(from.getClass())) { + accessor.write(copy, accessor.read(from)); + } + + return copy; + } + + private static void setupK2JvmArguments(File moduleFile, K2JVMCompilerArguments settings) { + settings.module = moduleFile.getAbsolutePath(); + settings.noStdlib = true; + settings.noJdkAnnotations = true; + settings.noJdk = true; + } + + private static void setupK2JsArguments( + File outputFile, + Collection sourceFiles, + List libraryFiles, + K2JSCompilerArguments settings + ) { + settings.noStdlib = true; + settings.freeArgs = ContainerUtil.map(sourceFiles, new Function() { + @Override + public String fun(File file) { + return file.getPath(); + } + }); + settings.outputFile = outputFile.getPath(); + settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles); + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java new file mode 100644 index 00000000000..a05fe540e47 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java @@ -0,0 +1,24 @@ +/* + * Copyright 2010-2015 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.kotlin.compilerRunner; + +import java.io.File; +import java.util.Collection; + +public interface OutputItemsCollector { + void add(Collection sourceFiles, File outputFile); +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java new file mode 100644 index 00000000000..b2b40cd1811 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java @@ -0,0 +1,38 @@ +/* + * Copyright 2010-2015 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.kotlin.compilerRunner; + +import com.intellij.util.containers.ContainerUtil; +import org.jetbrains.annotations.NotNull; + +import java.io.File; +import java.util.Collection; +import java.util.List; + +public class OutputItemsCollectorImpl implements OutputItemsCollector { + private final List outputs = ContainerUtil.newArrayList(); + + @Override + public void add(Collection sourceFiles, File outputFile) { + outputs.add(new SimpleOutputItem(sourceFiles, outputFile)); + } + + @NotNull + public List getOutputs() { + return outputs; + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java new file mode 100644 index 00000000000..ed9c716f7cb --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java @@ -0,0 +1,47 @@ +/* + * Copyright 2010-2015 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.kotlin.compilerRunner; + +import org.jetbrains.annotations.NotNull; + +import java.io.File; +import java.util.Collection; + +public class SimpleOutputItem { + private final Collection sourceFiles; + private final File outputFile; + + public SimpleOutputItem(@NotNull Collection sourceFiles, @NotNull File outputFile) { + this.sourceFiles = sourceFiles; + this.outputFile = outputFile; + } + + @NotNull + public Collection getSourceFiles() { + return sourceFiles; + } + + @NotNull + public File getOutputFile() { + return outputFile; + } + + @Override + public String toString() { + return sourceFiles + " -> " + outputFile; + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1989aa73f36..ac2a1951f6a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment -import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants +import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.config.IncrementalCompilation @@ -43,7 +43,7 @@ import java.io.File import java.util.* import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* -import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX +import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler import org.jetbrains.kotlin.utils.keysToMap diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java new file mode 100644 index 00000000000..43722755430 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2015 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.kotlin.modules; + +import java.io.File; +import java.util.Collection; +import java.util.List; +import java.util.Set; + +public interface KotlinModuleDescriptionBuilder { + KotlinModuleDescriptionBuilder addModule( + String moduleName, + String outputDir, + List sourceFiles, + List javaSourceRoots, + Collection classpathRoots, + List annotationRoots, + boolean tests, + Set directoriesToFilterOut + ); + + CharSequence asText(); +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java new file mode 100644 index 00000000000..322c75dfbd0 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java @@ -0,0 +1,22 @@ +/* + * Copyright 2010-2015 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.kotlin.modules; + +public interface KotlinModuleDescriptionBuilderFactory { + KotlinModuleDescriptionBuilder create(); + String getFileExtension(); +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java new file mode 100644 index 00000000000..83b5ef59715 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java @@ -0,0 +1,125 @@ +/* + * Copyright 2010-2015 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.kotlin.modules; + +import org.jetbrains.annotations.NotNull; + +import java.io.File; +import java.util.Collection; +import java.util.List; +import java.util.Set; + +import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; + +public class KotlinModuleScriptBuilderFactory implements KotlinModuleDescriptionBuilderFactory { + + public static final KotlinModuleScriptBuilderFactory INSTANCE = new KotlinModuleScriptBuilderFactory(); + + private KotlinModuleScriptBuilderFactory() {} + + @Override + public KotlinModuleDescriptionBuilder create() { + return new Builder(); + } + + @Override + public String getFileExtension() { + return "kts"; + } + + private static class Builder implements KotlinModuleDescriptionBuilder { + private final StringBuilder script = new StringBuilder(); + private boolean done = false; + + { + script.append("import kotlin.modules.*\n"); + script.append("fun project() {\n"); + } + + @Override + public KotlinModuleDescriptionBuilder addModule( + String moduleName, + String outputDir, + List sourceFiles, + List javaSourceRoots, + Collection classpathRoots, + List annotationRoots, + boolean tests, + Set directoriesToFilterOut + ) { + assert !done : "Already done"; + + if (tests) { + script.append("// Module script for tests\n"); + } + else { + script.append("// Module script for production\n"); + } + + script.append(" module(\"" + moduleName + "\", outputDir = \"" + toSystemIndependentName(outputDir) + "\") {\n"); + + for (File sourceFile : sourceFiles) { + script.append(" sources += \"" + toSystemIndependentName(sourceFile.getPath()) + "\"\n"); + } + + if (!javaSourceRoots.isEmpty()) { + processClassPathSection("Java source roots", javaSourceRoots, directoriesToFilterOut); + } + + processClassPathSection("Classpath", classpathRoots, directoriesToFilterOut); + processAnnotationRoots(annotationRoots); + + script.append(" }\n"); + return this; + } + + private void processClassPathSection( + @NotNull String sectionDescription, + @NotNull Collection files, + @NotNull Set directoriesToFilterOut + ) { + script.append(" // " + sectionDescription + "\n"); + for (File file : files) { + if (directoriesToFilterOut.contains(file)) { + // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies + // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was + // removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath. + script.append(" // Output directory, commented out\n"); + script.append(" // "); + } + script.append(" classpath += \"" + toSystemIndependentName(file.getPath()) + "\"\n"); + } + } + + private void processAnnotationRoots(@NotNull List files) { + script.append(" // External annotations\n"); + for (File file : files) { + script.append(" annotationsPath += \"").append(toSystemIndependentName(file.getPath())).append("\"\n"); + } + } + + @Override + public CharSequence asText() { + if (!done) { + script.append("}\n"); + done = true; + } + + return script; + } + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java new file mode 100644 index 00000000000..8ecbca258c3 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java @@ -0,0 +1,154 @@ +/* + * Copyright 2010-2015 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.kotlin.modules; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.config.IncrementalCompilation; +import org.jetbrains.kotlin.utils.Printer; + +import java.io.File; +import java.util.Collection; +import java.util.List; +import java.util.Set; + +import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; +import static com.intellij.openapi.util.text.StringUtil.escapeXml; +import static org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.*; + +public class KotlinModuleXmlBuilderFactory implements KotlinModuleDescriptionBuilderFactory { + + public static final KotlinModuleXmlBuilderFactory INSTANCE = new KotlinModuleXmlBuilderFactory(); + + private KotlinModuleXmlBuilderFactory() {} + + @Override + public KotlinModuleDescriptionBuilder create() { + return new Builder(); + } + + @Override + public String getFileExtension() { + return "xml"; + } + + private static class Builder implements KotlinModuleDescriptionBuilder { + private final StringBuilder xml = new StringBuilder(); + private final Printer p = new Printer(xml); + private boolean done = false; + + public Builder() { + openTag(p, MODULES); + } + + @Override + public KotlinModuleDescriptionBuilder addModule( + String moduleName, + String outputDir, + List sourceFiles, + List javaSourceRoots, + Collection classpathRoots, + List annotationRoots, + boolean tests, + Set directoriesToFilterOut + ) { + assert !done : "Already done"; + + if (tests) { + p.println(""); + } + else { + p.println(""); + } + + p.println("<", MODULE, " ", + NAME, "=\"", escapeXml(moduleName), "\" ", + OUTPUT_DIR, "=\"", getEscapedPath(new File(outputDir)), "\">" + ); + p.pushIndent(); + + for (File sourceFile : sourceFiles) { + p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>"); + } + + if (!javaSourceRoots.isEmpty()) { + processClassPathSection("Java source roots", javaSourceRoots, directoriesToFilterOut); + } + + processClassPathSection("Classpath", classpathRoots, directoriesToFilterOut); + processAnnotationRoots(annotationRoots); + + closeTag(p, MODULE); + return this; + } + + private void processClassPathSection( + @NotNull String sectionDescription, + @NotNull Collection files, + @NotNull Set directoriesToFilterOut + ) { + p.println(""); + for (File file : files) { + boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.ENABLED; + if (isOutput) { + // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies + // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was + // removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath. + p.println(""); + p.println(""); + } + } + } + + private void processAnnotationRoots(@NotNull List files) { + p.println(""); + for (File file : files) { + p.println("<", EXTERNAL_ANNOTATIONS, " ", PATH, "=\"", getEscapedPath(file), "\"/>"); + } + } + + @Override + public CharSequence asText() { + if (!done) { + closeTag(p, MODULES); + done = true; + } + return xml; + } + } + + private static void openTag(Printer p, String tag) { + p.println("<" + tag + ">"); + p.pushIndent(); + } + + private static void closeTag(Printer p, String tag) { + p.popIndent(); + p.println(""); + } + + private static String getEscapedPath(File sourceFile) { + return escapeXml(toSystemIndependentName(sourceFile.getPath())); + } +} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt new file mode 100644 index 00000000000..7652295c2f9 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -0,0 +1,57 @@ +/* + * Copyright 2010-2015 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.kotlin.jvm.compiler + +import org.jetbrains.kotlin.test.TestCaseWithTmpdir +import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilderFactory +import java.io.File +import org.jetbrains.kotlin.utils.PathUtil + +/** + * This test checks that Java classes from sources have higher priority in Kotlin resolution process than classes from binaries. + * To test this, we compile a Kotlin+Java module (in two modes: CLI and module-based) where a runtime Java class was replaced + * with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime + */ +public class ClasspathOrderTest : TestCaseWithTmpdir() { + class object { + val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() + } + + public fun testClasspathOrderForCLI() { + MockLibraryUtil.compileKotlin(sourceDir.getPath(), tmpdir) + } + + public fun testClasspathOrderForModuleScriptBuild() { + val xmlContent = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule( + "name", + File(tmpdir, "output").getAbsolutePath(), + listOf(sourceDir), + listOf(sourceDir), + listOf(PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()), + listOf(), + false, + setOf() + ).asText().toString() + + val xml = File(tmpdir, "module.xml") + xml.writeText(xmlContent) + + MockLibraryUtil.compileKotlinModule(xml.getAbsolutePath()) + } +} \ No newline at end of file diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java new file mode 100644 index 00000000000..e024e504827 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -0,0 +1,80 @@ +/* + * Copyright 2010-2015 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.kotlin.modules; + +import junit.framework.TestCase; +import org.jetbrains.kotlin.test.JetTestUtils; + +import java.io.File; +import java.util.Arrays; +import java.util.Collections; + +public class KotlinModuleXmlGeneratorTest extends TestCase { + public void testBasic() throws Exception { + String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule( + "name", + "output", + Arrays.asList(new File("s1"), new File("s2")), + Collections.singletonList(new File("java")), + Arrays.asList(new File("cp1"), new File("cp2")), + Arrays.asList(new File("a1/f1"), new File("a2")), + false, + Collections.emptySet() + ).asText().toString(); + JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/basic.xml"), actual); + } + + public void testFiltered() throws Exception { + String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule( + "name", + "output", + Arrays.asList(new File("s1"), new File("s2")), + Collections.emptyList(), + Arrays.asList(new File("cp1"), new File("cp2")), + Arrays.asList(new File("a1/f1"), new File("a2")), + false, + Collections.singleton(new File("cp1")) + ).asText().toString(); + JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/filtered.xml"), actual); + } + + public void testMultiple() throws Exception { + KotlinModuleDescriptionBuilder builder = KotlinModuleXmlBuilderFactory.INSTANCE.create(); + builder.addModule( + "name", + "output", + Arrays.asList(new File("s1"), new File("s2")), + Collections.emptyList(), + Arrays.asList(new File("cp1"), new File("cp2")), + Arrays.asList(new File("a1/f1"), new File("a2")), + false, + Collections.singleton(new File("cp1")) + ); + builder.addModule( + "name2", + "output2", + Arrays.asList(new File("s12"), new File("s22")), + Collections.emptyList(), + Arrays.asList(new File("cp12"), new File("cp22")), + Arrays.asList(new File("a12/f12"), new File("a22")), + true, + Collections.singleton(new File("cp12")) + ); + String actual = builder.asText().toString(); + JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/multiple.xml"), actual); + } +} From 6a0c095b1f30e4eb73c26a71b694d7e250b27ae1 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 12 Feb 2015 18:30:46 +0300 Subject: [PATCH 0274/1557] Removed redundant dependencies. Original commit: bca871118275097908fc44058daaa340afef381e --- jps/jps-plugin/jps-plugin.iml | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 23016075fe8..0e4bcb36611 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -21,5 +21,6 @@ + \ No newline at end of file From 723b869a9fb21a5167956d6596dfb0fa2b37bf79 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 12 Feb 2015 18:37:26 +0300 Subject: [PATCH 0275/1557] Renamed and moved module ide-compiler-runner to idea-jps-common. Motivation: it has only a bunch of constants and a trivial class needed in idea and jps modules. Original commit: 1484ce4a46bcf67fb732c8915a65edcf9c607d18 --- jps/jps-common/idea-jps-common.iml | 12 +++++++ .../config/CompilerRunnerConstants.java | 22 +++++++++++++ .../kotlin/config/CompilerSettings.kt | 28 +++++++++++++++++ .../kotlin/config/SettingConstants.java | 31 +++++++++++++++++++ jps/jps-plugin/jps-plugin.iml | 2 +- 5 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 jps/jps-common/idea-jps-common.iml create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java diff --git a/jps/jps-common/idea-jps-common.iml b/jps/jps-common/idea-jps-common.iml new file mode 100644 index 00000000000..56fbc16c342 --- /dev/null +++ b/jps/jps-common/idea-jps-common.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java new file mode 100644 index 00000000000..70c584e3f28 --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerRunnerConstants.java @@ -0,0 +1,22 @@ +/* + * Copyright 2010-2015 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.kotlin.config; + +public class CompilerRunnerConstants { + public static final String KOTLIN_COMPILER_NAME = "Kotlin"; + public static final String INTERNAL_ERROR_PREFIX = "[Internal Error] "; +} diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt new file mode 100644 index 00000000000..f1b5b37929e --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -0,0 +1,28 @@ +/* + * Copyright 2010-2015 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.kotlin.config + +public class CompilerSettings { + public var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS + public var copyJsLibraryFiles: Boolean = true + public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY + + class object { + private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" + private val DEFAULT_OUTPUT_DIRECTORY = "lib" + } +} diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java b/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java new file mode 100644 index 00000000000..c3e82c5b17c --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java @@ -0,0 +1,31 @@ +/* + * Copyright 2010-2015 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.kotlin.config; + +import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR; + +public class SettingConstants { + private SettingConstants() {} + + public static final String KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION = "KotlinCommonCompilerArguments"; + public static final String KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION = "Kotlin2JsCompilerArguments"; + public static final String KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION = "Kotlin2JvmCompilerArguments"; + public static final String KOTLIN_COMPILER_SETTINGS_SECTION = "KotlinCompilerSettings"; + + public static final String KOTLIN_COMPILER_SETTINGS_FILE = "kotlinc.xml"; + public static final String KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + KOTLIN_COMPILER_SETTINGS_FILE; +} diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 0e4bcb36611..a61e33d157e 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -8,7 +8,7 @@ - + From 8dca16dfd5b3cb7ec6ea526d06f6b6f943a9c935 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 12 Feb 2015 19:33:33 +0300 Subject: [PATCH 0276/1557] Moved constant to idea module and removed redundant dependency. Original commit: 1f10cbb0d567e05e933f82f85a9c3bd2810a7f98 --- jps/jps-common/idea-jps-common.iml | 1 - .../src/org/jetbrains/kotlin/config/SettingConstants.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/jps/jps-common/idea-jps-common.iml b/jps/jps-common/idea-jps-common.iml index 56fbc16c342..c90834f2d60 100644 --- a/jps/jps-common/idea-jps-common.iml +++ b/jps/jps-common/idea-jps-common.iml @@ -7,6 +7,5 @@ - \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java b/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java index c3e82c5b17c..1c7aca6064f 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/SettingConstants.java @@ -16,8 +16,6 @@ package org.jetbrains.kotlin.config; -import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR; - public class SettingConstants { private SettingConstants() {} @@ -27,5 +25,4 @@ public class SettingConstants { public static final String KOTLIN_COMPILER_SETTINGS_SECTION = "KotlinCompilerSettings"; public static final String KOTLIN_COMPILER_SETTINGS_FILE = "kotlinc.xml"; - public static final String KOTLIN_COMPILER_SETTINGS_PATH = PROJECT_CONFIG_DIR + "/" + KOTLIN_COMPILER_SETTINGS_FILE; } From b886ffd42cd2f8a290203852db3e1136101f0915 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 12 Feb 2015 19:39:03 +0300 Subject: [PATCH 0277/1557] Extracted cli-parser to separate library. Removed full dependency jps-plugin -> idea-full. Original commit: 9f159b1feaa76257087da1d736f5956052041646 --- jps/jps-plugin/jps-plugin.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index a61e33d157e..e1a14e4e2d8 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -12,7 +12,7 @@ - + From 45a865658f9369fb89e8e9a08bef820932335e1f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 12 Feb 2015 23:10:19 +0300 Subject: [PATCH 0278/1557] Not reading class file three times incremental caches. Original commit: dd89311d22318c27c98f3023ae883ea8dd75a7f1 --- .../kotlin/jps/build/KotlinBuilder.kt | 76 ++++++++++++------- .../jps/incremental/IncrementalCacheImpl.kt | 7 +- 2 files changed, 51 insertions(+), 32 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index ac2a1951f6a..789b03de64d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -64,6 +64,7 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.kotlin.utils.sure public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -143,17 +144,18 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] - val outputsItemsAndTargets = getOutputItemsAndTargets(chunk, outputItemCollector) + val generatedFiles = getGeneratedFiles(chunk, outputItemCollector) - registerOutputItems(outputConsumer, outputsItemsAndTargets) + registerOutputItems(outputConsumer, generatedFiles) val recompilationDecision: IncrementalCacheImpl.RecompilationDecision if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { recompilationDecision = DO_NOTHING } else { - recompilationDecision = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, outputsItemsAndTargets) - updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, outputsItemsAndTargets) + val generatedClasses = generatedFiles as List + recompilationDecision = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedClasses) + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) } if (compilationErrors) { @@ -210,10 +212,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ) } - private fun getOutputItemsAndTargets( + private fun getGeneratedFiles( chunk: ModuleChunk, outputItemCollector: OutputItemsCollectorImpl - ): List> { + ): List { // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below val sourceToTarget = HashMap() if (chunk.getTargets().size() > 1) { @@ -224,12 +226,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - val result = ArrayList>() + val result = ArrayList() val representativeTarget = chunk.representativeTarget() for (outputItem in outputItemCollector.getOutputs()) { var target: ModuleBuildTarget? = null val sourceFiles = outputItem.getSourceFiles() + val outputFile = outputItem.getOutputFile() + if (!sourceFiles.isEmpty()) { target = sourceToTarget[sourceFiles.iterator().next()] } @@ -238,7 +242,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR target = representativeTarget } - result.add(Pair(outputItem, target!!)) + if (outputFile.getName().endsWith(".class")) { + result.add(GeneratedJvmClass(target!!, sourceFiles, outputFile)) + } + else { + result.add(GeneratedFile(target!!, sourceFiles, outputFile)) + } } return result } @@ -249,13 +258,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, filesToCompile: MultiMap, - outputsItemsAndTargets: List> + generatedClasses: List ) { - fun getOldSourceFiles(outputFile: File, previousMappings: Mappings, target: ModuleBuildTarget): Collection { - if (!outputFile.getName().endsWith(PackageClassUtils.PACKAGE_CLASS_NAME_SUFFIX + ".class")) return emptySet() + fun getOldSourceFiles(generatedClass: GeneratedJvmClass, previousMappings: Mappings): Collection { + if (!generatedClass.outputFile.getName().endsWith(PackageClassUtils.PACKAGE_CLASS_NAME_SUFFIX + ".class")) return emptySet() - val kotlinClass = LocalFileKotlinClass.create(outputFile) - if (kotlinClass == null || !kotlinClass.getClassHeader().isCompatiblePackageFacadeKind()) return emptySet() + val kotlinClass = generatedClass.outputClass + if (!kotlinClass.getClassHeader().isCompatiblePackageFacadeKind()) return emptySet() val classInternalName = JvmClassName.byClassId(kotlinClass.getClassId()).getInternalName() val oldClassSources = previousMappings.getClassSources(previousMappings.getName(classInternalName)) @@ -263,8 +272,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val sources = THashSet(FileUtil.FILE_HASHING_STRATEGY) sources.addAll(oldClassSources) - sources.removeAll(filesToCompile[target]) - sources.removeAll(dirtyFilesHolder.getRemovedFiles(target).map { File(it) }) + sources.removeAll(filesToCompile[generatedClass.target]) + sources.removeAll(dirtyFilesHolder.getRemovedFiles(generatedClass.target).map { File(it) }) return sources } @@ -276,16 +285,16 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val delta = previousMappings.createDelta() val callback = delta.getCallback() - for ((outputItem, target) in outputsItemsAndTargets) { - val outputFile = outputItem.getOutputFile() - val classReader = ClassReader(outputFile.readBytes()) + for (generatedClass in generatedClasses) { + val outputFile = generatedClass.outputFile + val outputClass = generatedClass.outputClass // For package facade classes: we need to report all source files for it, not only currently compiled - val allSourcesIncludingOld = getOldSourceFiles(outputFile, previousMappings, target) + outputItem.getSourceFiles() + val allSourcesIncludingOld = getOldSourceFiles(generatedClass, previousMappings) + generatedClass.sourceFiles callback.associate(FileUtil.toSystemIndependentName(outputFile.getAbsolutePath()), allSourcesIncludingOld.map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, - classReader + ClassReader(outputClass.getFileContents()) ) } @@ -294,24 +303,24 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound) } - private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, outputsItemsAndTargets: List>) { - for ((outputItem, target) in outputsItemsAndTargets) { - outputConsumer.registerOutputFile(target, outputItem.getOutputFile(), outputItem.getSourceFiles().map { it.getPath() }) + private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, generatedFiles: List) { + for (generatedFile in generatedFiles) { + outputConsumer.registerOutputFile(generatedFile.target, generatedFile.outputFile, generatedFile.sourceFiles.map { it.getPath() }) } } private fun updateKotlinIncrementalCache( compilationErrors: Boolean, incrementalCaches: Map, - outputsItemsAndTargets: List> + generatedClasses: List ): IncrementalCacheImpl.RecompilationDecision { if (!IncrementalCompilation.ENABLED) { return DO_NOTHING } var recompilationDecision = DO_NOTHING - for ((outputItem, target) in outputsItemsAndTargets) { - val newDecision = incrementalCaches[target]!!.saveFileToCache(outputItem.getSourceFiles(), outputItem.getOutputFile()) + for (generatedClass in generatedClasses) { + val newDecision = incrementalCaches[generatedClass.target]!!.saveFileToCache(generatedClass.sourceFiles, generatedClass.outputClass) recompilationDecision = recompilationDecision.merge(newDecision) } @@ -493,3 +502,18 @@ private fun hasKotlinDirtyOrRemovedFiles( return chunk.getTargets().any { !KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isEmpty() } } + +private open class GeneratedFile( + val target: ModuleBuildTarget, + val sourceFiles: Collection, + val outputFile: File +) + +private class GeneratedJvmClass ( + target: ModuleBuildTarget, + sourceFiles: Collection, + outputFile: File +) : GeneratedFile(target, sourceFiles, outputFile) { + val outputClass = LocalFileKotlinClass.create(outputFile).sure( + "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations") +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index ca9757d846b..273806777cf 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -127,14 +127,9 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen else -> DO_NOTHING } - public fun saveFileToCache(sourceFiles: Collection, classFile: File): RecompilationDecision { - if (classFile.extension.toLowerCase() != "class") return DO_NOTHING - + public fun saveFileToCache(sourceFiles: Collection, kotlinClass: LocalFileKotlinClass): RecompilationDecision { cacheFormatVersion.saveIfNeeded() - val kotlinClass = LocalFileKotlinClass.create(classFile) - if (kotlinClass == null) return DO_NOTHING - val fileBytes = kotlinClass.getFileContents() val className = JvmClassName.byClassId(kotlinClass.getClassId()) val header = kotlinClass.getClassHeader() From aa412c72fcfe4ec90d4106bdf157737b7015a070 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 16 Feb 2015 15:34:35 +0300 Subject: [PATCH 0279/1557] Fixed compilation. Some class files generated by kotlinc may have no annotation (that should be fixed later). Original commit: 4b6112d380393c6db1dbba9301725e8934bda376 --- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 789b03de64d..fd61616281f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -264,7 +264,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (!generatedClass.outputFile.getName().endsWith(PackageClassUtils.PACKAGE_CLASS_NAME_SUFFIX + ".class")) return emptySet() val kotlinClass = generatedClass.outputClass - if (!kotlinClass.getClassHeader().isCompatiblePackageFacadeKind()) return emptySet() + if (kotlinClass == null || !kotlinClass.getClassHeader().isCompatiblePackageFacadeKind()) return emptySet() val classInternalName = JvmClassName.byClassId(kotlinClass.getClassId()).getInternalName() val oldClassSources = previousMappings.getClassSources(previousMappings.getName(classInternalName)) @@ -288,13 +288,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR for (generatedClass in generatedClasses) { val outputFile = generatedClass.outputFile val outputClass = generatedClass.outputClass + val outputClassContents = if (outputClass != null) outputClass.getFileContents() else outputFile.readBytes() // For package facade classes: we need to report all source files for it, not only currently compiled val allSourcesIncludingOld = getOldSourceFiles(generatedClass, previousMappings) + generatedClass.sourceFiles callback.associate(FileUtil.toSystemIndependentName(outputFile.getAbsolutePath()), allSourcesIncludingOld.map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, - ClassReader(outputClass.getFileContents()) + ClassReader(outputClassContents) ) } @@ -320,7 +321,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR var recompilationDecision = DO_NOTHING for (generatedClass in generatedClasses) { - val newDecision = incrementalCaches[generatedClass.target]!!.saveFileToCache(generatedClass.sourceFiles, generatedClass.outputClass) + val outputClass = generatedClass.outputClass + if (outputClass == null) continue + + val newDecision = incrementalCaches[generatedClass.target]!!.saveFileToCache(generatedClass.sourceFiles, outputClass) recompilationDecision = recompilationDecision.merge(newDecision) } @@ -514,6 +518,5 @@ private class GeneratedJvmClass ( sourceFiles: Collection, outputFile: File ) : GeneratedFile(target, sourceFiles, outputFile) { - val outputClass = LocalFileKotlinClass.create(outputFile).sure( - "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations") + val outputClass = LocalFileKotlinClass.create(outputFile) } \ No newline at end of file From 19499caee05924737a41fb0a9d4e8fdabf7da522 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 21 Jan 2015 20:07:00 +0300 Subject: [PATCH 0280/1557] Update test data that mentioned old JvmAbi constants Original commit: a1f4c06a495ee67b470514a99309d3fafe6fe985 --- .../pureKotlin/classObjectConstantChanged/build.log | 4 ++-- .../incremental/pureKotlin/constantsUnchanged/build.log | 2 +- .../pureKotlin/traitClassObjectConstantChanged/build.log | 4 ++-- .../withJava/kotlinUsedInJava/constantChanged/build.log | 4 ++-- .../withJava/kotlinUsedInJava/constantUnchanged/build.log | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index f277b681fb5..1049b7f2a22 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/Klass$object.class +out/production/module/test/Klass$Default.class out/production/module/test/Klass.class End of files Compiling files: src/const.kt End of files Cleaning output files: -out/production/module/test/Klass$object.class +out/production/module/test/Klass$Default.class out/production/module/test/Klass.class out/production/module/test/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index e7a3af58bd6..cce56fbf9fd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$object.class +out/production/module/test/Klass$Default.class out/production/module/test/Klass.class out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 66a82a4119c..01ea0f084d3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/test/Trait$$TImpl.class -out/production/module/test/Trait$object.class +out/production/module/test/Trait$Default.class out/production/module/test/Trait.class End of files Compiling files: @@ -8,7 +8,7 @@ src/const.kt End of files Cleaning output files: out/production/module/test/Trait$$TImpl.class -out/production/module/test/Trait$object.class +out/production/module/test/Trait$Default.class out/production/module/test/Trait.class out/production/module/test/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index 78e27d0e4e4..d7a173db691 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$object.class +out/production/module/test/Klass$Default.class out/production/module/test/Klass.class End of files Compiling files: @@ -7,7 +7,7 @@ src/const.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/Klass$object.class +out/production/module/test/Klass$Default.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log index 026ae147f5a..6bc3a50bee0 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$object.class +out/production/module/test/Klass$Default.class out/production/module/test/Klass.class End of files Compiling files: From 52fb79b0be8fd12aac68a108167b77fcc22d319c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 4 Feb 2015 15:37:03 +0300 Subject: [PATCH 0281/1557] Minor, move replaceHashWithStar to JetTestUtils Original commit: 45fec9257a2441704f2ee9ed04207332938e6360 --- .../jps/build/AbstractIncrementalJpsTest.kt | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index d147c27c157..9ca202a651b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -20,6 +20,7 @@ import org.jetbrains.jps.builders.JpsBuildTestCase import kotlin.properties.Delegates import com.intellij.openapi.util.io.FileUtil import java.io.File +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.jps.builders.CompileScopeTestBuilder import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase import org.jetbrains.jps.builders.logging.BuildLoggingManager @@ -34,7 +35,6 @@ import java.util.HashMap import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.jps.incremental.messages.BuildMessage import kotlin.test.assertFalse -import java.util.regex.Pattern import kotlin.test.assertEquals import org.jetbrains.jps.model.JpsModuleRootModificationUtil import com.intellij.openapi.util.io.FileUtilRt @@ -347,20 +347,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { override fun isEnabled(): Boolean = true override fun logLine(message: String?) { - fun String.replaceHashWithStar(): String { - val matcher = STRIP_PACKAGE_PART_HASH_PATTERN.matcher(this) - if (matcher.find()) { - return matcher.replaceAll("\\$*") - } - return this - } - - logBuf.append(message!!.trimLeading(rootPath + "/").replaceHashWithStar()).append('\n') - } - - class object { - // We suspect sequences of eight consecutive hexadecimal digits to be a package part hash code - val STRIP_PACKAGE_PART_HASH_PATTERN = Pattern.compile("\\$([0-9a-f]{8})") + logBuf.append(JetTestUtils.replaceHashWithStar(message!!.trimLeading(rootPath + "/"))).append('\n') } } From ce38b4c43f81c057deca32932a11ede4aac5fcf3 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 14 Feb 2015 03:27:05 +0300 Subject: [PATCH 0282/1557] Serialize descriptors for local/anonymous classes on JVM Reflection needs this information to work for local classes and anonymous objects Original commit: 6ce8d6bd2ea46426cdd5885e9e650248e27a5027 --- .../jps/incremental/IncrementalCacheImpl.kt | 61 ++++++++----------- .../build/IncrementalJpsTestGenerated.java | 6 ++ .../pureKotlin/anonymousObjectChanged/a.kt | 5 ++ .../anonymousObjectChanged/a.kt.new | 6 ++ .../anonymousObjectChanged/build.log | 15 +++++ .../anonymousObjectChanged/usage.kt | 5 ++ 6 files changed, 63 insertions(+), 35 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 273806777cf..a45bc64f8ad 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -30,11 +30,9 @@ import org.jetbrains.org.objectweb.asm.* import com.intellij.util.io.EnumeratorStringDescriptor import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import java.util.HashSet import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import java.util.HashMap import org.jetbrains.kotlin.load.kotlin.PackageClassUtils -import com.intellij.openapi.util.io.FileUtil import java.security.MessageDigest import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.jps.builders.storage.StorageProvider @@ -137,41 +135,34 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen dirtyOutputClassesMap.notDirty(className.getInternalName()) sourceFiles.forEach { sourceToClassesMap.addSourceToClass(it, className) } - val annotationDataEncoded = header.annotationData - if (annotationDataEncoded != null) { - val data = BitEncoding.decodeBytes(annotationDataEncoded) - return when { - header.isCompatiblePackageFacadeKind() -> - getRecompilationDecision( - protoChanged = protoMap.put(className, data), - constantsChanged = false, - inlinesChanged = false - ) - header.isCompatibleClassKind() -> - getRecompilationDecision( - protoChanged = protoMap.put(className, data), - constantsChanged = constantsMap.process(className, fileBytes), - inlinesChanged = inlineFunctionsMap.process(className, fileBytes) - ) - else -> { - throw IllegalStateException("Unexpected kind with annotationData: ${header.kind}, isCompatible: ${header.isCompatibleAbiVersion}") - } + return when { + header.isCompatiblePackageFacadeKind() -> + getRecompilationDecision( + protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)), + constantsChanged = false, + inlinesChanged = false + ) + header.isCompatibleClassKind() -> + getRecompilationDecision( + protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)), + constantsChanged = constantsMap.process(className, fileBytes), + inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + ) + header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART -> { + assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } + + packagePartMap.addPackagePart(className) + + getRecompilationDecision( + protoChanged = false, + constantsChanged = constantsMap.process(className, fileBytes), + inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + ) + } + else -> { + DO_NOTHING } } - - if (header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART) { - assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } - - packagePartMap.addPackagePart(className) - - return getRecompilationDecision( - protoChanged = false, - constantsChanged = constantsMap.process(className, fileBytes), - inlinesChanged = inlineFunctionsMap.process(className, fileBytes) - ) - } - - return DO_NOTHING } public fun clearCacheForRemovedClasses(): RecompilationDecision { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 061b7694af7..a8e6b201fb0 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -135,6 +135,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("anonymousObjectChanged") + public void testAnonymousObjectChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/"); + doTest(fileName); + } + @TestMetadata("classInlineFunctionChanged") public void testClassInlineFunctionChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt new file mode 100644 index 00000000000..842232877de --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt @@ -0,0 +1,5 @@ +package a + +fun foo() = object { + fun bar() = ":(" +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new new file mode 100644 index 00000000000..6255f915194 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new @@ -0,0 +1,6 @@ +package a + +// Signatures in the class "...$main$1" have changed, thus we need to recompile the whole module +fun foo() = object { + fun baz() = ":)" +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log new file mode 100644 index 00000000000..d2598525c01 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/a/APackage$a$*$foo$1.class +out/production/module/a/APackage$a$*.class +out/production/module/a/APackage.class +End of files +Compiling files: +src/a.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt new file mode 100644 index 00000000000..acc1e2b0f5a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/usage.kt @@ -0,0 +1,5 @@ +package usage + +import a.foo + +fun bar() = foo() From 1cbd28ae411e2c9e97e8577576d4d3a52d9694bd Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 16 Feb 2015 21:39:18 +0300 Subject: [PATCH 0283/1557] Fix KotlinJpsBuildTest, run J+K tests with runtime Otherwise javac is not able to find class KotlinClass$Kind, which is used in annotation argument and for some reason this leads to an exception (in javac) which gets swallowed and unresolved reference is reported in Java code. java:INFO:com.sun.tools.javac.code.Symbol$CompletionFailure: class file for kotlin.jvm.internal.KotlinClass$Kind not found java:INFO:Errors occurred while compiling module 'm1' Original commit: 640adecde6e6b9b2d5d6a2626c2e3084ee4b2dfe --- .../kotlin/jps/build/KotlinJpsBuildTest.java | 8 ++++---- .../kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 15 +++------------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index c30fbd6c73e..25061ee5916 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -324,19 +324,19 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { } public void testKotlinJavaProject() { - doTest(); + doTestWithRuntime(); } public void testJKJProject() { - doTest(); + doTestWithRuntime(); } public void testKJKProject() { - doTest(); + doTestWithRuntime(); } public void testKJCircularProject() { - doTest(); + doTestWithRuntime(); } public void testJKJInheritanceProject() { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 10aee550912..ff1a9588ffb 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -16,21 +16,10 @@ package org.jetbrains.kotlin.jps.build -import org.jetbrains.jps.builders.JpsBuildTestCase import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService -public class SimpleKotlinJpsBuildTest : JpsBuildTestCase() { - override fun setUp() { - super.setUp() - System.setProperty("kotlin.jps.tests", "true") - } - - override fun tearDown() { - System.clearProperty("kotlin.jps.tests") - super.tearDown() - } - +public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { public fun testThreeModulesNoReexport() { val aFile = createFile("a/a.kt", """ @@ -69,6 +58,7 @@ public class SimpleKotlinJpsBuildTest : JpsBuildTestCase() { val c = addModule("c", PathUtil.getParentPath(cFile)) c.getDependenciesList().addModuleDependency(b) + addKotlinRuntimeDependency() rebuildAll() } @@ -104,6 +94,7 @@ public class SimpleKotlinJpsBuildTest : JpsBuildTestCase() { b.getDependenciesList().addModuleDependency(a) ).setExported(false) + addKotlinRuntimeDependency() rebuildAll() } } From 59855baf7d591eb17b437c4bd61223b64bd14e38 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 16 Feb 2015 22:25:09 +0300 Subject: [PATCH 0284/1557] Revert "Fixed compilation. Some class files generated by kotlinc may have no annotation (that should be fixed later)." This reverts commit aa412c72fcfe4ec90d4106bdf157737b7015a070. This workaround is not needed anymore after the fix in c24688c Original commit: 02171218145f6c8d31b03a53fde07d2a7da21f41 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index fd61616281f..7bdca13a063 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -264,7 +264,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (!generatedClass.outputFile.getName().endsWith(PackageClassUtils.PACKAGE_CLASS_NAME_SUFFIX + ".class")) return emptySet() val kotlinClass = generatedClass.outputClass - if (kotlinClass == null || !kotlinClass.getClassHeader().isCompatiblePackageFacadeKind()) return emptySet() + if (!kotlinClass.getClassHeader().isCompatiblePackageFacadeKind()) return emptySet() val classInternalName = JvmClassName.byClassId(kotlinClass.getClassId()).getInternalName() val oldClassSources = previousMappings.getClassSources(previousMappings.getName(classInternalName)) @@ -288,14 +288,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR for (generatedClass in generatedClasses) { val outputFile = generatedClass.outputFile val outputClass = generatedClass.outputClass - val outputClassContents = if (outputClass != null) outputClass.getFileContents() else outputFile.readBytes() // For package facade classes: we need to report all source files for it, not only currently compiled val allSourcesIncludingOld = getOldSourceFiles(generatedClass, previousMappings) + generatedClass.sourceFiles callback.associate(FileUtil.toSystemIndependentName(outputFile.getAbsolutePath()), allSourcesIncludingOld.map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, - ClassReader(outputClassContents) + ClassReader(outputClass.getFileContents()) ) } @@ -321,10 +320,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR var recompilationDecision = DO_NOTHING for (generatedClass in generatedClasses) { - val outputClass = generatedClass.outputClass - if (outputClass == null) continue - - val newDecision = incrementalCaches[generatedClass.target]!!.saveFileToCache(generatedClass.sourceFiles, outputClass) + val newDecision = incrementalCaches[generatedClass.target]!!.saveFileToCache(generatedClass.sourceFiles, generatedClass.outputClass) recompilationDecision = recompilationDecision.merge(newDecision) } @@ -518,5 +514,6 @@ private class GeneratedJvmClass ( sourceFiles: Collection, outputFile: File ) : GeneratedFile(target, sourceFiles, outputFile) { - val outputClass = LocalFileKotlinClass.create(outputFile) -} \ No newline at end of file + val outputClass = LocalFileKotlinClass.create(outputFile).sure( + "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations") +} From 5bb5fe0c49cf02ef9879aadaa86d3dd628be5da3 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 16 Feb 2015 16:30:45 +0300 Subject: [PATCH 0285/1557] KT-6586 accessing Kotlin class static class object variable's value from Java does not properly update between compiles #KT-6586 fixed Original commit: d1a2fd9c66f69c96d2b233e29be303eb8b4c31da --- .../kotlin/jps/build/KotlinBuilder.kt | 16 +++-- .../jps/incremental/IncrementalCacheImpl.kt | 12 ++-- .../jps/build/AbstractIncrementalJpsTest.kt | 14 ++++- .../build/IncrementalConstantSearchTest.kt | 60 +++++++++++++++++++ .../JavaClass.java | 3 + .../JavaClass.java.new | 3 + .../javaConstantChangedUsedInKotlin/build.log | 12 ++++ .../javaConstantChangedUsedInKotlin/usage.kt | 2 + .../JavaClass.java | 3 + .../JavaClass.java.new | 3 + .../build.log | 6 ++ .../usage.kt | 2 + .../Usage.java | 7 +++ .../kotlinConstantChangedUsedInJava/build.log | 16 +++++ .../kotlinConstantChangedUsedInJava/const.kt | 8 +++ .../const.kt.new | 8 +++ .../Usage.java | 7 +++ .../build.log | 7 +++ .../const.kt | 7 +++ .../const.kt.new | 7 +++ 20 files changed, 187 insertions(+), 16 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 7bdca13a063..1d5cd4e977a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -167,28 +167,26 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (IncrementalCompilation.ENABLED) { - val fileFilter = FileFilter { file -> - KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles - } - when (recompilationDecision) { - RECOMPILE_ALL_CHUNK_AND_DEPENDANTS -> { + RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS -> { allCompiledFiles.clear() FSOperations.markDirtyRecursively(context, chunk) } - RECOMPILE_OTHERS_WITH_DEPENDANTS -> { + RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS -> { // Workaround for IDEA 14.0-14.0.2: extended version of markDirtyRecursively is not available try { Class.forName("org.jetbrains.jps.incremental.fs.CompilationRound") - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, fileFilter) + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, { file -> file !in allCompiledFiles }) } catch (e: ClassNotFoundException) { allCompiledFiles.clear() FSOperations.markDirtyRecursively(context, chunk) } } - RECOMPILE_OTHERS_IN_CHUNK -> { - FSOperations.markDirty(context, chunk, fileFilter) + RECOMPILE_OTHER_KOTLIN_IN_CHUNK -> { + FSOperations.markDirty(context, chunk, { file -> + KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles + }) } } return ADDITIONAL_PASS_REQUIRED diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index a45bc64f8ad..953d3f8a2a4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -119,9 +119,9 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private fun getRecompilationDecision(protoChanged: Boolean, constantsChanged: Boolean, inlinesChanged: Boolean) = when { - inlinesChanged -> RECOMPILE_ALL_CHUNK_AND_DEPENDANTS - constantsChanged -> RECOMPILE_OTHERS_WITH_DEPENDANTS - protoChanged -> RECOMPILE_OTHERS_IN_CHUNK + inlinesChanged -> RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS + constantsChanged -> RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS + protoChanged -> RECOMPILE_OTHER_KOTLIN_IN_CHUNK else -> DO_NOTHING } @@ -589,9 +589,9 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen enum class RecompilationDecision { DO_NOTHING - RECOMPILE_OTHERS_IN_CHUNK - RECOMPILE_OTHERS_WITH_DEPENDANTS - RECOMPILE_ALL_CHUNK_AND_DEPENDANTS + RECOMPILE_OTHER_KOTLIN_IN_CHUNK + RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS + RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS fun merge(other: RecompilationDecision): RecompilationDecision { return if (other.ordinal() > this.ordinal()) other else this diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 9ca202a651b..50c5e60d43b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -44,6 +44,11 @@ import junit.framework.TestCase import org.jetbrains.kotlin.jps.incremental.getKotlinCache import java.io.ByteArrayOutputStream import java.io.PrintStream +import org.jetbrains.jps.incremental.IncProjectBuilder +import org.jetbrains.jps.builders.BuildResult +import org.jetbrains.jps.incremental.BuilderRegistry +import org.jetbrains.jps.api.CanceledStatus +import org.jetbrains.jps.builders.java.dependencyView.Callbacks public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { class object { @@ -70,12 +75,19 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { protected open val customTest: Boolean get() = false + protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver? + get() = null + fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) val logger = MyLogger(workDirPath) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) try { - val buildResult = doBuild(descriptor, scope)!! + val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), myBuildParams, CanceledStatus.NULL, mockConstantSearch, true) + val buildResult = BuildResult() + builder.addMessageHandler(buildResult) + builder.build(scope.build(), false) + if (!buildResult.isSuccessful()) { val errorMessages = buildResult diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt new file mode 100644 index 00000000000..8293f92313f --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt @@ -0,0 +1,60 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +import org.jetbrains.jps.builders.java.dependencyView.Callbacks +import com.intellij.util.concurrency.FixedFuture +import java.io.File +import java.util.concurrent.Future + +public class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() { + fun testJavaConstantChangedUsedInKotlin() { + doTest("jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/") + } + + fun testJavaConstantUnchangedUsedInKotlin() { + doTest("jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/") + } + + fun testKotlinConstantChangedUsedInJava() { + doTest("jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/") + } + + fun testKotlinConstantUnchangedUsedInJava() { + doTest("jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/") + } + + override val mockConstantSearch: Callbacks.ConstantAffectionResolver? + get() = object : Callbacks.ConstantAffectionResolver { + override fun request( + ownerClassName: String?, + fieldName: String?, + accessFlags: Int, + fieldRemoved: Boolean, + accessChanged: Boolean + ): Future { + // We emulate how constant affection service works in IDEA: + // it is able to find Kotlin usages of Java constant, but can't find Java usages of Kotlin constant + val affectedFiles = if (ownerClassName == "JavaClass" && fieldName == "CONST") { + listOf(File(workDir, "src/usage.kt")) + } else { + emptyList() + } + return FixedFuture(Callbacks.ConstantAffection(affectedFiles)) + } + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java new file mode 100644 index 00000000000..888f27db4e3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java @@ -0,0 +1,3 @@ +public class JavaClass { + public static final String CONST = "A"; +} diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new new file mode 100644 index 00000000000..96ac5cb2bca --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/JavaClass.java.new @@ -0,0 +1,3 @@ +public class JavaClass { + public static final String CONST = "B"; +} diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log new file mode 100644 index 00000000000..554d1e2cead --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log @@ -0,0 +1,12 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files +Cleaning output files: +out/production/module/Usage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt new file mode 100644 index 00000000000..9f972262826 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt @@ -0,0 +1,2 @@ +deprecated(JavaClass.CONST + JavaClass.CONST) +class Usage diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java new file mode 100644 index 00000000000..888f27db4e3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java @@ -0,0 +1,3 @@ +public class JavaClass { + public static final String CONST = "A"; +} diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new new file mode 100644 index 00000000000..888f27db4e3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new @@ -0,0 +1,3 @@ +public class JavaClass { + public static final String CONST = "A"; +} diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log new file mode 100644 index 00000000000..1cefb7c31b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/JavaClass.class +End of files +Compiling files: +src/JavaClass.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt new file mode 100644 index 00000000000..9f972262826 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt @@ -0,0 +1,2 @@ +deprecated(JavaClass.CONST + JavaClass.CONST) +class Usage diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java new file mode 100644 index 00000000000..9430b8d5f66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/Usage.java @@ -0,0 +1,7 @@ +import test.*; + +class Usage { + public static void main(String[] args) { + System.out.println(Klass.CONST + Klass.CONST); + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log new file mode 100644 index 00000000000..8d7fdb6175c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/test/Klass$Default.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files +Compiling files: +src/Usage.java +End of files +Cleaning output files: +out/production/module/Usage.class +End of files +Compiling files: +src/Usage.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt new file mode 100644 index 00000000000..a3b30360e52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt @@ -0,0 +1,8 @@ +package test + +class Klass { + class object { + // Old and new constant values are different, but their hashes are the same + val CONST = "BF" + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new new file mode 100644 index 00000000000..8835b725265 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new @@ -0,0 +1,8 @@ +package test + +class Klass { + class object { + // Old and new constant values are different, but their hashes are the same + val CONST = "Ae" + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java new file mode 100644 index 00000000000..9430b8d5f66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/Usage.java @@ -0,0 +1,7 @@ +import test.*; + +class Usage { + public static void main(String[] args) { + System.out.println(Klass.CONST + Klass.CONST); + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log new file mode 100644 index 00000000000..6bc3a50bee0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/Klass$Default.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt new file mode 100644 index 00000000000..b13ee1c3c3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt @@ -0,0 +1,7 @@ +package test + +class Klass { + class object { + val CONST = "bar" + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new new file mode 100644 index 00000000000..b13ee1c3c3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new @@ -0,0 +1,7 @@ +package test + +class Klass { + class object { + val CONST = "bar" + } +} From fcd46cdf645e26e8f5ce61960366dfb03482fa2d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 16 Feb 2015 16:32:29 +0300 Subject: [PATCH 0286/1557] Minor. Clarified property name. Original commit: 7e9ea23ce0b9434cd00a5711e0cbae83f69824ac --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- .../kotlin/jps/build/IncrementalCacheVersionChangedTest.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 50c5e60d43b..61f75320692 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -72,7 +72,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { super.tearDown() } - protected open val customTest: Boolean + protected open val allowNoFilesWithSuffixInTestData: Boolean get() = false protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver? @@ -159,7 +159,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { fail("Bad test data format: files ending with both unnumbered and numbered \".new\"/\".delete\" were found") } if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { - if (customTest) { + if (allowNoFilesWithSuffixInTestData) { return listOf(listOf()) } else { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt index fa8aeacc9de..85e09bcdfb3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt @@ -32,7 +32,7 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() { doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/") } - override val customTest: Boolean + override val allowNoFilesWithSuffixInTestData: Boolean get() = true override fun performAdditionalModifications() { From 52134ed01b515c6bfc47edede180eb3209d03e75 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 16 Feb 2015 17:27:20 +0300 Subject: [PATCH 0287/1557] Filtering out non-existent directories from generated classpath. The check is so simple, because there may be, e.g. non-existent production output directory for just created module. #KT-6703 fixed Original commit: 4ddaa5cdda428f0fc5792c6f399649217e6d9c96 --- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index de324ea1d05..86f6dcdff95 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.build; +import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; @@ -117,7 +118,12 @@ public class KotlinBuilderModuleScriptGenerator { @NotNull private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { - return getAllDependencies(target).classes().getRoots(); + return ContainerUtil.filter(getAllDependencies(target).classes().getRoots(), new Condition() { + @Override + public boolean value(File file) { + return file.exists(); + } + }); } @NotNull From 7c78491e4286997bff1f36317c1bba173ba15ada Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 24 Nov 2014 20:20:03 +0300 Subject: [PATCH 0288/1557] Fixed test data according to fixed bug in IDEA JPS. Original commit: f09fd923f386a0364dd4c5f851222375be120f32 --- .../compilationErrorThenFixedWithPhantomPart/build.log | 9 --------- .../compilationErrorThenFixedWithPhantomPart2/build.log | 9 --------- .../convertBetweenJavaAndKotlin/javaToKotlin/build.log | 3 --- .../convertBetweenJavaAndKotlin/kotlinToJava/build.log | 1 - .../withJava/kotlinUsedInJava/changeSignature/build.log | 3 --- .../withJava/kotlinUsedInJava/funRenamed/build.log | 3 +++ .../kotlinUsedInJava/methodAddedInSuper/build.log | 3 +++ .../onlyTopLevelFunctionInFileRemoved/build.log | 3 --- .../withJava/kotlinUsedInJava/propertyRenamed/build.log | 3 +++ 9 files changed, 9 insertions(+), 28 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index ba859e438ea..a6026278652 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -18,13 +18,4 @@ End of files Compiling files: src/fun.kt src/usage.kt -End of files -Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class -out/production/module/_DefaultPackage$usage$*.class -out/production/module/_DefaultPackage.class -End of files -Compiling files: -src/fun.kt -src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index dae6fabaaff..f9cd95a4773 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -18,13 +18,4 @@ Compiling files: src/fun.kt src/other.kt src/usage.kt -End of files -Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class -out/production/module/_DefaultPackage$usage$*.class -out/production/module/_DefaultPackage.class -End of files -Compiling files: -src/fun.kt -src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index ec95b26dd18..314bb5ebad4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -4,9 +4,6 @@ End of files Compiling files: src/TheClass.kt End of files -Compiling files: -src/Usage.java -End of files Cleaning output files: out/production/module/Usage.class out/production/module/_DefaultPackage$usage$*.class diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 31cb37fef8a..7d8a70153b1 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -5,7 +5,6 @@ Compiling files: End of files Compiling files: src/TheClass.java -src/Usage.java End of files Cleaning output files: out/production/module/Usage.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index f0e3ef372f9..0433af7364a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -5,9 +5,6 @@ End of files Compiling files: src/fun.kt End of files -Compiling files: -src/Usage.java -End of files Cleaning output files: out/production/module/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 63f1f972e93..6c968a3fcb7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -5,6 +5,9 @@ End of files Compiling files: src/fun.kt End of files +Cleaning output files: +out/production/module/WillBeUnresolved.class +End of files Compiling files: src/WillBeUnresolved.java End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log index af4ae9aa96e..9cf77a4d2c9 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -4,6 +4,9 @@ End of files Compiling files: src/Super.kt End of files +Cleaning output files: +out/production/module/Sub.class +End of files Compiling files: src/Sub.java End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index f4c46b3facf..69cdf6584ff 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -5,9 +5,6 @@ End of files Compiling files: src/b.kt End of files -Compiling files: -src/Usage.java -End of files Cleaning output files: out/production/module/Usage.class out/production/module/test/TestPackage$a$*.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index e0214e9fc16..d1da86a26ea 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -5,6 +5,9 @@ End of files Compiling files: src/prop.kt End of files +Cleaning output files: +out/production/module/WillBeUnresolved.class +End of files Compiling files: src/WillBeUnresolved.java End of files From 88964f42765c32caa0eecd8d44cdb0f508b9d6a1 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 6 Feb 2015 20:13:03 +0300 Subject: [PATCH 0289/1557] Added tests with conversion between Java and Kotlin and moving class. Original commit: 460a77275a5e5ec5745e5999d5b9a5698a9b73a7 --- .../build/IncrementalJpsTestGenerated.java | 18 ++++++++++ .../incremental/pureKotlin/moveClass/a.kt | 1 + .../pureKotlin/moveClass/a.kt.delete.1 | 0 .../pureKotlin/moveClass/b.kt.delete.2 | 0 .../pureKotlin/moveClass/b.kt.new.1 | 1 + .../pureKotlin/moveClass/build.log | 13 ++++++++ .../javaToKotlinAndBack/Foo.java | 4 +++ .../javaToKotlinAndBack/Foo.java.delete.1 | 0 .../javaToKotlinAndBack/Foo.java.new.2 | 4 +++ .../javaToKotlinAndBack/Foo.kt.delete.2 | 0 .../javaToKotlinAndBack/Foo.kt.new.1 | 5 +++ .../javaToKotlinAndBack/build.log | 33 +++++++++++++++++++ .../javaToKotlinAndBack/usage.kt | 3 ++ .../javaToKotlinAndBack/usage.kt.new.1 | 3 ++ .../javaToKotlinAndBack/usage.kt.new.2 | 3 ++ .../javaToKotlinAndRemove/TheClass.java | 2 ++ .../TheClass.java.delete.1 | 0 .../TheClass.kt.delete.2 | 0 .../javaToKotlinAndRemove/TheClass.kt.new.1 | 1 + .../javaToKotlinAndRemove/build.log | 13 ++++++++ 20 files changed, 104 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index a8e6b201fb0..d21508ddb34 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -285,6 +285,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("moveClass") + public void testMoveClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); + doTest(fileName); + } + @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); @@ -449,6 +455,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("javaToKotlinAndBack") + public void testJavaToKotlinAndBack() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/"); + doTest(fileName); + } + + @TestMetadata("javaToKotlinAndRemove") + public void testJavaToKotlinAndRemove() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/"); + doTest(fileName); + } + @TestMetadata("kotlinToJava") public void testKotlinToJava() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/a.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2 b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 new file mode 100644 index 00000000000..43c42f1453b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/b.kt.new.1 @@ -0,0 +1 @@ +class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log new file mode 100644 index 00000000000..9918454d06c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/Foo.class +End of files +Compiling files: +src/b.kt +End of files + + +Cleaning output files: +out/production/module/Foo.class +End of files +Compiling files: +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java new file mode 100644 index 00000000000..4a55c67d4ac --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java @@ -0,0 +1,4 @@ +class Foo { + void bar() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 new file mode 100644 index 00000000000..4a55c67d4ac --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.java.new.2 @@ -0,0 +1,4 @@ +class Foo { + void bar() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 new file mode 100644 index 00000000000..fd3049a57c6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/Foo.kt.new.1 @@ -0,0 +1,5 @@ +class Foo { + fun baz() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log new file mode 100644 index 00000000000..392e88adfbd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -0,0 +1,33 @@ +Cleaning output files: +out/production/module/Foo.class +End of files +Cleaning output files: +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/Foo.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files + + +Cleaning output files: +out/production/module/Foo.class +End of files +Cleaning output files: +out/production/module/_DefaultPackage$usage$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/usage.kt +End of files +Compiling files: +src/Foo.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt new file mode 100644 index 00000000000..71ee477874c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt @@ -0,0 +1,3 @@ +fun main(args: Array) { + Foo().bar() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 new file mode 100644 index 00000000000..ad3a299f597 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.1 @@ -0,0 +1,3 @@ +fun main(args: Array) { + Foo().baz() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 new file mode 100644 index 00000000000..f66de4d04e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/usage.kt.new.2 @@ -0,0 +1,3 @@ +fun main(args: Array) { +// Foo().bar() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java new file mode 100644 index 00000000000..e53046270c9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java @@ -0,0 +1,2 @@ +public class TheClass { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.java.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 new file mode 100644 index 00000000000..d02d5373a87 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/TheClass.kt.new.1 @@ -0,0 +1 @@ +public class TheClass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log new file mode 100644 index 00000000000..15a35947ed4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/TheClass.class +End of files +Compiling files: +src/TheClass.kt +End of files + + +Cleaning output files: +out/production/module/TheClass.class +End of files +Compiling files: +End of files From d5e88324fcea9d5c77925cae5f65e9c1971e1e5a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 19 Feb 2015 14:31:34 +0300 Subject: [PATCH 0290/1557] Fixed test data according to fixed bug in IDEA JPS. Original commit: f1774bd6fb78b25824ae97775aee2a1a0628a8ad --- .../custom/kotlinConstantChangedUsedInJava/build.log | 3 --- 1 file changed, 3 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log index 8d7fdb6175c..687d949283e 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log @@ -5,9 +5,6 @@ End of files Compiling files: src/const.kt End of files -Compiling files: -src/Usage.java -End of files Cleaning output files: out/production/module/Usage.class End of files From 7076fe6eb1304a9bb1a37abcaee8fcc011f34081 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 5 Feb 2015 16:05:07 +0100 Subject: [PATCH 0291/1557] vendor and homepage Original commit: ce4b2db8f62085a49790ed7841158e8d53527110 --- jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml index e4d5917f809..12898ea9244 100644 --- a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml +++ b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml @@ -1,4 +1,4 @@ - + org.jetbrains.kotlin.bare Kotlin Bare Compiler for IntelliJ IDEA @@ -10,7 +10,7 @@ This plugin is only capable of compiling Kotlin code. All highlighting, inspections, refactorings are disabled.]]> @snapshot@ - JetBrains Inc. + JetBrains s.r.o. From 0b7c9870a674a41a9158d768107ddb656ca0e7c1 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 16 Feb 2015 14:46:55 +0300 Subject: [PATCH 0292/1557] Do not generate long lines and simplify merge in generated tests Original commit: 8ea9d39e98f1dce99bb19b626472e73e4a5cc6cd --- .../build/IncrementalJpsTestGenerated.java | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index d21508ddb34..e2f9ae29c1a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -28,12 +28,17 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({IncrementalJpsTestGenerated.MultiModule.class, IncrementalJpsTestGenerated.PureKotlin.class, IncrementalJpsTestGenerated.WithJava.class}) +@InnerTestClasses({ + IncrementalJpsTestGenerated.MultiModule.class, + IncrementalJpsTestGenerated.PureKotlin.class, + IncrementalJpsTestGenerated.WithJava.class, +}) @RunWith(JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({}) + @InnerTestClasses({ + }) @RunWith(JUnit3RunnerWithInners.class) public static class MultiModule extends AbstractIncrementalJpsTest { public void testAllFilesPresentInMultiModule() throws Exception { @@ -104,7 +109,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({}) + @InnerTestClasses({ + }) @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") @@ -433,7 +439,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({WithJava.ConvertBetweenJavaAndKotlin.class, WithJava.JavaUsedInKotlin.class, WithJava.KotlinUsedInJava.class}) + @InnerTestClasses({ + WithJava.ConvertBetweenJavaAndKotlin.class, + WithJava.JavaUsedInKotlin.class, + WithJava.KotlinUsedInJava.class, + }) @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { @@ -442,7 +452,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({}) + @InnerTestClasses({ + }) @RunWith(JUnit3RunnerWithInners.class) public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { @@ -477,7 +488,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({JavaUsedInKotlin.SamConversions.class}) + @InnerTestClasses({ + JavaUsedInKotlin.SamConversions.class, + }) @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { @@ -534,7 +547,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({}) + @InnerTestClasses({ + }) @RunWith(JUnit3RunnerWithInners.class) public static class SamConversions extends AbstractIncrementalJpsTest { public void testAllFilesPresentInSamConversions() throws Exception { @@ -558,7 +572,8 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({}) + @InnerTestClasses({ + }) @RunWith(JUnit3RunnerWithInners.class) public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInKotlinUsedInJava() throws Exception { From 0a8fa0238d5f5367d59468b763ff86ccde791169 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 26 Feb 2015 12:21:32 +0300 Subject: [PATCH 0293/1557] Add kotlin runtime to idea-jps-common module dependency #KT-6826 Fixed Original commit: c8c1ce521bb91714bb7cf7ef5eb459e47fbdfe57 --- jps/jps-common/idea-jps-common.iml | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-common/idea-jps-common.iml b/jps/jps-common/idea-jps-common.iml index c90834f2d60..44071adbdcd 100644 --- a/jps/jps-common/idea-jps-common.iml +++ b/jps/jps-common/idea-jps-common.iml @@ -7,5 +7,6 @@ + \ No newline at end of file From 889a3d38ad81f210cd18b702b9ff53de2d87933f Mon Sep 17 00:00:00 2001 From: Mikhail Mutcianko Date: Wed, 13 Aug 2014 14:43:58 +0400 Subject: [PATCH 0294/1557] add android layout file searching to kotlin jps plugin Original commit: c6b8cbbb01d1b79a915e46dbf885943fc0a44475 --- jps/jps-plugin/jps-plugin.iml | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index e1a14e4e2d8..85b9676426c 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -20,6 +20,7 @@ + From 3a25b47683181584524fcf36842b00d2654e221b Mon Sep 17 00:00:00 2001 From: Mikhail Mutcianko Date: Fri, 22 Aug 2014 18:01:14 +0400 Subject: [PATCH 0295/1557] fix android plugin libs dependencies Original commit: ec0d1f5d06e7e9d7f1348ac9b4f936a9c66b8f27 --- jps/jps-plugin/jps-plugin.iml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 85b9676426c..201c8d3bb04 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -20,8 +20,8 @@ - + - \ No newline at end of file + From 5164cb06b5dccdb97f258a8a5bfcc350e71fd748 Mon Sep 17 00:00:00 2001 From: Mikhail Mutcianko Date: Tue, 9 Sep 2014 16:54:10 +0400 Subject: [PATCH 0296/1557] fix android resource path arguments after rebase Original commit: baa442207b5b9bc5d8eb0b571d2d5f4d3e30ed53 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1d5cd4e977a..2a13192a5c2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -64,7 +64,10 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.jps.android.AndroidJpsUtil import org.jetbrains.kotlin.utils.sure +import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { class object { @@ -430,6 +433,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return outputItemCollector } + private fun getAndroidResPath(module: JpsModule, context: CompileContext): String { + val extension = AndroidJpsUtil.getExtension(module)!! + val path = AndroidJpsUtil.getResourceDirForCompilationPath(extension) + return File(path!!.getAbsolutePath() + "/layout").getAbsolutePath() + } + + private fun getAndroidManifest(module: JpsModule): String { + val extension = AndroidJpsUtil.getExtension(module)!! + return AndroidJpsUtil.getManifestFileForCompilationPath(extension)!!.getAbsolutePath() + } + public class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { From 7864e1487016a4940eb9c4ad5ab57dc4636a5645 Mon Sep 17 00:00:00 2001 From: Mikhail Mutcianko Date: Tue, 9 Sep 2014 19:03:08 +0400 Subject: [PATCH 0297/1557] add android jps builder test stub wtf Original commit: 1912b2b0ec8ba76238353002157743cb47ca6c02 --- jps/jps-plugin/jps-plugin.iml | 13 ++++++ .../kotlin/jps/build/KotlinBuilder.kt | 6 ++- .../android/AbstractAndroidJpsTestCase.kt | 33 ++++++++++++++ .../android/AndroidJpsTestCaseGenerated.java | 44 +++++++++++++++++++ .../android/simple/AndroidManifest.xml | 16 +++++++ .../android/simple/res/layout/main.xml | 13 ++++++ .../testData/android/simple/simple.iml | 44 +++++++++++++++++++ .../testData/android/simple/simple.ipr | 18 ++++++++ .../simple/src/com/example/myapp/Foo.java | 10 +++++ .../src/com/example/myapp/MyActivity.kt | 19 ++++++++ 10 files changed, 214 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt create mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java create mode 100644 jps/jps-plugin/testData/android/simple/AndroidManifest.xml create mode 100644 jps/jps-plugin/testData/android/simple/res/layout/main.xml create mode 100644 jps/jps-plugin/testData/android/simple/simple.iml create mode 100644 jps/jps-plugin/testData/android/simple/simple.ipr create mode 100644 jps/jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java create mode 100644 jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 201c8d3bb04..69240513cb7 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -23,5 +23,18 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 2a13192a5c2..a50171c021a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -434,13 +434,15 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } private fun getAndroidResPath(module: JpsModule, context: CompileContext): String { - val extension = AndroidJpsUtil.getExtension(module)!! + val extension = AndroidJpsUtil.getExtension(module) + if (extension == null) return "" val path = AndroidJpsUtil.getResourceDirForCompilationPath(extension) return File(path!!.getAbsolutePath() + "/layout").getAbsolutePath() } private fun getAndroidManifest(module: JpsModule): String { - val extension = AndroidJpsUtil.getExtension(module)!! + val extension = AndroidJpsUtil.getExtension(module) + if (extension == null) return "" return AndroidJpsUtil.getManifestFileForCompilationPath(extension)!!.getAbsolutePath() } diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt new file mode 100644 index 00000000000..05de8ff8005 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt @@ -0,0 +1,33 @@ +/* + * Copyright 2010-2014 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.jps.build.android + +import org.jetbrains.jps.builders.JpsBuildTestCase + +public abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() { + private val SDK_NAME = "Android_SDK" + override fun setUp() { + super.setUp() + System.setProperty("kotlin.jps.tests", "true") + } + public fun doTest(path: String) { + addJdk(SDK_NAME, getHomePath() + "/androidSDK/platforms/android-17" + "/android.jar") + loadProject(path + getTestName(true) + ".ipr") + rebuildAll() + makeAll().assertSuccessful() + } +} diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java new file mode 100644 index 00000000000..bc507501bfc --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java @@ -0,0 +1,44 @@ +/* + * Copyright 2010-2014 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.jps.build.android; + +import com.intellij.testFramework.TestDataPath; +import junit.framework.Test; +import junit.framework.TestSuite; +import org.jetbrains.jet.JetTestUtils; +import org.jetbrains.jet.test.InnerTestClasses; +import org.jetbrains.jet.test.TestMetadata; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/android") +@TestDataPath("$PROJECT_ROOT") +public class AndroidJpsTestCaseGenerated extends AbstractAndroidJpsTestCase { + public void testAllFilesPresentInAndroid() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false); + } + + @TestMetadata("simple") + public void testSimple() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/android/simple/"); + doTest(fileName); + } + +} diff --git a/jps/jps-plugin/testData/android/simple/AndroidManifest.xml b/jps/jps-plugin/testData/android/simple/AndroidManifest.xml new file mode 100644 index 00000000000..57d0d4c3e82 --- /dev/null +++ b/jps/jps-plugin/testData/android/simple/AndroidManifest.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/android/simple/res/layout/main.xml b/jps/jps-plugin/testData/android/simple/res/layout/main.xml new file mode 100644 index 00000000000..024accd07c7 --- /dev/null +++ b/jps/jps-plugin/testData/android/simple/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/jps/jps-plugin/testData/android/simple/simple.iml b/jps/jps-plugin/testData/android/simple/simple.iml new file mode 100644 index 00000000000..b92085bd371 --- /dev/null +++ b/jps/jps-plugin/testData/android/simple/simple.iml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/android/simple/simple.ipr b/jps/jps-plugin/testData/android/simple/simple.ipr new file mode 100644 index 00000000000..a80d5700fa2 --- /dev/null +++ b/jps/jps-plugin/testData/android/simple/simple.ipr @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java b/jps/jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java new file mode 100644 index 00000000000..03041b80591 --- /dev/null +++ b/jps/jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java @@ -0,0 +1,10 @@ +package com.example.myapp; + +/** + * Created by miha on 8/6/14. + */ +public class Foo { + public static void main(String[] args) { + System.out.println(R.id.LOL); + } +} diff --git a/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt b/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt new file mode 100644 index 00000000000..38d44fe8136 --- /dev/null +++ b/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt @@ -0,0 +1,19 @@ +package com.example.myapp + +import android.app.Activity +import android.os.Bundle + +public class MyActivity : Activity() { + /** + * Called when the activity is first created. + */ + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.main) + println(R.id.LOL) + fuck + this.LOL + LOL.setText("UIGFVIYUGFKGYUFOD") + LOL.setText("test") + } +} From 6e3e9b634681f8b7092b95f65bc6db0997060e28 Mon Sep 17 00:00:00 2001 From: Mikhail Mutcianko Date: Sat, 20 Sep 2014 23:34:38 +0400 Subject: [PATCH 0298/1557] fix android jps build test case - add proper way of setting up android sdk for jps - add missing android plugin runtime library Original commit: 95fd4006d94dff0f08a1e294e277c073537f1e18 --- .../android/AbstractAndroidJpsTestCase.kt | 41 ++++++++++++++++++- .../android/simple/AndroidManifest.xml | 4 +- .../android/simple/res/layout/main.xml | 2 +- .../testData/android/simple/simple.iml | 2 +- .../testData/android/simple/simple.ipr | 2 +- .../simple/src/com/example/myapp/Foo.java | 10 ----- .../src/com/example/myapp/MyActivity.kt | 9 +--- 7 files changed, 45 insertions(+), 25 deletions(-) delete mode 100644 jps/jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt index 05de8ff8005..e1b06bdaa45 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt @@ -17,17 +17,54 @@ package org.jetbrains.jet.jps.build.android import org.jetbrains.jps.builders.JpsBuildTestCase +import org.jetbrains.jps.android.model.JpsAndroidSdkProperties +import org.jetbrains.jps.android.model.JpsAndroidSdkType +import org.jetbrains.jps.model.library.JpsOrderRootType +import org.jetbrains.jps.model.JpsSimpleElement +import org.jetbrains.jps.model.library.sdk.JpsSdk +import org.jetbrains.jps.model.impl.JpsSimpleElementImpl + +import java.io.File public abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() { - private val SDK_NAME = "Android_SDK" + + private val SDK_NAME = "Android API 17 Platform" + override fun setUp() { super.setUp() System.setProperty("kotlin.jps.tests", "true") } + public fun doTest(path: String) { - addJdk(SDK_NAME, getHomePath() + "/androidSDK/platforms/android-17" + "/android.jar") + addJdkAndAndroidSdk() loadProject(path + getTestName(true) + ".ipr") rebuildAll() makeAll().assertSuccessful() + deleteDirectory(File(path + "/out")) + } + + public fun deleteDirectory(path: File): Boolean { + if (path.exists() && path.isDirectory()) { + val files = path.listFiles()!! + for (i in files.indices) { + if (files[i].isDirectory()) { + deleteDirectory(files[i]) + } + else { + files[i].delete() + } + } + } + return (path.delete()) + } + + private fun addJdkAndAndroidSdk(): JpsSdk> { + val jdkName = "java_sdk" + addJdk(jdkName) + val properties = JpsAndroidSdkProperties("android-17", jdkName) + val sdkPath = getHomePath() + "/androidSDK/" + val library = myModel!!.getGlobal().addSdk>(SDK_NAME, sdkPath, "", JpsAndroidSdkType.INSTANCE, JpsSimpleElementImpl(properties)) + library!!.addRoot(File(sdkPath + "/platforms/android-17/android.jar"), JpsOrderRootType.COMPILED) + return library.getProperties() } } diff --git a/jps/jps-plugin/testData/android/simple/AndroidManifest.xml b/jps/jps-plugin/testData/android/simple/AndroidManifest.xml index 57d0d4c3e82..85352f74f1b 100644 --- a/jps/jps-plugin/testData/android/simple/AndroidManifest.xml +++ b/jps/jps-plugin/testData/android/simple/AndroidManifest.xml @@ -4,9 +4,9 @@ android:versionCode="1" android:versionName="1.0"> - + + android:label="app_name"> diff --git a/jps/jps-plugin/testData/android/simple/res/layout/main.xml b/jps/jps-plugin/testData/android/simple/res/layout/main.xml index 024accd07c7..aceae08fc2f 100644 --- a/jps/jps-plugin/testData/android/simple/res/layout/main.xml +++ b/jps/jps-plugin/testData/android/simple/res/layout/main.xml @@ -8,6 +8,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:text="Hello World, MyActivity" - android:id="@+id/LOL"/> + android:id="@+id/textField"/> diff --git a/jps/jps-plugin/testData/android/simple/simple.iml b/jps/jps-plugin/testData/android/simple/simple.iml index b92085bd371..6dfe1ad5ce8 100644 --- a/jps/jps-plugin/testData/android/simple/simple.iml +++ b/jps/jps-plugin/testData/android/simple/simple.iml @@ -36,7 +36,7 @@ - + diff --git a/jps/jps-plugin/testData/android/simple/simple.ipr b/jps/jps-plugin/testData/android/simple/simple.ipr index a80d5700fa2..0c3ebcbc5ae 100644 --- a/jps/jps-plugin/testData/android/simple/simple.ipr +++ b/jps/jps-plugin/testData/android/simple/simple.ipr @@ -11,7 +11,7 @@ - + diff --git a/jps/jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java b/jps/jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java deleted file mode 100644 index 03041b80591..00000000000 --- a/jps/jps-plugin/testData/android/simple/src/com/example/myapp/Foo.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.example.myapp; - -/** - * Created by miha on 8/6/14. - */ -public class Foo { - public static void main(String[] args) { - System.out.println(R.id.LOL); - } -} diff --git a/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt b/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt index 38d44fe8136..b57014a16bf 100644 --- a/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt +++ b/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt @@ -4,16 +4,9 @@ import android.app.Activity import android.os.Bundle public class MyActivity : Activity() { - /** - * Called when the activity is first created. - */ override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.main) - println(R.id.LOL) - fuck - this.LOL - LOL.setText("UIGFVIYUGFKGYUFOD") - LOL.setText("test") + textField.setText("test") } } From 6aa4a3c16af41f786029c480a290c7abbfa49bbd Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Tue, 23 Sep 2014 18:20:50 +0400 Subject: [PATCH 0299/1557] Compiler plugins can provide extra command line parameters in JPS Original commit: febfdde89e0c7f1d2aee0c8e5d1fc35a5c8e82c7 --- .../KotlinJpsCompilerArgumentsProvider.kt | 25 +++++++++++++++++++ .../kotlin/jps/build/KotlinBuilder.kt | 24 ++++++++---------- 2 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt new file mode 100644 index 00000000000..065b2644b37 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt @@ -0,0 +1,25 @@ +/* + * Copyright 2010-2014 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.jps.build + +import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.jps.incremental.CompileContext + +public trait KotlinJpsCompilerArgumentsProvider { + public fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a50171c021a..72b007a0d10 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -40,6 +40,7 @@ import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage import java.io.File +import java.lang.reflect.Modifier import java.util.* import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* @@ -139,6 +140,16 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } + val representativeTarget = chunk.representativeTarget() + + for (argumentProvider in ServiceLoader.load(javaClass())) { + // appending to pluginOptions + commonArguments.pluginOptions = array( + *(commonArguments.pluginOptions ?: array()), + *argumentProvider.getExtraArguments(representativeTarget, context).copyToArray() + ) + } + compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) } @@ -433,19 +444,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return outputItemCollector } - private fun getAndroidResPath(module: JpsModule, context: CompileContext): String { - val extension = AndroidJpsUtil.getExtension(module) - if (extension == null) return "" - val path = AndroidJpsUtil.getResourceDirForCompilationPath(extension) - return File(path!!.getAbsolutePath() + "/layout").getAbsolutePath() - } - - private fun getAndroidManifest(module: JpsModule): String { - val extension = AndroidJpsUtil.getExtension(module) - if (extension == null) return "" - return AndroidJpsUtil.getManifestFileForCompilationPath(extension)!!.getAbsolutePath() - } - public class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { From fb8ca13e71a7c6e04865d85f85e2dc6b684b2311 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 17 Oct 2014 19:52:39 +0400 Subject: [PATCH 0300/1557] Providing plugin classpath through JPS extensions Original commit: af9c5cc45df13cd553d34cb6854adaae5678e5f5 --- .../build/KotlinJpsCompilerArgumentsProvider.kt | 1 + .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt index 065b2644b37..3a3833d83e6 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt @@ -22,4 +22,5 @@ import org.jetbrains.jps.incremental.CompileContext public trait KotlinJpsCompilerArgumentsProvider { public fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List + public fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List } \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 72b007a0d10..cb10338f474 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -142,11 +142,20 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val representativeTarget = chunk.representativeTarget() + fun concatenate(strings: Array?, cp: List) = array(*(strings ?: array()), *cp.copyToArray()) + for (argumentProvider in ServiceLoader.load(javaClass())) { // appending to pluginOptions - commonArguments.pluginOptions = array( - *(commonArguments.pluginOptions ?: array()), - *argumentProvider.getExtraArguments(representativeTarget, context).copyToArray() + commonArguments.pluginOptions = concatenate(commonArguments.pluginOptions, + argumentProvider.getExtraArguments(representativeTarget, context)) + // appending to classpath + commonArguments.pluginClasspaths = concatenate(commonArguments.pluginClasspaths, + argumentProvider.getClasspath(representativeTarget, context)) + + messageCollector.report( + INFO, + "Plugin loaded: ${argumentProvider.javaClass.getSimpleName()}", + NO_LOCATION ) } From 84d5c944663e5617a586b86a656ed2cec3dbebb6 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 6 Nov 2014 15:19:16 +0300 Subject: [PATCH 0301/1557] Move Android JPS plugin tests to android-jps-plugin module Original commit: b7f8496e5bd7d3967b74b4f3b0715dff8fb608f6 --- .../android/AbstractAndroidJpsTestCase.kt | 70 ------------------- .../android/AndroidJpsTestCaseGenerated.java | 44 ------------ .../android/simple/AndroidManifest.xml | 16 ----- .../android/simple/res/layout/main.xml | 13 ---- .../testData/android/simple/simple.iml | 44 ------------ .../testData/android/simple/simple.ipr | 18 ----- .../src/com/example/myapp/MyActivity.kt | 12 ---- 7 files changed, 217 deletions(-) delete mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt delete mode 100644 jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java delete mode 100644 jps/jps-plugin/testData/android/simple/AndroidManifest.xml delete mode 100644 jps/jps-plugin/testData/android/simple/res/layout/main.xml delete mode 100644 jps/jps-plugin/testData/android/simple/simple.iml delete mode 100644 jps/jps-plugin/testData/android/simple/simple.ipr delete mode 100644 jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt deleted file mode 100644 index e1b06bdaa45..00000000000 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AbstractAndroidJpsTestCase.kt +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2010-2014 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.jps.build.android - -import org.jetbrains.jps.builders.JpsBuildTestCase -import org.jetbrains.jps.android.model.JpsAndroidSdkProperties -import org.jetbrains.jps.android.model.JpsAndroidSdkType -import org.jetbrains.jps.model.library.JpsOrderRootType -import org.jetbrains.jps.model.JpsSimpleElement -import org.jetbrains.jps.model.library.sdk.JpsSdk -import org.jetbrains.jps.model.impl.JpsSimpleElementImpl - -import java.io.File - -public abstract class AbstractAndroidJpsTestCase : JpsBuildTestCase() { - - private val SDK_NAME = "Android API 17 Platform" - - override fun setUp() { - super.setUp() - System.setProperty("kotlin.jps.tests", "true") - } - - public fun doTest(path: String) { - addJdkAndAndroidSdk() - loadProject(path + getTestName(true) + ".ipr") - rebuildAll() - makeAll().assertSuccessful() - deleteDirectory(File(path + "/out")) - } - - public fun deleteDirectory(path: File): Boolean { - if (path.exists() && path.isDirectory()) { - val files = path.listFiles()!! - for (i in files.indices) { - if (files[i].isDirectory()) { - deleteDirectory(files[i]) - } - else { - files[i].delete() - } - } - } - return (path.delete()) - } - - private fun addJdkAndAndroidSdk(): JpsSdk> { - val jdkName = "java_sdk" - addJdk(jdkName) - val properties = JpsAndroidSdkProperties("android-17", jdkName) - val sdkPath = getHomePath() + "/androidSDK/" - val library = myModel!!.getGlobal().addSdk>(SDK_NAME, sdkPath, "", JpsAndroidSdkType.INSTANCE, JpsSimpleElementImpl(properties)) - library!!.addRoot(File(sdkPath + "/platforms/android-17/android.jar"), JpsOrderRootType.COMPILED) - return library.getProperties() - } -} diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java deleted file mode 100644 index bc507501bfc..00000000000 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/android/AndroidJpsTestCaseGenerated.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2010-2014 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.jps.build.android; - -import com.intellij.testFramework.TestDataPath; -import junit.framework.Test; -import junit.framework.TestSuite; -import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.test.InnerTestClasses; -import org.jetbrains.jet.test.TestMetadata; - -import java.io.File; -import java.util.regex.Pattern; - -/** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ -@SuppressWarnings("all") -@TestMetadata("jps-plugin/testData/android") -@TestDataPath("$PROJECT_ROOT") -public class AndroidJpsTestCaseGenerated extends AbstractAndroidJpsTestCase { - public void testAllFilesPresentInAndroid() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/android"), Pattern.compile("^([^\\.]+)$"), false); - } - - @TestMetadata("simple") - public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/android/simple/"); - doTest(fileName); - } - -} diff --git a/jps/jps-plugin/testData/android/simple/AndroidManifest.xml b/jps/jps-plugin/testData/android/simple/AndroidManifest.xml deleted file mode 100644 index 85352f74f1b..00000000000 --- a/jps/jps-plugin/testData/android/simple/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/android/simple/res/layout/main.xml b/jps/jps-plugin/testData/android/simple/res/layout/main.xml deleted file mode 100644 index aceae08fc2f..00000000000 --- a/jps/jps-plugin/testData/android/simple/res/layout/main.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/jps/jps-plugin/testData/android/simple/simple.iml b/jps/jps-plugin/testData/android/simple/simple.iml deleted file mode 100644 index 6dfe1ad5ce8..00000000000 --- a/jps/jps-plugin/testData/android/simple/simple.iml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/android/simple/simple.ipr b/jps/jps-plugin/testData/android/simple/simple.ipr deleted file mode 100644 index 0c3ebcbc5ae..00000000000 --- a/jps/jps-plugin/testData/android/simple/simple.ipr +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt b/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt deleted file mode 100644 index b57014a16bf..00000000000 --- a/jps/jps-plugin/testData/android/simple/src/com/example/myapp/MyActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.example.myapp - -import android.app.Activity -import android.os.Bundle - -public class MyActivity : Activity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.main) - textField.setText("test") - } -} From 7c0926fb1f8dc78918a871297466643ca248f834 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 13 Nov 2014 16:05:38 +0300 Subject: [PATCH 0302/1557] Android plugin test dependencies added Original commit: a8e3e4d8defdd5428c5702ef0577b9fd2a93a833 --- jps/jps-plugin/jps-plugin.iml | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 69240513cb7..b5f762afe93 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -36,5 +36,6 @@ + From 2ea959c11507da1dfd34ef0685a73e8bde72079d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 3 Feb 2015 18:37:49 +0300 Subject: [PATCH 0303/1557] Codebase update Original commit: c756cfef860b4c483aba984822ac4247ce0aa4c9 --- .../jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt index 3a3833d83e6..0b5650aeef7 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt @@ -16,7 +16,6 @@ package org.jetbrains.jet.jps.build -import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.CompileContext From 2c6719339d8a4f220a191b5118503bf9393de428 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 10 Feb 2015 18:22:21 +0300 Subject: [PATCH 0304/1557] Rename jet to kotlin in Android JPS plugin Original commit: ccbbaba7cd5a07ed1baf775b7057d66e7d956f08 --- .../jps/build/KotlinJpsCompilerArgumentsProvider.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename jps/jps-plugin/src/org/jetbrains/{jet => kotlin}/jps/build/KotlinJpsCompilerArgumentsProvider.kt (92%) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt similarity index 92% rename from jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt index 0b5650aeef7..5b9286bd4f7 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinJpsCompilerArgumentsProvider.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2014 JetBrains s.r.o. + * Copyright 2010-2015 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. @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.jet.jps.build +package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.CompileContext From 103bc271bf80cf1829935faa852d707b57d1add5 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 18 Feb 2015 17:38:15 +0300 Subject: [PATCH 0305/1557] Gradle dependency from jps-plugin removed Original commit: 17bdcfe03fe05ca805119a0195fa96f060ebd5ce --- jps/jps-plugin/jps-plugin.iml | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index b5f762afe93..e1a14e4e2d8 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -20,22 +20,7 @@ - - - - - - - - - - - - - - - - + \ No newline at end of file From 8d452e4b0a2fa3cf9356a45d06bc7631d2f878d3 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 18 Feb 2015 17:39:55 +0300 Subject: [PATCH 0306/1557] Removed Android dependencies from core modules Original commit: 7423e30065fc1e1c7b9001576f015a0a2c6c17b9 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index cb10338f474..6266658a7fa 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -66,7 +66,6 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.jps.model.module.JpsModule -import org.jetbrains.jps.android.AndroidJpsUtil import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider From 6fc44a498f2bdfe56a081d4027a43da15856616e Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 3 Mar 2015 17:28:24 +0300 Subject: [PATCH 0307/1557] Refactor: process mentions of class object Rename usages that refer to "default object" concept now Test data file names are left as is Original commit: 48fbce95829f8ca96ff7252c879586ab3e504ba1 --- .../javaUsedInKotlin/samConversions/methodAdded/build.log | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index 0a8d4fef107..28ca5a5e406 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -18,6 +18,6 @@ src/usageWithFunctionLiteral.kt End of files COMPILATION FAILED Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a class object +Please specify constructor invocation; classifier 'SamInterface' does not have a default object Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a class object \ No newline at end of file +Please specify constructor invocation; classifier 'SamInterface' does not have a default object \ No newline at end of file From f0908bed24a461d5a7a87d650ab20da4d88b011e Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 3 Mar 2015 21:44:08 +0300 Subject: [PATCH 0308/1557] Incremental: fixed adding file to package and using it from Java Original commit: 3aa5f5200b96709c8cdab9f99f8923c2b3169395 --- .../build/IncrementalJpsTestGenerated.java | 6 ++++++ .../packageFileAdded/Usage.java | 5 +++++ .../packageFileAdded/Usage.java.new | 6 ++++++ .../kotlinUsedInJava/packageFileAdded/a.kt | 4 ++++ .../packageFileAdded/b.kt.new | 4 ++++ .../packageFileAdded/build.log | 20 +++++++++++++++++++ 6 files changed, 45 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index e2f9ae29c1a..6748008890c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -628,6 +628,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("packageFileAdded") + public void testPackageFileAdded() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/"); + doTest(fileName); + } + @TestMetadata("propertyRenamed") public void testPropertyRenamed() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java new file mode 100644 index 00000000000..d1dcba0d6fa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java @@ -0,0 +1,5 @@ +class Usage { + void usage() { + test.TestPackage.a(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new new file mode 100644 index 00000000000..bff530ab5c1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new @@ -0,0 +1,6 @@ +class Usage { + void usage() { + test.TestPackage.a(); + test.TestPackage.b(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt new file mode 100644 index 00000000000..eeaf99f195c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt @@ -0,0 +1,4 @@ +package test + +fun a() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new new file mode 100644 index 00000000000..783ac74aae8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new @@ -0,0 +1,4 @@ +package test + +fun b() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log new file mode 100644 index 00000000000..6fd8bf35799 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -0,0 +1,20 @@ +Cleaning output files: +out/production/module/Usage.class +End of files +Compiling files: +src/b.kt +End of files +Compiling files: +src/Usage.java +End of files +Cleaning output files: +out/production/module/Usage.class +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files +Compiling files: +src/Usage.java +End of files \ No newline at end of file From 1f02042a4888236e06e64054fde44911e2ffaa1a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 5 Mar 2015 17:19:10 +0300 Subject: [PATCH 0309/1557] Update to Idea 141.2.2 Original commit: 7de794d38187f2bfaaf8703f710bb42db67e97dc --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 22515bce97f..2dc9049e3ca 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -144,7 +144,7 @@ public class KotlinCompilerRunner { T copy = XmlSerializerUtil.createCopy(to); for (Accessor accessor : XmlSerializerUtil.getAccessors(from.getClass())) { - accessor.write(copy, accessor.read(from)); + accessor.set(copy, accessor.read(from)); } return copy; From fc8f852773232f3d8d4febb2ce4191558c6051cd Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 5 Mar 2015 19:14:56 +0300 Subject: [PATCH 0310/1557] Temporary copy beans with reflection while there's no library method in TeamCity JPS Original commit: e70098a2d4894e331802232aa3413a76dd38494a --- .../compilerRunner/KotlinCompilerRunner.java | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 2dc9049e3ca..8e551e45c4a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -31,8 +31,10 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; import org.jetbrains.kotlin.config.CompilerSettings; +import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.*; +import java.lang.reflect.Method; import java.util.Collection; import java.util.List; @@ -143,13 +145,32 @@ public class KotlinCompilerRunner { private static T mergeBeans(F from, T to) { T copy = XmlSerializerUtil.createCopy(to); + // TODO: Rewrite with XmlSerializerUtil.copyBean() after method is in Teamcity JPS (9.1 expected) for (Accessor accessor : XmlSerializerUtil.getAccessors(from.getClass())) { - accessor.set(copy, accessor.read(from)); + if (!setValue("set", false, accessor, copy, accessor.read(from))) { + setValue("write", true, accessor, copy, accessor.read(from)); + } } return copy; } + private static boolean setValue(String methodName, boolean failOnReflection, Accessor accessor, Object from, Object copy) { + try { + Method method = Accessor.class.getMethod(methodName, Object.class, Object.class); + method.invoke(accessor, from, copy); + + return true; + } + catch (Throwable e) { + if (failOnReflection) { + throw UtilsPackage.rethrow(e); + } + } + + return false; + } + private static void setupK2JvmArguments(File moduleFile, K2JVMCompilerArguments settings) { settings.module = moduleFile.getAbsolutePath(); settings.noStdlib = true; From ebb37aed1d0c85358ffb6440faf6111e1e2de123 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 6 Mar 2015 12:51:59 +0300 Subject: [PATCH 0311/1557] Replace 'class object' with 'default object' in renderers and test data Includes changes to decompiled text Old syntax is used in builtins and project code for now Original commit: 59f192ef900c2239649c3628d09c343264367a37 --- .../incremental/custom/kotlinConstantChangedUsedInJava/const.kt | 2 +- .../custom/kotlinConstantChangedUsedInJava/const.kt.new | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/const.kt | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/const.kt.new | 2 +- .../incremental/pureKotlin/classObjectConstantChanged/const.kt | 2 +- .../pureKotlin/classObjectConstantChanged/const.kt.new | 2 +- .../testData/incremental/pureKotlin/constantsUnchanged/const.kt | 2 +- .../incremental/pureKotlin/constantsUnchanged/const.kt.new | 2 +- .../pureKotlin/traitClassObjectConstantChanged/const.kt | 2 +- .../pureKotlin/traitClassObjectConstantChanged/const.kt.new | 2 +- .../withJava/kotlinUsedInJava/constantChanged/const.kt | 2 +- .../withJava/kotlinUsedInJava/constantChanged/const.kt.new | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/const.kt | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/const.kt.new | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt index a3b30360e52..dceaef294f2 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new index 8835b725265..bb50d7fc183 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt index b13ee1c3c3b..7f4d76ba88b 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new index b13ee1c3c3b..7f4d76ba88b 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt index a3b30360e52..dceaef294f2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new index 8835b725265..bb50d7fc183 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt index 8261acd68a1..3ce58ed9dc9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt @@ -3,7 +3,7 @@ package test val CONST = "foo" class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new index 8261acd68a1..3ce58ed9dc9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new @@ -3,7 +3,7 @@ package test val CONST = "foo" class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt index 71c8e2eaa7c..dcbca7fe3a7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt @@ -1,7 +1,7 @@ package test trait Trait { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new index 0ef22fbf6b8..926b500fbf0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new @@ -1,7 +1,7 @@ package test trait Trait { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt index a3b30360e52..dceaef294f2 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new index 8835b725265..bb50d7fc183 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt index b13ee1c3c3b..7f4d76ba88b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new index b13ee1c3c3b..7f4d76ba88b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { val CONST = "bar" } } From 3f941235162e7e8ec62f4c2e21a3061b0145b8f5 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 10 Mar 2015 15:33:19 +0300 Subject: [PATCH 0312/1557] Replace 'class object' with default object in project code Original commit: 9ecf95532eaea09b56f76b089690d49e69e3c50d --- .../src/org/jetbrains/kotlin/config/CompilerSettings.kt | 2 +- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt | 2 +- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index f1b5b37929e..89f4275c450 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -21,7 +21,7 @@ public class CompilerSettings { public var copyJsLibraryFiles: Boolean = true public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY - class object { + default object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" private val DEFAULT_OUTPUT_DIRECTORY = "lib" } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6266658a7fa..fcd05b867a6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -70,7 +70,7 @@ import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { - class object { + default object { public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession") diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 953d3f8a2a4..123058f6aa5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -55,7 +55,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin" class CacheFormatVersion(targetDataRoot: File) { - class object { + default object { // Change this when incremental cache format changes private val INCREMENTAL_CACHE_OWN_VERSION = 2 private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION @@ -82,7 +82,7 @@ class CacheFormatVersion(targetDataRoot: File) { } public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache { - class object { + default object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 202f0ce01fa..a57a9c1902b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -29,7 +29,7 @@ class LocalFileKotlinClass private( innerClasses: FileBasedKotlinClass.InnerClassesInfo ) : FileBasedKotlinClass(className, classHeader, innerClasses) { - class object { + default object { fun create(file: File): LocalFileKotlinClass? { val fileContents = file.readBytes() return FileBasedKotlinClass.create(fileContents) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 61f75320692..f9620793a9a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -51,7 +51,7 @@ import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.java.dependencyView.Callbacks public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { - class object { + default object { val COMPILATION_FAILED = "COMPILATION FAILED" // change to "/tmp" or anything when default is too long (for easier debugging) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 7652295c2f9..495ade9943c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.utils.PathUtil * with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime */ public class ClasspathOrderTest : TestCaseWithTmpdir() { - class object { + default object { val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() } From e68275f16267000881bd2c5bb8fbad1db196bedd Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 4 Mar 2015 18:04:43 +0300 Subject: [PATCH 0313/1557] ErrorReporter is now Java-independent Original commit: 36bbd2c0e31ca2ad596686c11ccfe7ec9270165f --- .../jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index a57a9c1902b..e57a8a934d1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -39,6 +39,8 @@ class LocalFileKotlinClass private( } } + override fun getLocation() = file.getAbsolutePath() + public override fun getFileContents(): ByteArray = fileContents override fun hashCode(): Int = file.hashCode() From 6bb5d5c048036e7d6ebba30068b949c35d3895fb Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 11 Mar 2015 20:14:56 +0300 Subject: [PATCH 0314/1557] Do not create temp files in the project directory Original commit: 76832df93311ccace94536713e7d9aeb6cd32499 --- .../jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index ff1a9588ffb..d5c30d7b59c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -18,8 +18,15 @@ package org.jetbrains.kotlin.jps.build import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.kotlin.test.JetTestUtils public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { + + override fun setUp() { + super.setUp() + workDir = JetTestUtils.tmpDirForTest(this) + } + public fun testThreeModulesNoReexport() { val aFile = createFile("a/a.kt", """ From e5a2e731b77a7254fed0f2d95791aa4b238a018d Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 13 Mar 2015 01:10:40 +0300 Subject: [PATCH 0315/1557] Avoid getAccessors() call because of changes not available in build server Original commit: 9c51ea6583ca94caee1728f6e57f6a790fe50bed --- .../compilerRunner/KotlinCompilerRunner.java | 50 +++++++++++-------- 1 file changed, 30 insertions(+), 20 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 8e551e45c4a..27645cf91e1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -20,7 +20,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.xmlb.Accessor; import com.intellij.util.xmlb.XmlSerializerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,7 +33,9 @@ import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.*; -import java.lang.reflect.Method; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -142,33 +143,42 @@ public class KotlinCompilerRunner { } } - private static T mergeBeans(F from, T to) { - T copy = XmlSerializerUtil.createCopy(to); + private static T mergeBeans(CommonCompilerArguments from, T to) { + // TODO: rewrite when updated version of com.intellij.util.xmlb is available on TeamCity + try { + T copy = XmlSerializerUtil.createCopy(to); - // TODO: Rewrite with XmlSerializerUtil.copyBean() after method is in Teamcity JPS (9.1 expected) - for (Accessor accessor : XmlSerializerUtil.getAccessors(from.getClass())) { - if (!setValue("set", false, accessor, copy, accessor.read(from))) { - setValue("write", true, accessor, copy, accessor.read(from)); + List fromFields = collectFieldsToCopy(from.getClass()); + for (Field fromField : fromFields) { + Field toField = copy.getClass().getField(fromField.getName()); + toField.set(copy, fromField.get(from)); } - } - return copy; + return copy; + } + catch (NoSuchFieldException e) { + throw UtilsPackage.rethrow(e); + } + catch (IllegalAccessException e) { + throw UtilsPackage.rethrow(e); + } } - private static boolean setValue(String methodName, boolean failOnReflection, Accessor accessor, Object from, Object copy) { - try { - Method method = Accessor.class.getMethod(methodName, Object.class, Object.class); - method.invoke(accessor, from, copy); + private static List collectFieldsToCopy(Class clazz) { + List fromFields = new ArrayList(); - return true; - } - catch (Throwable e) { - if (failOnReflection) { - throw UtilsPackage.rethrow(e); + Class currentClass = clazz; + do { + for (Field field : currentClass.getDeclaredFields()) { + int modifiers = field.getModifiers(); + if (!Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) { + fromFields.add(field); + } } } + while ((currentClass = currentClass.getSuperclass()) != null); - return false; + return fromFields; } private static void setupK2JvmArguments(File moduleFile, K2JVMCompilerArguments settings) { From db9abd0a2f4623db5c06a1e7d17603e8a776d74f Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 16 Mar 2015 14:51:11 +0300 Subject: [PATCH 0316/1557] default -> companion: default object -> class object in project code, builtins and libs code Original commit: 2a6facaef6af72c069303a6f1f76e8f49974a802 --- .../src/org/jetbrains/kotlin/config/CompilerSettings.kt | 2 +- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt | 2 +- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 89f4275c450..f1b5b37929e 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -21,7 +21,7 @@ public class CompilerSettings { public var copyJsLibraryFiles: Boolean = true public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY - default object { + class object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" private val DEFAULT_OUTPUT_DIRECTORY = "lib" } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index fcd05b867a6..6266658a7fa 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -70,7 +70,7 @@ import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { - default object { + class object { public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession") diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 123058f6aa5..953d3f8a2a4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -55,7 +55,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin" class CacheFormatVersion(targetDataRoot: File) { - default object { + class object { // Change this when incremental cache format changes private val INCREMENTAL_CACHE_OWN_VERSION = 2 private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION @@ -82,7 +82,7 @@ class CacheFormatVersion(targetDataRoot: File) { } public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache { - default object { + class object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index e57a8a934d1..9b27dc8647e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -29,7 +29,7 @@ class LocalFileKotlinClass private( innerClasses: FileBasedKotlinClass.InnerClassesInfo ) : FileBasedKotlinClass(className, classHeader, innerClasses) { - default object { + class object { fun create(file: File): LocalFileKotlinClass? { val fileContents = file.readBytes() return FileBasedKotlinClass.create(fileContents) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index f9620793a9a..61f75320692 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -51,7 +51,7 @@ import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.java.dependencyView.Callbacks public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { - default object { + class object { val COMPILATION_FAILED = "COMPILATION FAILED" // change to "/tmp" or anything when default is too long (for easier debugging) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 495ade9943c..7652295c2f9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.utils.PathUtil * with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime */ public class ClasspathOrderTest : TestCaseWithTmpdir() { - default object { + class object { val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() } From 24f63e82e16374979cd62e79e70ab8bc11e52717 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 16 Mar 2015 14:56:06 +0300 Subject: [PATCH 0317/1557] default -> companion: replace all mentions of default and default object Original commit: 06916d98c6deacedcdbc341cd945a4bc7e2d231c --- .../custom/kotlinConstantChangedUsedInJava/build.log | 2 +- .../custom/kotlinConstantChangedUsedInJava/const.kt | 2 +- .../custom/kotlinConstantChangedUsedInJava/const.kt.new | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/build.log | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/const.kt | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/const.kt.new | 2 +- .../pureKotlin/classObjectConstantChanged/build.log | 4 ++-- .../pureKotlin/classObjectConstantChanged/const.kt | 2 +- .../pureKotlin/classObjectConstantChanged/const.kt.new | 2 +- .../incremental/pureKotlin/constantsUnchanged/build.log | 2 +- .../incremental/pureKotlin/constantsUnchanged/const.kt | 2 +- .../incremental/pureKotlin/constantsUnchanged/const.kt.new | 2 +- .../pureKotlin/traitClassObjectConstantChanged/build.log | 4 ++-- .../pureKotlin/traitClassObjectConstantChanged/const.kt | 2 +- .../pureKotlin/traitClassObjectConstantChanged/const.kt.new | 2 +- .../javaUsedInKotlin/samConversions/methodAdded/build.log | 4 ++-- .../withJava/kotlinUsedInJava/constantChanged/build.log | 4 ++-- .../withJava/kotlinUsedInJava/constantChanged/const.kt | 2 +- .../withJava/kotlinUsedInJava/constantChanged/const.kt.new | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/build.log | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/const.kt | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/const.kt.new | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log index 687d949283e..29b384519d1 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt index dceaef294f2..4680ae2c26f 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new index bb50d7fc183..e9ccf1ab8db 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log index 6bc3a50bee0..8dfe7647a28 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt index 7f4d76ba88b..7dd5eac1a73 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new index 7f4d76ba88b..7dd5eac1a73 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 1049b7f2a22..0a26a20ac94 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: src/const.kt End of files Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt index dceaef294f2..4680ae2c26f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new index bb50d7fc183..e9ccf1ab8db 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index cce56fbf9fd..9e65adcda6c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt index 3ce58ed9dc9..40bbe8de705 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt @@ -3,7 +3,7 @@ package test val CONST = "foo" class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new index 3ce58ed9dc9..40bbe8de705 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new @@ -3,7 +3,7 @@ package test val CONST = "foo" class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 01ea0f084d3..673b3dfee4c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/test/Trait$$TImpl.class -out/production/module/test/Trait$Default.class +out/production/module/test/Trait$Companion.class out/production/module/test/Trait.class End of files Compiling files: @@ -8,7 +8,7 @@ src/const.kt End of files Cleaning output files: out/production/module/test/Trait$$TImpl.class -out/production/module/test/Trait$Default.class +out/production/module/test/Trait$Companion.class out/production/module/test/Trait.class out/production/module/test/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt index dcbca7fe3a7..073204a43e1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt @@ -1,7 +1,7 @@ package test trait Trait { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new index 926b500fbf0..86cc1439efd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new @@ -1,7 +1,7 @@ package test trait Trait { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index 28ca5a5e406..d46aaad630c 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -18,6 +18,6 @@ src/usageWithFunctionLiteral.kt End of files COMPILATION FAILED Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a default object +Please specify constructor invocation; classifier 'SamInterface' does not have a companion object Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a default object \ No newline at end of file +Please specify constructor invocation; classifier 'SamInterface' does not have a companion object \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index d7a173db691..e0426c17165 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: @@ -7,7 +7,7 @@ src/const.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt index dceaef294f2..4680ae2c26f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new index bb50d7fc183..e9ccf1ab8db 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log index 6bc3a50bee0..8dfe7647a28 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt index 7f4d76ba88b..7dd5eac1a73 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new index 7f4d76ba88b..7dd5eac1a73 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - default object { + companion object { val CONST = "bar" } } From b7c12793361a054b745299abbb64d2211a91dbfb Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Tue, 27 Jan 2015 20:58:47 +0300 Subject: [PATCH 0318/1557] fix KotlinJpsBuildTest Original commit: 0050c9888dccd411549b3c64560eb333f5ff3c5c --- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 25061ee5916..6feab40c392 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -56,12 +56,13 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final String KOTLIN_JS_LIBRARY = "jslib-example"; private static final String PATH_TO_KOTLIN_JS_LIBRARY = TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY; private static final String KOTLIN_JS_LIBRARY_JAR = KOTLIN_JS_LIBRARY + ".jar"; - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js", "lib/kotlin.js"); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js", "lib/kotlin.js", "lib/stdlib.meta.js"); private static final Set EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js"); private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = KotlinPackage.hashSetOf( PROJECT_NAME + ".js", "lib/kotlin.js", + "lib/stdlib.meta.js", "lib/jslib-example.js", "lib/file0.js", "lib/dir/file1.js", @@ -72,6 +73,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { KotlinPackage.hashSetOf( PROJECT_NAME + ".js", "custom/kotlin.js", + "custom/stdlib.meta.js", "custom/jslib-example.js", "custom/file0.js", "custom/dir/file1.js", From d56cbffbe03869cd813bf18739dd031e3fa69ff7 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 17 Mar 2015 19:34:09 +0300 Subject: [PATCH 0319/1557] Expanded incremental compilation tests with cache version change. Original commit: 2aeccc70118b839bd4ee462f99396fcb100e77c7 --- .../IncrementalCacheVersionChangedTest.kt | 18 ++++++++++++++---- .../cacheVersionChangedAndFileModified/a.kt | 1 + .../cacheVersionChangedAndFileModified/b.kt | 1 + .../b.kt.new | 1 + .../build.log | 3 +++ .../other.kt | 4 ++++ .../cacheVersionChangedMultiModule/build.log | 15 +++++++++++++++ .../dependencies.txt | 2 ++ .../module1_a.kt | 6 ++++++ .../module2_b.kt | 5 +++++ .../module2_b.kt.new | 5 +++++ 11 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/other.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt index 85e09bcdfb3..2df81660a18 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt @@ -32,15 +32,25 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() { doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/") } + fun testCacheVersionChangedMultiModule() { + doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/") + } + override val allowNoFilesWithSuffixInTestData: Boolean get() = true override fun performAdditionalModifications() { val storageForTargetType = BuildDataPathsImpl(myDataStorageRoot).getTargetTypeDataRoot(JavaModuleBuildTargetType.PRODUCTION) - val relativePath = "module/${CacheFormatVersion.FORMAT_VERSION_FILE_PATH}" - val cacheVersionFile = File(storageForTargetType, relativePath) - assertTrue(cacheVersionFile.exists()) - cacheVersionFile.writeText("777") + + val moduleNames = if (getTestName(false) == "CacheVersionChangedMultiModule") listOf("module1", "module2") else listOf("module") + + for (moduleName in moduleNames) { + val relativePath = "$moduleName/${CacheFormatVersion.FORMAT_VERSION_FILE_PATH}" + val cacheVersionFile = File(storageForTargetType, relativePath) + + assertTrue(cacheVersionFile.exists()) + cacheVersionFile.writeText("777") + } } } diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt index 91fe7016ac5..9a91e164a2d 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt @@ -1,4 +1,5 @@ package test fun f() { + other.other() } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt index c8d3d771251..f4131c37ad1 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt @@ -1,4 +1,5 @@ package test fun g() { + other.other() } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new index c8d3d771251..f4131c37ad1 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new @@ -1,4 +1,5 @@ package test fun g() { + other.other() } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log index 073f1409ae5..dcc343c872e 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log @@ -3,9 +3,12 @@ out/production/module/test/TestPackage$b$*.class out/production/module/test/TestPackage.class End of files Cleaning output files: +out/production/module/other/OtherPackage$other$*.class +out/production/module/other/OtherPackage.class out/production/module/test/TestPackage$a$*.class End of files Compiling files: src/a.kt src/b.kt +src/other.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/other.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/other.kt new file mode 100644 index 00000000000..3b98ad64c05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/other.kt @@ -0,0 +1,4 @@ +package other + +fun other() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log new file mode 100644 index 00000000000..ec0b0e5da7c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module1/a/A.class +out/production/module1/a/APackage$module1_a$*.class +out/production/module1/a/APackage.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/b/BPackage$module2_b$*.class +out/production/module2/b/BPackage.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/dependencies.txt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module1_a.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module1_a.kt new file mode 100644 index 00000000000..a3470c00a84 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module1_a.kt @@ -0,0 +1,6 @@ +package a + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt new file mode 100644 index 00000000000..5c19b61add7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt @@ -0,0 +1,5 @@ +package b + +fun b(param: a.A) { + a.a() +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt.new b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt.new new file mode 100644 index 00000000000..5c19b61add7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt.new @@ -0,0 +1,5 @@ +package b + +fun b(param: a.A) { + a.a() +} From 9e6afeda99a1557c1bc5c157c85f0e93fcb52ee0 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 18 Mar 2015 16:58:36 +0300 Subject: [PATCH 0320/1557] JS: always generate metadata while compiling from idea Original commit: 977b743f3d36eee5149d5ce13ebc51761607e3c8 --- .../compilerRunner/KotlinCompilerRunner.java | 35 +++++++++++-------- .../kotlin/jps/build/KotlinBuilder.kt | 6 ++-- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 27645cf91e1..ea95389879c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -64,18 +64,19 @@ public class KotlinCompilerRunner { } public static void runK2JsCompiler( - CommonCompilerArguments commonArguments, - K2JSCompilerArguments k2jsArguments, - CompilerSettings compilerSettings, - MessageCollector messageCollector, - CompilerEnvironment environment, - OutputItemsCollector collector, - Collection sourceFiles, - List libraryFiles, - File outputFile + @NotNull CommonCompilerArguments commonArguments, + @NotNull K2JSCompilerArguments k2jsArguments, + @NotNull CompilerSettings compilerSettings, + @NotNull MessageCollector messageCollector, + @NotNull CompilerEnvironment environment, + @NotNull OutputItemsCollector collector, + @NotNull Collection sourceFiles, + @NotNull List libraryFiles, + @NotNull File outputFile, + @Nullable File metaInfoFile ) { K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); - setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments); + setupK2JsArguments(outputFile, metaInfoFile, sourceFiles, libraryFiles, arguments); runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment); } @@ -189,10 +190,11 @@ public class KotlinCompilerRunner { } private static void setupK2JsArguments( - File outputFile, - Collection sourceFiles, - List libraryFiles, - K2JSCompilerArguments settings + @NotNull File outputFile, + @Nullable File metaInfoFile, + @NotNull Collection sourceFiles, + @NotNull List libraryFiles, + @NotNull K2JSCompilerArguments settings ) { settings.noStdlib = true; settings.freeArgs = ContainerUtil.map(sourceFiles, new Function() { @@ -202,6 +204,11 @@ public class KotlinCompilerRunner { } }); settings.outputFile = outputFile.getPath(); + + if (metaInfoFile != null) { + settings.metaInfo = metaInfoFile.getPath(); + } + settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles); } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6266658a7fa..a0ea2f9afb3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -382,12 +382,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) - val outputFile = File(outputDir, representativeTarget.getModule().getName() + ".js") + val moduleName = representativeTarget.getModule().getName() + val outputFile = File(outputDir, "$moduleName.js") + val metaInfoFile = File(outputDir, "$moduleName.meta.js") val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) - runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile, metaInfoFile) return outputItemCollector } From b042ef11f628088c89228ce36a012a1ee3359ad9 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 18 Mar 2015 21:19:02 +0300 Subject: [PATCH 0321/1557] JPS test data fixed for JS Original commit: c7ab333fa8e514ae0b24219f3b5e875b612f88c5 --- .../kotlin/jps/build/KotlinJpsBuildTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 6feab40c392..5131a3f8caf 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -56,11 +56,20 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final String KOTLIN_JS_LIBRARY = "jslib-example"; private static final String PATH_TO_KOTLIN_JS_LIBRARY = TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY; private static final String KOTLIN_JS_LIBRARY_JAR = KOTLIN_JS_LIBRARY + ".jar"; - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js", "lib/kotlin.js", "lib/stdlib.meta.js"); - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf(PROJECT_NAME + ".js"); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf( + PROJECT_NAME + ".js", + PROJECT_NAME + ".meta.js", + "lib/kotlin.js", + "lib/stdlib.meta.js" + ); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf( + PROJECT_NAME + ".js", + PROJECT_NAME + ".meta.js" + ); private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = KotlinPackage.hashSetOf( PROJECT_NAME + ".js", + PROJECT_NAME + ".meta.js", "lib/kotlin.js", "lib/stdlib.meta.js", "lib/jslib-example.js", @@ -72,6 +81,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = KotlinPackage.hashSetOf( PROJECT_NAME + ".js", + PROJECT_NAME + ".meta.js", "custom/kotlin.js", "custom/stdlib.meta.js", "custom/jslib-example.js", From 770eea487566c0ed225436c25cfcb21fc30ac040 Mon Sep 17 00:00:00 2001 From: Denis Mekhanikov Date: Thu, 23 Oct 2014 17:17:01 +0400 Subject: [PATCH 0322/1557] Kotlin I/O new features: relativeTo, copyTo, copyRecursively, deleteRecursively, file tree walkers, file component iterators, file roots, startsWith, endsWith, subPath, normalize, replaceBytes, replaceTest, additional tests and comments Original commit: f560677b1520ed6182b7416d0e83e7c4b4fd4906 --- .../org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 61f75320692..779125bf233 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -374,6 +374,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val file = File(workDir, path) val oldLastModified = file.lastModified() + file.delete() dataFile.copyTo(file) val newLastModified = file.lastModified() From 117ecaa0117e6a000213b690085a6041a3cdb15d Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 23 Mar 2015 19:04:10 +0100 Subject: [PATCH 0323/1557] remove obsolete module script generator from JPS Original commit: d2634eb7ebade8fe1b7398d1e98ce64dedac45c0 --- .../KotlinModuleScriptBuilderFactory.java | 125 ------------------ 1 file changed, 125 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java deleted file mode 100644 index 83b5ef59715..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleScriptBuilderFactory.java +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.modules; - -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; - -public class KotlinModuleScriptBuilderFactory implements KotlinModuleDescriptionBuilderFactory { - - public static final KotlinModuleScriptBuilderFactory INSTANCE = new KotlinModuleScriptBuilderFactory(); - - private KotlinModuleScriptBuilderFactory() {} - - @Override - public KotlinModuleDescriptionBuilder create() { - return new Builder(); - } - - @Override - public String getFileExtension() { - return "kts"; - } - - private static class Builder implements KotlinModuleDescriptionBuilder { - private final StringBuilder script = new StringBuilder(); - private boolean done = false; - - { - script.append("import kotlin.modules.*\n"); - script.append("fun project() {\n"); - } - - @Override - public KotlinModuleDescriptionBuilder addModule( - String moduleName, - String outputDir, - List sourceFiles, - List javaSourceRoots, - Collection classpathRoots, - List annotationRoots, - boolean tests, - Set directoriesToFilterOut - ) { - assert !done : "Already done"; - - if (tests) { - script.append("// Module script for tests\n"); - } - else { - script.append("// Module script for production\n"); - } - - script.append(" module(\"" + moduleName + "\", outputDir = \"" + toSystemIndependentName(outputDir) + "\") {\n"); - - for (File sourceFile : sourceFiles) { - script.append(" sources += \"" + toSystemIndependentName(sourceFile.getPath()) + "\"\n"); - } - - if (!javaSourceRoots.isEmpty()) { - processClassPathSection("Java source roots", javaSourceRoots, directoriesToFilterOut); - } - - processClassPathSection("Classpath", classpathRoots, directoriesToFilterOut); - processAnnotationRoots(annotationRoots); - - script.append(" }\n"); - return this; - } - - private void processClassPathSection( - @NotNull String sectionDescription, - @NotNull Collection files, - @NotNull Set directoriesToFilterOut - ) { - script.append(" // " + sectionDescription + "\n"); - for (File file : files) { - if (directoriesToFilterOut.contains(file)) { - // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies - // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was - // removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath. - script.append(" // Output directory, commented out\n"); - script.append(" // "); - } - script.append(" classpath += \"" + toSystemIndependentName(file.getPath()) + "\"\n"); - } - } - - private void processAnnotationRoots(@NotNull List files) { - script.append(" // External annotations\n"); - for (File file : files) { - script.append(" annotationsPath += \"").append(toSystemIndependentName(file.getPath())).append("\"\n"); - } - } - - @Override - public CharSequence asText() { - if (!done) { - script.append("}\n"); - done = true; - } - - return script; - } - } -} From 3f59b7a6dbfa18e75e87e258f7c9d7ae6eb7c787 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 24 Mar 2015 17:45:57 +0100 Subject: [PATCH 0324/1557] remove abstraction which is no longer needed Original commit: 20fbb814e43081e51a63e923b42aad65aa68a608 --- .../KotlinBuilderModuleScriptGenerator.java | 8 +- .../KotlinModuleDescriptionBuilder.java | 37 ----- ...KotlinModuleDescriptionBuilderFactory.java | 22 --- .../modules/KotlinModuleXmlBuilder.java | 135 +++++++++++++++ .../KotlinModuleXmlBuilderFactory.java | 154 ------------------ .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 8 +- .../modules/KotlinModuleXmlGeneratorTest.java | 6 +- 7 files changed, 144 insertions(+), 226 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 86f6dcdff95..5f3c1397d04 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -39,9 +39,7 @@ import org.jetbrains.jps.model.module.JpsDependencyElement; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsSdkDependency; import org.jetbrains.kotlin.config.IncrementalCompilation; -import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilder; -import org.jetbrains.kotlin.modules.KotlinModuleDescriptionBuilderFactory; -import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilderFactory; +import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder; import java.io.File; import java.io.IOException; @@ -51,8 +49,6 @@ import static org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies; public class KotlinBuilderModuleScriptGenerator { - public static final KotlinModuleDescriptionBuilderFactory FACTORY = KotlinModuleXmlBuilderFactory.INSTANCE; - @Nullable public static File generateModuleDescription( CompileContext context, @@ -60,7 +56,7 @@ public class KotlinBuilderModuleScriptGenerator { MultiMap sourceFiles, // ignored for non-incremental compilation boolean hasRemovedFiles ) throws IOException, ProjectBuildException { - KotlinModuleDescriptionBuilder builder = FACTORY.create(); + KotlinModuleXmlBuilder builder = new KotlinModuleXmlBuilder(); boolean noSources = true; diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java deleted file mode 100644 index 43722755430..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilder.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.modules; - -import java.io.File; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -public interface KotlinModuleDescriptionBuilder { - KotlinModuleDescriptionBuilder addModule( - String moduleName, - String outputDir, - List sourceFiles, - List javaSourceRoots, - Collection classpathRoots, - List annotationRoots, - boolean tests, - Set directoriesToFilterOut - ); - - CharSequence asText(); -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java deleted file mode 100644 index 322c75dfbd0..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleDescriptionBuilderFactory.java +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.modules; - -public interface KotlinModuleDescriptionBuilderFactory { - KotlinModuleDescriptionBuilder create(); - String getFileExtension(); -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java new file mode 100644 index 00000000000..1584e1a7e34 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java @@ -0,0 +1,135 @@ +/* + * Copyright 2010-2015 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.kotlin.modules; + +import org.jetbrains.annotations.NotNull; +import org.jetbrains.kotlin.config.IncrementalCompilation; +import org.jetbrains.kotlin.utils.Printer; + +import java.io.File; +import java.util.Collection; +import java.util.List; +import java.util.Set; + +import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; +import static com.intellij.openapi.util.text.StringUtil.escapeXml; +import static org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.*; + +public class KotlinModuleXmlBuilder { + private final StringBuilder xml = new StringBuilder(); + private final Printer p = new Printer(xml); + private boolean done = false; + + public KotlinModuleXmlBuilder() { + openTag(p, MODULES); + } + + public KotlinModuleXmlBuilder addModule( + String moduleName, + String outputDir, + List sourceFiles, + List javaSourceRoots, + Collection classpathRoots, + List annotationRoots, + boolean tests, + Set directoriesToFilterOut + ) { + assert !done : "Already done"; + + if (tests) { + p.println(""); + } + else { + p.println(""); + } + + p.println("<", MODULE, " ", + NAME, "=\"", escapeXml(moduleName), "\" ", + OUTPUT_DIR, "=\"", getEscapedPath(new File(outputDir)), "\">" + ); + p.pushIndent(); + + for (File sourceFile : sourceFiles) { + p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>"); + } + + if (!javaSourceRoots.isEmpty()) { + processClassPathSection("Java source roots", javaSourceRoots, directoriesToFilterOut); + } + + processClassPathSection("Classpath", classpathRoots, directoriesToFilterOut); + processAnnotationRoots(annotationRoots); + + closeTag(p, MODULE); + return this; + } + + private void processClassPathSection( + @NotNull String sectionDescription, + @NotNull Collection files, + @NotNull Set directoriesToFilterOut + ) { + p.println(""); + for (File file : files) { + boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.ENABLED; + if (isOutput) { + // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies + // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was + // removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath. + p.println(""); + p.println(""); + } + } + } + + private void processAnnotationRoots(@NotNull List files) { + p.println(""); + for (File file : files) { + p.println("<", EXTERNAL_ANNOTATIONS, " ", PATH, "=\"", getEscapedPath(file), "\"/>"); + } + } + + public CharSequence asText() { + if (!done) { + closeTag(p, MODULES); + done = true; + } + return xml; + } + + private static void openTag(Printer p, String tag) { + p.println("<" + tag + ">"); + p.pushIndent(); + } + + private static void closeTag(Printer p, String tag) { + p.popIndent(); + p.println(""); + } + + private static String getEscapedPath(File sourceFile) { + return escapeXml(toSystemIndependentName(sourceFile.getPath())); + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java deleted file mode 100644 index 8ecbca258c3..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilderFactory.java +++ /dev/null @@ -1,154 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.modules; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.config.IncrementalCompilation; -import org.jetbrains.kotlin.utils.Printer; - -import java.io.File; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; -import static com.intellij.openapi.util.text.StringUtil.escapeXml; -import static org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.*; - -public class KotlinModuleXmlBuilderFactory implements KotlinModuleDescriptionBuilderFactory { - - public static final KotlinModuleXmlBuilderFactory INSTANCE = new KotlinModuleXmlBuilderFactory(); - - private KotlinModuleXmlBuilderFactory() {} - - @Override - public KotlinModuleDescriptionBuilder create() { - return new Builder(); - } - - @Override - public String getFileExtension() { - return "xml"; - } - - private static class Builder implements KotlinModuleDescriptionBuilder { - private final StringBuilder xml = new StringBuilder(); - private final Printer p = new Printer(xml); - private boolean done = false; - - public Builder() { - openTag(p, MODULES); - } - - @Override - public KotlinModuleDescriptionBuilder addModule( - String moduleName, - String outputDir, - List sourceFiles, - List javaSourceRoots, - Collection classpathRoots, - List annotationRoots, - boolean tests, - Set directoriesToFilterOut - ) { - assert !done : "Already done"; - - if (tests) { - p.println(""); - } - else { - p.println(""); - } - - p.println("<", MODULE, " ", - NAME, "=\"", escapeXml(moduleName), "\" ", - OUTPUT_DIR, "=\"", getEscapedPath(new File(outputDir)), "\">" - ); - p.pushIndent(); - - for (File sourceFile : sourceFiles) { - p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>"); - } - - if (!javaSourceRoots.isEmpty()) { - processClassPathSection("Java source roots", javaSourceRoots, directoriesToFilterOut); - } - - processClassPathSection("Classpath", classpathRoots, directoriesToFilterOut); - processAnnotationRoots(annotationRoots); - - closeTag(p, MODULE); - return this; - } - - private void processClassPathSection( - @NotNull String sectionDescription, - @NotNull Collection files, - @NotNull Set directoriesToFilterOut - ) { - p.println(""); - for (File file : files) { - boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.ENABLED; - if (isOutput) { - // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies - // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was - // removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath. - p.println(""); - p.println(""); - } - } - } - - private void processAnnotationRoots(@NotNull List files) { - p.println(""); - for (File file : files) { - p.println("<", EXTERNAL_ANNOTATIONS, " ", PATH, "=\"", getEscapedPath(file), "\"/>"); - } - } - - @Override - public CharSequence asText() { - if (!done) { - closeTag(p, MODULES); - done = true; - } - return xml; - } - } - - private static void openTag(Printer p, String tag) { - p.println("<" + tag + ">"); - p.pushIndent(); - } - - private static void closeTag(Printer p, String tag) { - p.popIndent(); - p.println(""); - } - - private static String getEscapedPath(File sourceFile) { - return escapeXml(toSystemIndependentName(sourceFile.getPath())); - } -} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 7652295c2f9..029347e5090 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.jvm.compiler -import org.jetbrains.kotlin.test.TestCaseWithTmpdir +import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil -import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilderFactory -import java.io.File +import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.utils.PathUtil +import java.io.File /** * This test checks that Java classes from sources have higher priority in Kotlin resolution process than classes from binaries. @@ -38,7 +38,7 @@ public class ClasspathOrderTest : TestCaseWithTmpdir() { } public fun testClasspathOrderForModuleScriptBuild() { - val xmlContent = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule( + val xmlContent = KotlinModuleXmlBuilder().addModule( "name", File(tmpdir, "output").getAbsolutePath(), listOf(sourceDir), diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index e024e504827..61bba84e200 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -25,7 +25,7 @@ import java.util.Collections; public class KotlinModuleXmlGeneratorTest extends TestCase { public void testBasic() throws Exception { - String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule( + String actual = new KotlinModuleXmlBuilder().addModule( "name", "output", Arrays.asList(new File("s1"), new File("s2")), @@ -39,7 +39,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { } public void testFiltered() throws Exception { - String actual = KotlinModuleXmlBuilderFactory.INSTANCE.create().addModule( + String actual = new KotlinModuleXmlBuilder().addModule( "name", "output", Arrays.asList(new File("s1"), new File("s2")), @@ -53,7 +53,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { } public void testMultiple() throws Exception { - KotlinModuleDescriptionBuilder builder = KotlinModuleXmlBuilderFactory.INSTANCE.create(); + KotlinModuleXmlBuilder builder = new KotlinModuleXmlBuilder(); builder.addModule( "name", "output", From 7b969d2c87cae1717be53e527d1d74753541b48c Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 25 Mar 2015 15:09:18 +0300 Subject: [PATCH 0325/1557] Get rid of 'class object' usages in code and builtins Replace some comments and library usages as well Original commit: ed218c473afdef2f62b03052cc1dde5e62bb65b4 --- .../src/org/jetbrains/kotlin/config/CompilerSettings.kt | 2 +- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt | 2 +- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index f1b5b37929e..67c73cf0b77 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -21,7 +21,7 @@ public class CompilerSettings { public var copyJsLibraryFiles: Boolean = true public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY - class object { + companion object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" private val DEFAULT_OUTPUT_DIRECTORY = "lib" } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a0ea2f9afb3..d2459a0692e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -70,7 +70,7 @@ import org.jetbrains.kotlin.utils.sure import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { - class object { + companion object { public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession") diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 953d3f8a2a4..bb8cb572793 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -55,7 +55,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin" class CacheFormatVersion(targetDataRoot: File) { - class object { + companion object { // Change this when incremental cache format changes private val INCREMENTAL_CACHE_OWN_VERSION = 2 private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION @@ -82,7 +82,7 @@ class CacheFormatVersion(targetDataRoot: File) { } public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache { - class object { + companion object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" val INLINE_FUNCTIONS = "inline-functions.tab" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 9b27dc8647e..2665cd67063 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -29,7 +29,7 @@ class LocalFileKotlinClass private( innerClasses: FileBasedKotlinClass.InnerClassesInfo ) : FileBasedKotlinClass(className, classHeader, innerClasses) { - class object { + companion object { fun create(file: File): LocalFileKotlinClass? { val fileContents = file.readBytes() return FileBasedKotlinClass.create(fileContents) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 779125bf233..0c71eddfa84 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -51,7 +51,7 @@ import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.java.dependencyView.Callbacks public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { - class object { + companion object { val COMPILATION_FAILED = "COMPILATION FAILED" // change to "/tmp" or anything when default is too long (for easier debugging) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 029347e5090..538b0ce2236 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -29,7 +29,7 @@ import java.io.File * with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime */ public class ClasspathOrderTest : TestCaseWithTmpdir() { - class object { + companion object { val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() } From 00cc146d0a501d65d08a3c243b88b8c9967eb204 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 25 Mar 2015 14:50:15 +0300 Subject: [PATCH 0326/1557] Output compilation time as teamcity statistics in jps plugin Original commit: 929d4644b5ecf7c4538b9a248ecba57a4deea403 --- .../kotlin/jps/build/KotlinBuilder.kt | 151 ++++++++++-------- .../jps/build/TeamcityStatisticsLogger.kt | 88 ++++++++++ 2 files changed, 173 insertions(+), 66 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index d2459a0692e..a1f4736cdff 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -16,58 +16,59 @@ package org.jetbrains.kotlin.jps.build +import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.Key import com.intellij.openapi.util.io.FileUtil +import com.intellij.util.containers.MultiMap import gnu.trove.THashSet -import org.jetbrains.kotlin.cli.common.KotlinVersion -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment -import org.jetbrains.kotlin.config.CompilerRunnerConstants -import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl -import org.jetbrains.kotlin.config.Services -import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings -import org.jetbrains.kotlin.jps.incremental.* -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider -import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.builders.DirtyFilesHolder +import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor +import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.jps.incremental.* +import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* +import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage -import java.io.File -import java.lang.reflect.Modifier -import java.util.* +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.kotlin.cli.common.KotlinVersion +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* -import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX +import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler -import org.jetbrains.kotlin.utils.keysToMap -import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* -import com.intellij.openapi.diagnostic.Logger -import org.jetbrains.org.objectweb.asm.ClassReader -import org.jetbrains.jps.builders.java.JavaBuilderUtil -import com.intellij.util.containers.MultiMap -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments -import org.jetbrains.jps.model.JpsProject -import java.io.FileFilter -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.* -import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem -import org.jetbrains.kotlin.utils.LibraryUtils -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache -import org.jetbrains.jps.incremental.fs.CompilationRound +import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl +import org.jetbrains.kotlin.config.CompilerRunnerConstants +import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX +import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings +import org.jetbrains.kotlin.jps.incremental.* +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind -import org.jetbrains.jps.builders.java.dependencyView.Mappings +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.kotlin.utils.LibraryUtils +import org.jetbrains.kotlin.utils.PathUtil +import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.kotlin.utils.sure -import org.jetbrains.kotlin.jps.build.KotlinJpsCompilerArgumentsProvider +import org.jetbrains.org.objectweb.asm.ClassReader +import java.io.File +import java.util.ArrayList +import java.util.HashMap +import java.util.HashSet +import java.util.ServiceLoader public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { @@ -76,6 +77,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession") } + private val statisticsLogger = TeamcityStatisticsLogger() + override fun getPresentableName() = KOTLIN_BUILDER_NAME override fun getCompilableFileExtensions() = arrayListOf("kt") @@ -127,44 +130,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val allCompiledFiles = getAllCompiledFilesContainer(context) val filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) - val outputItemCollector = if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { - compileToJs(chunk, commonArguments, environment, messageCollector, project) - } - else { - if (IncrementalCompilation.ENABLED) { - for (target in chunk.getTargets()) { - val cache = incrementalCaches[target]!! - val removedAndDirtyFiles = filesToCompile[target] + dirtyFilesHolder.getRemovedFiles(target).map { File(it) } - cache.markOutputClassesDirty(removedAndDirtyFiles) - } - } + val start = System.nanoTime() + val outputItemCollector = doCompileModuleChunk(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, + environment, filesToCompile, incrementalCaches, messageCollector, project) - val representativeTarget = chunk.representativeTarget() - - fun concatenate(strings: Array?, cp: List) = array(*(strings ?: array()), *cp.copyToArray()) - - for (argumentProvider in ServiceLoader.load(javaClass())) { - // appending to pluginOptions - commonArguments.pluginOptions = concatenate(commonArguments.pluginOptions, - argumentProvider.getExtraArguments(representativeTarget, context)) - // appending to classpath - commonArguments.pluginClasspaths = concatenate(commonArguments.pluginClasspaths, - argumentProvider.getClasspath(representativeTarget, context)) - - messageCollector.report( - INFO, - "Plugin loaded: ${argumentProvider.javaClass.getSimpleName()}", - NO_LOCATION - ) - } - - compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) - } + statisticsLogger.registerStatistic(chunk, System.nanoTime() - start) if (outputItemCollector == null) { return NOTHING_DONE } + val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] val generatedFiles = getGeneratedFiles(chunk, outputItemCollector) @@ -217,6 +193,46 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return OK } + private fun doCompileModuleChunk( + allCompiledFiles: MutableSet, chunk: ModuleChunk, commonArguments: CommonCompilerArguments, context: CompileContext, + dirtyFilesHolder: DirtyFilesHolder, environment: CompilerEnvironment, + filesToCompile: MultiMap, incrementalCaches: Map, + messageCollector: MessageCollectorAdapter, project: JpsProject + ): OutputItemsCollectorImpl? { + if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { + return compileToJs(chunk, commonArguments, environment, messageCollector, project) + } + + if (IncrementalCompilation.ENABLED) { + for (target in chunk.getTargets()) { + val cache = incrementalCaches[target]!! + val removedAndDirtyFiles = filesToCompile[target] + dirtyFilesHolder.getRemovedFiles(target).map { File(it) } + cache.markOutputClassesDirty(removedAndDirtyFiles) + } + } + + val representativeTarget = chunk.representativeTarget() + + fun concatenate(strings: Array?, cp: List) = array(*(strings ?: array()), *cp.copyToArray()) + + for (argumentProvider in ServiceLoader.load(javaClass())) { + // appending to pluginOptions + commonArguments.pluginOptions = concatenate(commonArguments.pluginOptions, + argumentProvider.getExtraArguments(representativeTarget, context)) + // appending to classpath + commonArguments.pluginClasspaths = concatenate(commonArguments.pluginClasspaths, + argumentProvider.getClasspath(representativeTarget, context)) + + messageCollector.report( + INFO, + "Plugin loaded: ${argumentProvider.javaClass.getSimpleName()}", + NO_LOCATION + ) + } + + return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) + } + private fun createCompileEnvironment(incrementalCaches: Map): CompilerEnvironment { val compilerServices = Services.Builder() .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) @@ -490,7 +506,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR else -> throw IllegalArgumentException("Unsupported severity: " + severity) } } + } + override fun buildFinished(context: CompileContext?) { + statisticsLogger.reportTotal() } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt new file mode 100644 index 00000000000..b84de2610ad --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt @@ -0,0 +1,88 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +import org.jetbrains.jps.ModuleChunk +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicLong + +class TeamcityStatisticsLogger { + private val isOnTeamcity = true + + private val totalTime = AtomicLong() + + //NOTE: mostly copied from TeamCityBuildInfoPrinter + private fun escapedChar(c: Char): Char { + return when (c) { + '\n' -> 'n' + '\r' -> 'r' + '\u0085' -> 'x' // next-line character + '\u2028' -> 'l' // line-separator character + '\u2029' -> 'p' // paragraph-separator character + '|' -> '|' + '\'' -> '\'' + '[' -> '[' + ']' -> ']' + else -> 0.toChar() + } + } + + private fun escape(text: String): String { + val escaped = StringBuilder() + for (c in text.toCharArray()) { + val escChar = escapedChar(c) + if (escChar == 0.toChar()) { + escaped.append(c) + } + else { + escaped.append('|').append(escChar) + } + } + + return escaped.toString() + } + + fun registerStatistic(moduleChunk: ModuleChunk, timeToCompileNs: Long) { + if (!isOnTeamcity) return + + totalTime.addAndGet(timeToCompileNs) + printPerChunkStatistics(moduleChunk, timeToCompileNs) + } + + private fun printPerChunkStatistics(moduleChunk: ModuleChunk, timeToCompileNs: Long) { + printStatisticMessage( + "${KotlinBuilder.KOTLIN_BUILDER_NAME} for ${moduleChunk.getPresentableShortName()} compilation time, ms", + timeToCompileNs.nanosToMillis().toString() + ) + } + + fun reportTotal() { + if (!isOnTeamcity) return + + printStatisticMessage( + "${KotlinBuilder.KOTLIN_BUILDER_NAME} total compilation time, ms", + totalTime.get().nanosToMillis().toString() + ) + } + + + private fun printStatisticMessage(key: String, value: String) { + println("##teamcity[buildStatisticValue key='${escape(key)}' value='${escape(value)}']") + } + + private fun Long.nanosToMillis() = TimeUnit.NANOSECONDS.toMillis(this) +} \ No newline at end of file From 94900a8b84bfbfe3490e3fa4eb90d7ef8d2639b8 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 25 Mar 2015 21:39:31 +0300 Subject: [PATCH 0327/1557] Fix erroneous squash: isOnTeamcity check actually does something Original commit: b2d0b2ebc980a52ce88465f0df06eb13e3c23e92 --- .../org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt index b84de2610ad..fe34b0191ea 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt @@ -21,7 +21,7 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicLong class TeamcityStatisticsLogger { - private val isOnTeamcity = true + private val isOnTeamcity = System.getenv("TEAMCITY_VERSION") != null private val totalTime = AtomicLong() From 911313b084ee8f50ce19f6b9374f06315965fdf6 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 23 Mar 2015 20:21:38 +0300 Subject: [PATCH 0328/1557] Merge module 'serialization.jvm' into 'descriptor.loader.java' It was very small and there proved to be no point in separation of loading Java classes and deserializing Kotlin classes Original commit: 085bc2197b2457a345b03265b3f3a17b469d5c86 --- jps/jps-plugin/jps-plugin.iml | 1 - 1 file changed, 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index e1a14e4e2d8..ab02798a6c6 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -17,7 +17,6 @@ - From 4d40114edc185c29a2356f0456bc9940f5a27d88 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 27 Mar 2015 04:24:32 +0300 Subject: [PATCH 0329/1557] Extract module 'deserialization' out of 'serialization' 'deserialization' stays in core because it's needed both in compiler and reflection, but 'serialization' is used only in the compiler Original commit: 32c3bb8c7f3c2905b580a151ee3199d37e696649 --- jps/jps-plugin/jps-plugin.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index ab02798a6c6..bae91cce456 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -16,7 +16,7 @@ - + From 4add263553671789449cb945ab58a39b8c30dd0f Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 31 Mar 2015 15:40:43 +0300 Subject: [PATCH 0330/1557] Fix split method usage: split temporary replaced with splitBy. Original commit: 95c2a4fb29f6fafb80ba26b5b5fa009c8ac2cfd8 --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 0c71eddfa84..49fff5701ae 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -207,11 +207,12 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val result = HashMap>() for (line in dependenciesTxt.readLines()) { - val split = line.split("->") + val split = line.splitBy("->") val module = split[0] - val dependencies = if (split.size > 1) split[1].split(",") else array() + val dependencies = if (split.size() > 1) split[1] else "" + val dependencyList = dependencies.splitBy(",").filterNot { it.isEmpty() } - result[module] = dependencies.toList() + result[module] = dependencyList } return result From 174da79fce905e66347fc7a9ac851577a35709cd Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 25 Mar 2015 14:57:28 +0300 Subject: [PATCH 0331/1557] JS: move processing metaInfo to TranslationResult Original commit: 5a73bd19c5f0ae391c7e0450a95749a2fb31ec36 --- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 5131a3f8caf..fd6643afb0f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -410,8 +410,9 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { @NotNull private static String[] k2jsOutput(String moduleName) { String outputDir = "out/production/" + moduleName; - String[] result = new String[1]; + String[] result = new String[2]; result[0] = outputDir + "/" + moduleName + ".js"; + result[1] = outputDir + "/" + moduleName + ".meta.js"; return result; } @@ -560,7 +561,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName)); } - private static enum Operation { + private enum Operation { CHANGE, DELETE } From d2d01914f5b33ec953060942a58000643576d7fd Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 25 Mar 2015 16:40:37 +0300 Subject: [PATCH 0332/1557] JpsJsModuleUtils: convert to kotlin Original commit: e779c8a2aee57a1b705ef327637e1dc98ad9632e --- .../kotlin/jps/build/JpsJsModuleUtils.java | 81 +++++++++---------- 1 file changed, 37 insertions(+), 44 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java index 8aadbb2ffba..b18835b71d3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java @@ -14,56 +14,49 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.build; +package org.jetbrains.kotlin.jps.build -import com.intellij.util.Consumer; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.incremental.ModuleBuildTarget; -import org.jetbrains.jps.model.java.JavaSourceRootType; -import org.jetbrains.jps.model.java.JpsJavaModuleType; -import org.jetbrains.jps.model.library.JpsLibrary; -import org.jetbrains.jps.model.library.JpsLibraryRoot; -import org.jetbrains.jps.model.library.JpsOrderRootType; -import org.jetbrains.jps.model.module.JpsModule; -import org.jetbrains.jps.model.module.JpsModuleSourceRoot; -import org.jetbrains.jps.util.JpsPathUtil; +import com.intellij.util.Consumer +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.jps.model.java.JavaSourceRootProperties +import org.jetbrains.jps.model.java.JavaSourceRootType +import org.jetbrains.jps.model.java.JpsJavaModuleType +import org.jetbrains.jps.model.library.JpsOrderRootType +import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.jps.util.JpsPathUtil +import java.util.ArrayList -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +class JpsJsModuleUtils private() { + companion object { -class JpsJsModuleUtils { - private JpsJsModuleUtils() {} - - @NotNull - static List getLibraryFilesAndDependencies(@NotNull ModuleBuildTarget target) { - List result = new ArrayList(); - getLibraryFiles(target, result); - getDependencyModulesAndSources(target, result); - return result; - } - - static void getLibraryFiles(@NotNull ModuleBuildTarget target, @NotNull List result) { - Set libraries = JpsUtils.getAllDependencies(target).getLibraries(); - for (JpsLibrary library : libraries) { - for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { - result.add(JpsPathUtil.urlToPath(root.getUrl())); - } + fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List { + val result = ArrayList() + getLibraryFiles(target, result) + getDependencyModulesAndSources(target, result) + return result } - } - static void getDependencyModulesAndSources(@NotNull final ModuleBuildTarget target, @NotNull final List result) { - JpsUtils.getAllDependencies(target).processModules(new Consumer() { - @Override - public void consume(JpsModule module) { - if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return; - - result.add("@" + module.getName()); - - for (JpsModuleSourceRoot root : module.getSourceRoots(JavaSourceRootType.SOURCE)) { - result.add(JpsPathUtil.urlToPath(root.getUrl())); + fun getLibraryFiles(target: ModuleBuildTarget, result: MutableList) { + val libraries = JpsUtils.getAllDependencies(target).getLibraries() + for (library in libraries) { + for (root in library.getRoots(JpsOrderRootType.COMPILED)) { + result.add(JpsPathUtil.urlToPath(root.getUrl())) } } - }); + } + + fun getDependencyModulesAndSources(target: ModuleBuildTarget, result: MutableList) { + JpsUtils.getAllDependencies(target).processModules(object : Consumer { + override fun consume(module: JpsModule) { + if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return + + result.add("@" + module.getName()) + + for (root in module.getSourceRoots(JavaSourceRootType.SOURCE)) { + result.add(JpsPathUtil.urlToPath(root.getUrl())) + } + } + }) + } } } From d36720992e3ea4218b269f868d08887f929488a2 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 25 Mar 2015 16:41:13 +0300 Subject: [PATCH 0333/1557] JpsJsModuleUtils.java -> JpsJsModuleUtils.kt Original commit: 9a02db3e8b15a5b15b7bf14bd22e41238dc3e4c0 --- .../jps/build/{JpsJsModuleUtils.java => JpsJsModuleUtils.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/{JpsJsModuleUtils.java => JpsJsModuleUtils.kt} (100%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt From d6c1dc94b55ed20d5cf35229bb833eae42abd564 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 25 Mar 2015 22:44:34 +0300 Subject: [PATCH 0334/1557] JS: use metadata in jps build process Original commit: 06aef3164cf7d7aca68df81774582e0502433e6b --- .../kotlin/jps/build/JpsJsModuleUtils.kt | 65 ++++++++++--------- .../kotlin/jps/build/KotlinBuilder.kt | 4 +- 2 files changed, 37 insertions(+), 32 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index b18835b71d3..b72633fc311 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -17,46 +17,51 @@ package org.jetbrains.kotlin.jps.build import com.intellij.util.Consumer +import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.jps.model.java.JavaSourceRootProperties -import org.jetbrains.jps.model.java.JavaSourceRootType import org.jetbrains.jps.model.java.JpsJavaModuleType import org.jetbrains.jps.model.library.JpsOrderRootType import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.util.JpsPathUtil +import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils +import java.io.File import java.util.ArrayList +import kotlin.platform.platformStatic -class JpsJsModuleUtils private() { - companion object { +object JpsJsModuleUtils { - fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List { - val result = ArrayList() - getLibraryFiles(target, result) - getDependencyModulesAndSources(target, result) - return result - } + fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List { + val result = ArrayList() + getLibraryFiles(target, result) + getDependencyModulesAndSources(target, result) + return result + } - fun getLibraryFiles(target: ModuleBuildTarget, result: MutableList) { - val libraries = JpsUtils.getAllDependencies(target).getLibraries() - for (library in libraries) { - for (root in library.getRoots(JpsOrderRootType.COMPILED)) { - result.add(JpsPathUtil.urlToPath(root.getUrl())) - } + fun getLibraryFiles(target: ModuleBuildTarget, result: MutableList) { + val libraries = JpsUtils.getAllDependencies(target).getLibraries() + for (library in libraries) { + for (root in library.getRoots(JpsOrderRootType.COMPILED)) { + result.add(JpsPathUtil.urlToPath(root.getUrl())) } } - - fun getDependencyModulesAndSources(target: ModuleBuildTarget, result: MutableList) { - JpsUtils.getAllDependencies(target).processModules(object : Consumer { - override fun consume(module: JpsModule) { - if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return - - result.add("@" + module.getName()) - - for (root in module.getSourceRoots(JavaSourceRootType.SOURCE)) { - result.add(JpsPathUtil.urlToPath(root.getUrl())) - } - } - }) - } } + + fun getDependencyModulesAndSources(target: ModuleBuildTarget, result: MutableList) { + JpsUtils.getAllDependencies(target).processModules(object : Consumer { + override fun consume(module: JpsModule) { + if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return + + val moduleBuildTarget = ModuleBuildTarget(module, JavaModuleBuildTargetType.PRODUCTION) + val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget) + val metaInfoFile = getOutputMetaFile(outputDir, module.getName()) + result.add(metaInfoFile.getAbsolutePath()) + } + }) + } + + platformStatic + fun getOutputFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.JS_EXT) + + platformStatic + fun getOutputMetaFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.META_JS_SUFFIX) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a1f4736cdff..77fdd989fc7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -399,8 +399,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) val moduleName = representativeTarget.getModule().getName() - val outputFile = File(outputDir, "$moduleName.js") - val metaInfoFile = File(outputDir, "$moduleName.meta.js") + val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName) + val metaInfoFile = JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName) val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) From ee825b9cf3f937fc44ef01465d6e590a860ff1ac Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 26 Mar 2015 17:59:48 +0300 Subject: [PATCH 0335/1557] JS: add jps build test for Kotlin/Javascript two-module project Original commit: 563ab4750266cbcc606a20c1b9349e9c11dd819f --- .../kotlin/jps/build/KotlinJpsBuildTest.java | 40 ++++++++++++++++--- .../kotlinProject.iml | 13 ++++++ .../kotlinProject.ipr | 15 +++++++ .../module2/module2.iml | 13 ++++++ .../module2/src/module2.kt | 5 +++ .../src/test1.kt | 5 +++ 6 files changed, 85 insertions(+), 6 deletions(-) create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/src/module2.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/src/test1.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index fd6643afb0f..b3fb579cc09 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -47,8 +47,11 @@ import java.util.*; import java.util.regex.Pattern; import java.util.zip.ZipOutputStream; +import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; + public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { private static final String PROJECT_NAME = "kotlinProject"; + private static final String ADDITIONAL_MODULE_NAME = "module2"; private static final String JDK_NAME = "IDEA_JDK"; private static final String[] EXCLUDE_FILES = { "Excluded.class", "YetAnotherExcluded.class" }; @@ -62,6 +65,12 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { "lib/kotlin.js", "lib/stdlib.meta.js" ); + private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = KotlinPackage.hashSetOf( + ADDITIONAL_MODULE_NAME + ".js", + ADDITIONAL_MODULE_NAME + ".meta.js", + "lib/kotlin.js", + "lib/stdlib.meta.js" + ); private static final Set EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf( PROJECT_NAME + ".js", PROJECT_NAME + ".meta.js" @@ -90,6 +99,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { "custom/META-INF-ex/file2.js", "custom/res0.js", "custom/resdir/res1.js"); + @Override public void setUp() throws Exception { super.setUp(); @@ -148,6 +158,20 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); } + public void testKotlinJavaScriptProjectWithTwoModules() { + initProject(); + addKotlinJavaScriptStdlibDependency(); + makeAll().assertSuccessful(); + + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)); + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY, contentOfOutputDir(ADDITIONAL_MODULE_NAME)); + + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); + checkWhen(touch("module2/src/module2.kt"), null, k2jsOutput(ADDITIONAL_MODULE_NAME)); + checkWhen(new Action[]{ touch("src/test1.kt"), touch("module2/src/module2.kt")}, null, k2jsOutput(PROJECT_NAME, + ADDITIONAL_MODULE_NAME)); + } + public void testKotlinJavaScriptProjectWithDirectoryAsStdlib() { initProject(); File jslibJar = PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath(); @@ -408,11 +432,15 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { } @NotNull - private static String[] k2jsOutput(String moduleName) { - String outputDir = "out/production/" + moduleName; - String[] result = new String[2]; - result[0] = outputDir + "/" + moduleName + ".js"; - result[1] = outputDir + "/" + moduleName + ".meta.js"; + private static String[] k2jsOutput(String ...moduleNames) { + int length = moduleNames.length; + String[] result = new String[2 * length]; + int index = 0; + for(String moduleName : moduleNames) { + File outputDir = new File("out/production/" + moduleName); + result[index++] = toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName).getPath()); + result[index++] = toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName).getPath()); + } return result; } @@ -425,7 +453,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { for(File file : files) { String relativePath = FileUtil.getRelativePath(baseDir, file); assert relativePath != null : "relativePath should not be null"; - result.add(FileUtil.toSystemIndependentName(relativePath)); + result.add(toSystemIndependentName(relativePath)); } return result; } diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.iml new file mode 100644 index 00000000000..11fe0ade95d --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.ipr new file mode 100644 index 00000000000..b02ca501ac3 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/kotlinProject.ipr @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/module2.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/module2.iml new file mode 100644 index 00000000000..e9637fef0b3 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/module2.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/src/module2.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/src/module2.kt new file mode 100644 index 00000000000..3a30f60150a --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/module2/src/module2.kt @@ -0,0 +1,5 @@ +package module2 + +fun foo() {} + +public class Module2Class \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/src/test1.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/src/test1.kt new file mode 100644 index 00000000000..8f001cc1b99 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoModules/src/test1.kt @@ -0,0 +1,5 @@ +import module2.Module2Class + +fun foo() { + val tmp = Module2Class() +} \ No newline at end of file From f600262671a2a4fbdb49038115a56b6ba9c18d95 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 10 Apr 2015 02:38:23 +0300 Subject: [PATCH 0336/1557] Regenerate tests Original commit: 94df191f8600332d0aadf9f78683e50054a5ed0e --- .../build/IncrementalJpsTestGenerated.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 6748008890c..9d89e84f6b2 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; -import org.jetbrains.kotlin.test.InnerTestClasses; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.JetTestUtils; import org.jetbrains.kotlin.test.TestMetadata; @@ -28,17 +27,10 @@ import java.util.regex.Pattern; /** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@InnerTestClasses({ - IncrementalJpsTestGenerated.MultiModule.class, - IncrementalJpsTestGenerated.PureKotlin.class, - IncrementalJpsTestGenerated.WithJava.class, -}) @RunWith(JUnit3RunnerWithInners.class) public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/multiModule") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class MultiModule extends AbstractIncrementalJpsTest { public void testAllFilesPresentInMultiModule() throws Exception { @@ -109,8 +101,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/pureKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") @@ -439,11 +429,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - WithJava.ConvertBetweenJavaAndKotlin.class, - WithJava.JavaUsedInKotlin.class, - WithJava.KotlinUsedInJava.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { @@ -452,8 +437,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { @@ -488,9 +471,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - JavaUsedInKotlin.SamConversions.class, - }) @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { @@ -547,8 +527,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class SamConversions extends AbstractIncrementalJpsTest { public void testAllFilesPresentInSamConversions() throws Exception { @@ -572,8 +550,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") @TestDataPath("$PROJECT_ROOT") - @InnerTestClasses({ - }) @RunWith(JUnit3RunnerWithInners.class) public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInKotlinUsedInJava() throws Exception { From e116bcc346a009f11c301559c7a1677a97f2be6f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 16 Apr 2015 00:58:50 +0300 Subject: [PATCH 0337/1557] Make 'sure' an inline function with a lazy parameter Also replace some other non-lazy stdlib function usages with the new lazy 'sure' Original commit: 44e35cad291afb043e777ff77b93405f53f1abbe --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 77fdd989fc7..8b294e5f8ca 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -555,6 +555,7 @@ private class GeneratedJvmClass ( sourceFiles: Collection, outputFile: File ) : GeneratedFile(target, sourceFiles, outputFile) { - val outputClass = LocalFileKotlinClass.create(outputFile).sure( - "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations") + val outputClass = LocalFileKotlinClass.create(outputFile).sure { + "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations" + } } From 8f8b9380601e2e09de0ccbf6ee814fdb1d61ebd4 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 2 Apr 2015 21:35:13 +0300 Subject: [PATCH 0338/1557] Drop module "ktm" scripts and support java source roots in "xml" modules Drop kotlin.modules package from runtime Move adapted classes into compiler Unsupport files with "ktm" extension Delete code for loading module scripts Drop tests for module scripts Separate section for java source roots in xml script generator/parser Original commit: 94cc847c4892b03ab16cdb47d26c72a2b017c751 --- .../modules/KotlinModuleXmlBuilder.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java index 1584e1a7e34..67844e5ebb9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java @@ -67,23 +67,19 @@ public class KotlinModuleXmlBuilder { p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>"); } - if (!javaSourceRoots.isEmpty()) { - processClassPathSection("Java source roots", javaSourceRoots, directoriesToFilterOut); - } - - processClassPathSection("Classpath", classpathRoots, directoriesToFilterOut); + processJavaSourceRoots(javaSourceRoots); + processClasspath(classpathRoots, directoriesToFilterOut); processAnnotationRoots(annotationRoots); closeTag(p, MODULE); return this; } - private void processClassPathSection( - @NotNull String sectionDescription, + private void processClasspath( @NotNull Collection files, @NotNull Set directoriesToFilterOut ) { - p.println(""); + p.println(""); for (File file : files) { boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.ENABLED; if (isOutput) { @@ -111,6 +107,13 @@ public class KotlinModuleXmlBuilder { } } + private void processJavaSourceRoots(@NotNull List files) { + p.println(""); + for (File file : files) { + p.println("<", JAVA_SOURCE_ROOTS, " ", PATH, "=\"", getEscapedPath(file), "\"/>"); + } + } + public CharSequence asText() { if (!done) { closeTag(p, MODULES); From a5d0547c1eec2f1ed705bda0ba4f6eb03854c66a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 29 Apr 2015 14:25:47 +0300 Subject: [PATCH 0339/1557] Allow to use Kotlin reflection in all modules with Kotlin Original commit: 3b18a443405a907e98aa355586aaba5e5db1f643 --- .../org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt index 3763e86d5ec..12b8da13837 100644 --- a/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt +++ b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt @@ -31,7 +31,7 @@ public class BareJpsPluginRegistrar : ApplicationComponent { } else { val compileServerPlugin = CompileServerPlugin() - compileServerPlugin.setClasspath("jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-bare-plugin.jar") + compileServerPlugin.setClasspath("jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-bare-plugin.jar") compileServerPlugin.setPluginDescriptor(PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin.bare"))) Extensions.getRootArea() From 1937ee398644b7704b41c225752372e967b187c1 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 5 May 2015 19:07:22 +0300 Subject: [PATCH 0340/1557] Compile modules with circular dependency as one module Original commit: 2d8dcaddd0116707bb14e459c0a8385fc738e188 --- .../kotlin/jps/build/KotlinJpsBuildTest.java | 21 ++++++++++-- .../kotlinProject.ipr | 32 +++++++++++++++++++ .../module1/module1.iml | 12 +++++++ .../module1/src/module1/JavaClass.java | 6 ++++ .../module1/src/module1/b.kt | 11 +++++++ .../module2/module2.iml | 12 +++++++ .../module2/src/module2/KotlinObject.kt | 9 ++++++ .../module2/src/module2/a.kt | 11 +++++++ .../oldModuleLib/src/module1/JavaClass.java | 5 +++ .../oldModuleLib/src/module1/b.kt | 9 ++++++ .../oldModuleLib/src/module2/KotlinObject.kt | 6 ++++ .../oldModuleLib/src/module2/a.kt | 9 ++++++ 12 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/JavaClass.java create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/b.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/KotlinObject.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/a.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index b3fb579cc09..39a4728acb3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.build; +import com.google.common.collect.Lists; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightVirtualFile; @@ -33,6 +34,7 @@ import org.jetbrains.jps.util.JpsPathUtil; import org.jetbrains.kotlin.codegen.AsmUtil; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; +import org.jetbrains.kotlin.test.MockLibraryUtil; import org.jetbrains.kotlin.utils.PathUtil; import org.jetbrains.org.objectweb.asm.ClassReader; import org.jetbrains.org.objectweb.asm.ClassVisitor; @@ -258,7 +260,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertFilesExistInOutput(module, "Foo.class", "Bar.class"); assertFilesNotExistInOutput(module, EXCLUDE_FILES); - checkWhen(touch("src/foo.kt"), null, new String[] { klass("kotlinProject", "Foo")} ); + checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); checkWhen(touch("src/Excluded.kt"), null, NOTHING ); checkWhen(touch("src/dir/YetAnotherExcluded.kt"), null, NOTHING); } @@ -270,7 +272,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertFilesExistInOutput(module, "Foo.class", "Bar.class"); assertFilesNotExistInOutput(module, EXCLUDE_FILES); - checkWhen(touch("src/foo.kt"), null, new String[] { klass("kotlinProject", "Foo")} ); + checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); checkWhen(touch("src/dir/subdir/bar.kt"), null, new String[] { klass("kotlinProject", "Bar")} ); checkWhen(touch("src/dir/Excluded.kt"), null, NOTHING ); @@ -284,7 +286,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { assertFilesExistInOutput(module, "Foo.class", "Bar.class"); assertFilesNotExistInOutput(module, EXCLUDE_FILES); - checkWhen(touch("src/foo.kt"), null, new String[] { klass("kotlinProject", "Foo")} ); + checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); checkWhen(touch("src/exclude/Excluded.kt"), null, NOTHING); checkWhen(touch("src/exclude/YetAnotherExcluded.kt"), null, NOTHING); @@ -416,6 +418,19 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")); } + public void testCircularDependencyWithReferenceToOldVersionLib() throws IOException { + initProject(); + + File libraryJar = MockLibraryUtil.compileLibraryToJar( + workDir.getAbsolutePath() + File.separator + "oldModuleLib/src", "module-lib", false); + + addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, + "module-lib", libraryJar); + + BuildResult result = makeAll(); + result.assertSuccessful(); + } + private void createKotlinJavaScriptLibraryArchive() { File jarFile = new File(workDir, KOTLIN_JS_LIBRARY_JAR); try { diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/kotlinProject.ipr b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml new file mode 100644 index 00000000000..f8d6a06273d --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/JavaClass.java b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/JavaClass.java new file mode 100644 index 00000000000..6bec9cbc7a6 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/JavaClass.java @@ -0,0 +1,6 @@ +package module1; + +public class JavaClass { + public static void newJavaMethod() {} + public static void oldJavaMethod() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/b.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/b.kt new file mode 100644 index 00000000000..eed0941fbaf --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/src/module1/b.kt @@ -0,0 +1,11 @@ +package module1 + +import module2.* + +fun foo() { + JavaClass.oldJavaMethod() + JavaClass.newJavaMethod() + + KotlinObject.oldKotlinMethod() + KotlinObject.newKotlinMethod() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml new file mode 100644 index 00000000000..c21105b2c24 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/KotlinObject.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/KotlinObject.kt new file mode 100644 index 00000000000..fa757e1de93 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/KotlinObject.kt @@ -0,0 +1,9 @@ +package module2 + +public object KotlinObject { + public fun oldKotlinMethod() { + } + + public fun newKotlinMethod() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/a.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/a.kt new file mode 100644 index 00000000000..10ecb462c1d --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/src/module2/a.kt @@ -0,0 +1,11 @@ +package module2 + +import module1.* + +fun bar() { + JavaClass.oldJavaMethod() + JavaClass.newJavaMethod() + + KotlinObject.oldKotlinMethod() + KotlinObject.newKotlinMethod() +} diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java new file mode 100644 index 00000000000..695f1f369ac --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java @@ -0,0 +1,5 @@ +package module1; + +public class JavaClass { + public static void oldJavaMethod() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt new file mode 100644 index 00000000000..f849db6dc81 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt @@ -0,0 +1,9 @@ +package module1 + +import module2.* + +fun foo() { + JavaClass.oldJavaMethod() + + KotlinObject.oldKotlinMethod() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt new file mode 100644 index 00000000000..9abb5fd9320 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt @@ -0,0 +1,6 @@ +package module2 + +public object KotlinObject { + public fun oldKotlinMethod() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt new file mode 100644 index 00000000000..c595a192cad --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt @@ -0,0 +1,9 @@ +package module2 + +import module1.* + +fun bar() { + JavaClass.oldJavaMethod() + + KotlinObject.oldKotlinMethod() +} From 395e5446fb71a25469dca4218f6fa77bf80a9aa8 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 8 May 2015 16:22:27 +0300 Subject: [PATCH 0341/1557] Place light classes finder before standard PsiElementFinderImpl Source elements should have priority over libraries. Original commit: 3c7e7ffda6b376fe336eb94ede87e372ea21a3e4 --- .../kotlin/jps/build/KotlinJpsBuildTest.java | 14 +++++++++ .../kotlinProject.ipr | 31 +++++++++++++++++++ .../module/module.iml | 12 +++++++ .../module/src/module/A.kt | 6 ++++ .../module/src/module/B.kt | 9 ++++++ .../module/src/module/C.java | 5 +++ .../oldModuleLib/src/module/A.kt | 5 +++ .../oldModuleLib/src/module/B.kt | 8 +++++ .../oldModuleLib/src/module/C.java | 5 +++ 9 files changed, 95 insertions(+) create mode 100644 jps/jps-plugin/testData/general/DependencyToOldKotlinLib/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml create mode 100644 jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt create mode 100644 jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/B.kt create mode 100644 jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/C.java create mode 100644 jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt create mode 100644 jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/B.kt create mode 100644 jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/C.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 39a4728acb3..697994f07c6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -431,6 +431,20 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { result.assertSuccessful(); } + public void testDependencyToOldKotlinLib() throws IOException { + initProject(); + + File libraryJar = MockLibraryUtil.compileLibraryToJar( + workDir.getAbsolutePath() + File.separator + "oldModuleLib/src", "module-lib", false); + + addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar); + + addKotlinRuntimeDependency(); + + BuildResult result = makeAll(); + result.assertSuccessful(); + } + private void createKotlinJavaScriptLibraryArchive() { File jarFile = new File(workDir, KOTLIN_JS_LIBRARY_JAR); try { diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/kotlinProject.ipr b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/kotlinProject.ipr new file mode 100644 index 00000000000..d324e31411d --- /dev/null +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/kotlinProject.ipr @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml new file mode 100644 index 00000000000..f8d6a06273d --- /dev/null +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt new file mode 100644 index 00000000000..b57a44e4536 --- /dev/null +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt @@ -0,0 +1,6 @@ +package module + +public trait A { + fun oldFun(): Int = 1 + fun newFun(): Int = 42 +} diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/B.kt b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/B.kt new file mode 100644 index 00000000000..80f01b0be85 --- /dev/null +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/B.kt @@ -0,0 +1,9 @@ +package module + +public class B(private val c: C) { + fun foo() { + val a = c.getA() + a.oldFun() + a.newFun() + } +} diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/C.java b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/C.java new file mode 100644 index 00000000000..0716f11da8f --- /dev/null +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/C.java @@ -0,0 +1,5 @@ +package module; + +public interface C { + A getA(); +} diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt new file mode 100644 index 00000000000..0a6c17d7a78 --- /dev/null +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt @@ -0,0 +1,5 @@ +package module + +public trait A { + fun oldFun(): Int = 1 +} diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/B.kt b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/B.kt new file mode 100644 index 00000000000..74aad6e1f3f --- /dev/null +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/B.kt @@ -0,0 +1,8 @@ +package module + +public class B(private val c: C) { + fun foo() { + val a = c.getA() + a.oldFun() + } +} diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/C.java b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/C.java new file mode 100644 index 00000000000..0716f11da8f --- /dev/null +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/C.java @@ -0,0 +1,5 @@ +package module; + +public interface C { + A getA(); +} From c445089f2107146ee19076967e12dcab5734797d Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 13 May 2015 16:21:13 +0300 Subject: [PATCH 0342/1557] KT-7587 Overloads are not generated during partial compilation of package #KT-7587 fixed Original commit: 0498bd7739a5d26f4738e82652f64ee7025f52dc --- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../pureKotlin/optionalParameter/build.log | 7 +++++++ .../pureKotlin/optionalParameter/fun.kt | 6 ++++++ .../pureKotlin/optionalParameter/other.kt | 5 +++++ .../pureKotlin/optionalParameter/other.kt.new | 5 +++++ .../addOptionalParameter/JavaUsage.java | 5 +++++ .../addOptionalParameter/build.log | 18 ++++++++++++++++++ .../addOptionalParameter/fun.kt | 5 +++++ .../addOptionalParameter/fun.kt.new | 6 ++++++ .../addOptionalParameter/other.kt | 5 +++++ 10 files changed, 74 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 9d89e84f6b2..5b7d3b434ea 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -299,6 +299,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("optionalParameter") + public void testOptionalParameter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); + doTest(fileName); + } + @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); @@ -552,6 +558,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { + @TestMetadata("addOptionalParameter") + public void testAddOptionalParameter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/"); + doTest(fileName); + } + public void testAllFilesPresentInKotlinUsedInJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log new file mode 100644 index 00000000000..830fd9d2ae7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage$other$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/other.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt new file mode 100644 index 00000000000..1b8d4e731e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt @@ -0,0 +1,6 @@ +package test + +kotlin.jvm.overloads +fun f(a: String, b: Int = 5) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt new file mode 100644 index 00000000000..d2639425252 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt @@ -0,0 +1,5 @@ +package test + +fun other() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new new file mode 100644 index 00000000000..d2639425252 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new @@ -0,0 +1,5 @@ +package test + +fun other() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java new file mode 100644 index 00000000000..da2f9b63512 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java @@ -0,0 +1,5 @@ +class JavaUsage { + public static void main(String[] args) { + test.TestPackage.f("x"); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log new file mode 100644 index 00000000000..2a0d68e2bd0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/test/TestPackage$fun$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/fun.kt +End of files +Cleaning output files: +out/production/module/JavaUsage.class +out/production/module/test/TestPackage$other$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/other.kt +End of files +Compiling files: +src/JavaUsage.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt new file mode 100644 index 00000000000..15105c825ed --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(a: String) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new new file mode 100644 index 00000000000..1b8d4e731e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new @@ -0,0 +1,6 @@ +package test + +kotlin.jvm.overloads +fun f(a: String, b: Int = 5) { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt new file mode 100644 index 00000000000..d2639425252 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt @@ -0,0 +1,5 @@ +package test + +fun other() { + +} \ No newline at end of file From 4c436ce7a2d6d5e38cefa63035e3aed31de8dcff Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 18 May 2015 13:19:52 +0300 Subject: [PATCH 0343/1557] Enum warnings fixed: deprecated delimiters, short super constructors, both in project and in libraries Original commit: fdf0ea554627515e35e2ea142fb895ed1c139234 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index bb8cb572793..22d975f5dc7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -411,7 +411,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } private enum class Kind { - INT FLOAT LONG DOUBLE STRING + INT, FLOAT, LONG, DOUBLE, STRING } } @@ -588,10 +588,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } enum class RecompilationDecision { - DO_NOTHING - RECOMPILE_OTHER_KOTLIN_IN_CHUNK - RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS - RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS + DO_NOTHING, + RECOMPILE_OTHER_KOTLIN_IN_CHUNK, + RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS, + RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS; fun merge(other: RecompilationDecision): RecompilationDecision { return if (other.ordinal() > this.ordinal()) other else this From f198ac4b31e27b9750e0d9d529f3f01b0dd22e8c Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Sat, 16 May 2015 02:39:56 +0300 Subject: [PATCH 0344/1557] JS: make -meta-info cli option boolean Original commit: d6292715104738509a6253b91f9bf6768faa81e9 --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 12 +++--------- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 3 +-- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index ea95389879c..887f515087a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -72,11 +72,10 @@ public class KotlinCompilerRunner { @NotNull OutputItemsCollector collector, @NotNull Collection sourceFiles, @NotNull List libraryFiles, - @NotNull File outputFile, - @Nullable File metaInfoFile + @NotNull File outputFile ) { K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); - setupK2JsArguments(outputFile, metaInfoFile, sourceFiles, libraryFiles, arguments); + setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments); runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment); } @@ -191,7 +190,6 @@ public class KotlinCompilerRunner { private static void setupK2JsArguments( @NotNull File outputFile, - @Nullable File metaInfoFile, @NotNull Collection sourceFiles, @NotNull List libraryFiles, @NotNull K2JSCompilerArguments settings @@ -204,11 +202,7 @@ public class KotlinCompilerRunner { } }); settings.outputFile = outputFile.getPath(); - - if (metaInfoFile != null) { - settings.metaInfo = metaInfoFile.getPath(); - } - + settings.metaInfo = true; settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles); } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 8b294e5f8ca..cb702e2f7c1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -400,12 +400,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val moduleName = representativeTarget.getModule().getName() val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName) - val metaInfoFile = JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName) val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) - runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile, metaInfoFile) + runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) return outputItemCollector } From 3bb8a1fd5328eb8667feeed9b8a41108bbb1c48d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 13 May 2015 23:15:15 +0300 Subject: [PATCH 0345/1557] Fix deprecated replaceAll and replaceFirst usages. Original commit: 79a5e0607d30fa164aa95796a9b0201686e9ad44 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 49fff5701ae..f01fc98f5d6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -93,7 +93,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { buildResult .getMessages(BuildMessage.Kind.ERROR) .map { it.getMessageText() } - .map { it.replaceAll("^.+:\\d+:\\s+", "").trim() } + .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() } .joinToString("\n") return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null) } From bc4f80bc36732316cf9dbbd2f0d9e4a6ff7cb2ff Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 15 May 2015 21:33:49 +0300 Subject: [PATCH 0346/1557] JS: JpsJsModuleUtils: do not include urls with kotlin-js-meta protocol Original commit: 0a6c6e35b55c638b0d5e895d12acf8cbfb446028 --- .../src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index b72633fc311..0276a1665c0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -41,7 +41,11 @@ object JpsJsModuleUtils { val libraries = JpsUtils.getAllDependencies(target).getLibraries() for (library in libraries) { for (root in library.getRoots(JpsOrderRootType.COMPILED)) { - result.add(JpsPathUtil.urlToPath(root.getUrl())) + val path = JpsPathUtil.urlToPath(root.getUrl()) + // ignore files, added only for IDE support (stubs and indexes) + if (!path.startsWith(KotlinJavascriptMetadataUtils.VFS_PROTOCOL + "://")) { + result.add(path) + } } } } From a1cf175bb884e71c79262551dd497b1edff91bd9 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 26 May 2015 19:32:05 +0200 Subject: [PATCH 0347/1557] rename @overloads annotation to @jvmOverloads Original commit: 1188e57597dd608b2d0494ea9eb6fe1d34ad3834 --- .../testData/incremental/pureKotlin/optionalParameter/fun.kt | 2 +- .../withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt index 1b8d4e731e4..b4f268492af 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt @@ -1,6 +1,6 @@ package test -kotlin.jvm.overloads +kotlin.jvm.jvmOverloads fun f(a: String, b: Int = 5) { } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new index 1b8d4e731e4..b4f268492af 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new @@ -1,6 +1,6 @@ package test -kotlin.jvm.overloads +kotlin.jvm.jvmOverloads fun f(a: String, b: Int = 5) { } \ No newline at end of file From 4b08b132898fe9bafee5a04d55f89eb938f819c0 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 25 May 2015 18:05:13 +0300 Subject: [PATCH 0348/1557] Minor. Fixed typo in test data. Original commit: 37d6c9bf259ae5b166dd62738d75236f10ed5cc1 --- .../general/CircularDependenciesSamePackage/module1/module1.iml | 2 +- .../module1/module1.iml | 2 +- .../testData/general/DependencyToOldKotlinLib/module/module.iml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/module1.iml b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/module1.iml index b86ce213a79..c9205eae762 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/module1.iml +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackage/module1/module1.iml @@ -1,4 +1,4 @@ - + diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml index f8d6a06273d..e3fd3c8c75e 100644 --- a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml @@ -1,4 +1,4 @@ - + diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml index f8d6a06273d..e3fd3c8c75e 100644 --- a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml @@ -1,4 +1,4 @@ - + From daa16c768bb1dff14b5979468acbe83dbe5dd26a Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 25 May 2015 18:06:49 +0300 Subject: [PATCH 0349/1557] Fixed package proto for circular dependencies. Case when package is present in different modules which depend on each other. We should generate separate package facades for this case. Original commit: 7de531fe09fd10f64b2706fbfe38ce01380f579a --- .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../circularDependencySamePackageUnchanged/build.log | 7 +++++++ .../dependencies.txt | 2 ++ .../circularDependencySamePackageUnchanged/module1_a.kt | 7 +++++++ .../module1_a.kt.new | 7 +++++++ .../circularDependencySamePackageUnchanged/module2_b.kt | 7 +++++++ 6 files changed, 36 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 5b7d3b434ea..af9f1e8ce99 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -43,6 +43,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("circularDependencySamePackageUnchanged") + public void testCircularDependencySamePackageUnchanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/"); + doTest(fileName); + } + @TestMetadata("circularDependencyTopLevelFunctions") public void testCircularDependencyTopLevelFunctions() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log new file mode 100644 index 00000000000..d51f6f61402 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module1/test/TestPackage$module1_a$*.class +out/production/module1/test/TestPackage.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt new file mode 100644 index 00000000000..02d5c8ca1a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/dependencies.txt @@ -0,0 +1,2 @@ +module1->module2 +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt new file mode 100644 index 00000000000..8311da66012 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt @@ -0,0 +1,7 @@ +package test + +fun a() { + +} + +val a = "" diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new new file mode 100644 index 00000000000..8311da66012 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new @@ -0,0 +1,7 @@ +package test + +fun a() { + +} + +val a = "" diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt new file mode 100644 index 00000000000..b04c387135d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module2_b.kt @@ -0,0 +1,7 @@ +package test + +fun b() { + +} + +var b = b() From 0994979f058d331d6572d379859e01ae2196c49b Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 29 May 2015 16:03:08 +0300 Subject: [PATCH 0350/1557] Fixed iml files in test data. Order entry for own sources is obligatory. Original commit: fe3437e8a1bc2bd6fdb1cd2b8dcf7cc6bcca5e62 --- .../module1/module1.iml | 1 + .../module2/module2.iml | 1 + .../testData/general/DependencyToOldKotlinLib/module/module.iml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml index e3fd3c8c75e..e9637fef0b3 100644 --- a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module1/module1.iml @@ -6,6 +6,7 @@ + diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml index c21105b2c24..bdec3f1d34a 100644 --- a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/module2/module2.iml @@ -6,6 +6,7 @@ + diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml index e3fd3c8c75e..eff2a2bb0bf 100644 --- a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/module.iml @@ -6,7 +6,7 @@ - + From 122b5330768ec65df269e7058466889734215a35 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Fri, 29 May 2015 16:09:28 +0300 Subject: [PATCH 0351/1557] Enabled incremental compilation by default. Original commit: 36915bf84680b9d462728059f077a0855310e912 --- .../jps/build/AbstractIncrementalJpsTest.kt | 4 --- .../kotlin/jps/build/KotlinJpsBuildTest.java | 26 ++++++++++++++++--- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index f01fc98f5d6..e4d8ac82c1a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -219,10 +219,6 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } protected fun doTest(testDataPath: String) { - if (!IncrementalCompilation.ENABLED) { - return - } - testDataDir = File(testDataPath) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index 697994f07c6..c2a386cc95f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -20,6 +20,7 @@ import com.google.common.collect.Lists; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.testFramework.LightVirtualFile; +import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.io.ZipUtil; import kotlin.KotlinPackage; @@ -303,12 +304,16 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); checkWhen(touch("src/Bar.kt"), - new String[] {"src/Bar.kt", "src/boo.kt", "src/main.kt"}, + new String[] {"src/Bar.kt"}, new String[] {klass("kotlinProject", "foo.Bar")}); checkWhen(del("src/main.kt"), new String[] {"src/Bar.kt", "src/boo.kt"}, - packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); + mergeArrays( + packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), + packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), + new String[]{ klass("kotlinProject", "foo.Bar") } + )); assertFilesExistInOutput(module, "boo/BooPackage.class", "foo/Bar.class"); assertFilesNotExistInOutput(module, "foo/FooPackage.class"); @@ -325,7 +330,7 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); checkWhen(touch("src/Bar.kt"), - new String[] {"src/Bar.kt", "src/boo.kt", "src/main.kt"}, + new String[] {"src/Bar.kt"}, new String[] { klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), @@ -333,7 +338,12 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { checkWhen(del("src/main.kt"), new String[] {"src/Bar.kt", "src/boo.kt"}, - packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); + mergeArrays( + packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), + packageClasses("kotlinProject", "src/Bar.kt", "foo.FooPackage"), + packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), + new String[] {klass("kotlinProject", "foo.Bar")} + )); assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class"); checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); @@ -618,6 +628,14 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName)); } + public static String[] mergeArrays(String[]... stringArrays) { + Set result = new HashSet(); + for (String[] array : stringArrays) { + result.addAll(Arrays.asList(array)); + } + return ArrayUtil.toStringArray(result); + } + private enum Operation { CHANGE, DELETE } From bb9d74813b6d5697f87c7910e13d59bbb8bb9c84 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 1 Jun 2015 12:48:50 +0300 Subject: [PATCH 0352/1557] Minor. Moved file to separate package to avoid clashing between tests and sources Original commit: bd8e9078092671e876a7f932701212f9155c6826 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 1 + .../build/{ => classFilesComparison}/classFilesComparison.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) rename jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/{ => classFilesComparison}/classFilesComparison.kt (98%) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index e4d8ac82c1a..ca2e060bf93 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -49,6 +49,7 @@ import org.jetbrains.jps.builders.BuildResult import org.jetbrains.jps.incremental.BuilderRegistry import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.java.dependencyView.Callbacks +import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { companion object { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt similarity index 98% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index 21046e7ad22..7334b17c2ca 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.build +package org.jetbrains.kotlin.jps.build.classFilesComparison import java.io.File import org.junit.Assert.* From fa97fd2b64e01b9519a5176f632b0afb18497372 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 1 Jun 2015 12:54:05 +0300 Subject: [PATCH 0353/1557] Updated Kannotator JPS build test for new incremental compilation. Now it only invokes make for each changed file (much faster). And for each source target, it also checks that out directories are the same as after full rebuild. Original commit: b94665e9484605e714ace920abb53b2160be603b --- .../KAnnotatorJpsBuildTestCase.java | 41 ++++++++++++------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java index be7abede23e..22bd4e8a9f6 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java @@ -22,8 +22,10 @@ import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase; +import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonPackage; import java.io.File; +import java.io.IOException; public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { private static final String JDK_NAME = "1.6"; @@ -35,41 +37,50 @@ public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { workDir = copyTestDataToTmpDir(sourceFilesRoot); } - public void testMakeKannotator() { - doTest(false); - } - - public void testRebuildKannotator() { - doTest(true); - } - - private void doTest(boolean rebuildBeforeMake) { + public void testMakeKannotator() throws IOException { initProject(); rebuildAll(); + FileUtil.copyDir(getOutDir(), getOutDirAfterRebuild()); for (JpsModule module : myProject.getModules()) { for (JpsModuleSourceRoot sourceRoot : module.getSourceRoots()) { - processFile(sourceRoot.getFile(), rebuildBeforeMake); + processFile(sourceRoot.getFile()); } } } - private void processFile(File root, boolean rebuildBeforeMake) { + @NotNull + private File getOutDir() { + return new File(workDir, "out"); + } + + @NotNull + private File getOutDirAfterRebuild() { + return new File(workDir, "out-after-rebuild"); + } + + private void processFile(File root) { if (root.isDirectory()) { File[] files = root.listFiles(); if (files == null) return; for (File file : files) { - processFile(file, rebuildBeforeMake); + processFile(file); } } else if (root.getName().endsWith(".kt")) { System.out.println("Test started. File: " + root.getName()); String path = root.getAbsolutePath(); - if (rebuildBeforeMake) { - rebuildAll(); - } System.out.println("Change file: " + path); change(path); makeAll().assertSuccessful(); + System.out.println("Make successful"); + + System.out.println("Checking output directories after make and rebuild"); + + ClassFilesComparisonPackage + .assertEqualDirectories(new File(getOutDirAfterRebuild(), "production"), new File(getOutDir(), "production"), false); + ClassFilesComparisonPackage + .assertEqualDirectories(new File(getOutDirAfterRebuild(), "test"), new File(getOutDir(), "test"), false); + System.out.println("Test successfully finished. File: " + root.getName()); System.out.println("-----"); } From f8faa92e0fd736688f3f0a04a07a2bd420d34156 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 1 Jun 2015 19:02:04 +0300 Subject: [PATCH 0354/1557] Minor. Renamed test. Original commit: cab8f583a88638d50548eec6cbc37412823ae78d --- .../{KAnnotatorJpsBuildTestCase.java => KannotatorJpsTest.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/{KAnnotatorJpsBuildTestCase.java => KannotatorJpsTest.java} (97%) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java similarity index 97% rename from jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java rename to jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java index 22bd4e8a9f6..5b8c8e070d0 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KAnnotatorJpsBuildTestCase.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonP import java.io.File; import java.io.IOException; -public class KAnnotatorJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { +public class KannotatorJpsTest extends AbstractKotlinJpsBuildTestCase { private static final String JDK_NAME = "1.6"; @Override From d422bb9827a6029705dbc49c7a87b9a350b588a9 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 4 Jun 2015 14:46:39 +0300 Subject: [PATCH 0355/1557] Do not recompile module when anonymous object or local class is changed. Original commit: 0bf249d6aec12f04a55b0c7da2adf4ee1ef6ee9d --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 14 +++++++++----- .../jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../pureKotlin/anonymousObjectChanged/a.kt.new | 1 - .../pureKotlin/anonymousObjectChanged/build.log | 7 ------- .../incremental/pureKotlin/localClassChanged/a.kt | 9 +++++++++ .../pureKotlin/localClassChanged/a.kt.new | 11 +++++++++++ .../pureKotlin/localClassChanged/build.log | 8 ++++++++ .../pureKotlin/localClassChanged/unrelated.kt | 5 +++++ 8 files changed, 48 insertions(+), 13 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/unrelated.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 22d975f5dc7..d300068fb41 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -143,11 +143,15 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen inlinesChanged = false ) header.isCompatibleClassKind() -> - getRecompilationDecision( - protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)), - constantsChanged = constantsMap.process(className, fileBytes), - inlinesChanged = inlineFunctionsMap.process(className, fileBytes) - ) + when (header.classKind!!) { + JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision( + protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)), + constantsChanged = constantsMap.process(className, fileBytes), + inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + ) + + JvmAnnotationNames.KotlinClass.Kind.LOCAL_CLASS, JvmAnnotationNames.KotlinClass.Kind.ANONYMOUS_OBJECT -> DO_NOTHING + } header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index af9f1e8ce99..da0f6d5dd2c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -287,6 +287,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("localClassChanged") + public void testLocalClassChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); + doTest(fileName); + } + @TestMetadata("moveClass") public void testMoveClass() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new index 6255f915194..37d68224ae2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/a.kt.new @@ -1,6 +1,5 @@ package a -// Signatures in the class "...$main$1" have changed, thus we need to recompile the whole module fun foo() = object { fun baz() = ":)" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index d2598525c01..c56d69d0001 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -5,11 +5,4 @@ out/production/module/a/APackage.class End of files Compiling files: src/a.kt -End of files -Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class -out/production/module/usage/UsagePackage.class -End of files -Compiling files: -src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt new file mode 100644 index 00000000000..2924f1dad8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt @@ -0,0 +1,9 @@ +package test + +fun foo() { + class X { + fun bar() = 111 + } + + X().bar() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt.new new file mode 100644 index 00000000000..c1209c13075 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/a.kt.new @@ -0,0 +1,11 @@ +package test + +fun foo() { + class X { + fun bar() = 111 + fun baz() = ":)" + } + + X().bar() + X().baz() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log new file mode 100644 index 00000000000..38fe179639a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module/test/TestPackage$a$*$foo$X.class +out/production/module/test/TestPackage$a$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/unrelated.kt b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/unrelated.kt new file mode 100644 index 00000000000..f9d3d65eecf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/unrelated.kt @@ -0,0 +1,5 @@ +package unrelated + +fun main(args: Array) { + +} \ No newline at end of file From e352af9bb8c59d8c2a4e1964994c2490b96bbfa3 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 8 Jun 2015 17:47:52 +0300 Subject: [PATCH 0356/1557] Fixed sticking of incremental cache data when case of file path is changed. Original commit: 959364aa77880a6c43d751fbf5fbdda733499a0d --- .../jps/incremental/IncrementalCacheImpl.kt | 3 +- .../jps/build/AbstractIncrementalJpsTest.kt | 12 ++++- .../IncrementalProjectPathCaseChangedTest.kt | 46 +++++++++++++++++++ .../custom/projectPathCaseChanged/build.log | 7 +++ .../custom/projectPathCaseChanged/foo.kt | 2 + .../custom/projectPathCaseChanged/foo.kt.new | 2 + 6 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index d300068fb41..106613c6d7b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -46,6 +46,7 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths import com.intellij.util.io.BooleanDataDescriptor import java.util.ArrayList import org.jetbrains.annotations.TestOnly +import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.kotlin.utils.Printer import java.io.DataInputStream @@ -546,7 +547,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private inner class SourceToClassesMap : BasicMap>() { override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, SOURCE_TO_CLASSES), - EnumeratorStringDescriptor(), + PathStringDescriptor.INSTANCE, StringListExternalizer ) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index ca2e060bf93..fc3b4992bf3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -79,6 +79,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver? get() = null + protected open val checkDumpsCaseInsensitively: Boolean + get() = false + fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) val logger = MyLogger(workDirPath) @@ -190,7 +193,12 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { assertEqualDirectories(outDir, outAfterMake, makeOverallResult.makeFailed) if (!makeOverallResult.makeFailed) { - TestCase.assertEquals(rebuildResult.mappingsDump, makeOverallResult.mappingsDump) + if (checkDumpsCaseInsensitively && rebuildResult.mappingsDump?.toLowerCase() == makeOverallResult.mappingsDump?.toLowerCase()) { + // do nothing + } + else { + TestCase.assertEquals(rebuildResult.mappingsDump, makeOverallResult.mappingsDump) + } } FileUtil.delete(outAfterMake) @@ -219,7 +227,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { return result } - protected fun doTest(testDataPath: String) { + protected open fun doTest(testDataPath: String) { testDataDir = File(testDataPath) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt new file mode 100644 index 00000000000..9a7d734a87e --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt @@ -0,0 +1,46 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +import com.intellij.openapi.util.SystemInfoRt +import org.jetbrains.jps.model.java.JavaSourceRootType + +public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest() { + fun testProjectPathCaseChanged() { + doTest("jps-plugin/testData/incremental/custom/projectPathCaseChanged/") + } + + override fun doTest(testDataPath: String) { + if (SystemInfoRt.isFileSystemCaseSensitive) { + return + } + + super.doTest(testDataPath) + } + + override val checkDumpsCaseInsensitively: Boolean + get() = true + + override fun performAdditionalModifications() { + val module = myProject.getModules()[0] + val sourceRoot = module.getSourceRoots()[0].getUrl() + assert(sourceRoot.endsWith("/src")) + val newSourceRoot = sourceRoot.replace("/src", "/SRC") + module.removeSourceRoot(sourceRoot, JavaSourceRootType.SOURCE) + module.addSourceRoot(newSourceRoot, JavaSourceRootType.SOURCE) + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log new file mode 100644 index 00000000000..4cf233bbc00 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/_DefaultPackage$foo$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/foo.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt new file mode 100644 index 00000000000..99cec0dbea1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt @@ -0,0 +1,2 @@ +fun f() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new new file mode 100644 index 00000000000..99cec0dbea1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new @@ -0,0 +1,2 @@ +fun f() { +} \ No newline at end of file From 92f07e6281753919ad50e732758212e9a936a6cf Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 8 Jun 2015 19:37:34 +0300 Subject: [PATCH 0357/1557] Path hash code is case-agnostic. This is to avoid changing it if e.g. path to project is reconfigured from C:\Work to c:\work Original commit: c48378260e5e586ada6bc14f1733f489421e4ec0 --- .../jps/build/IncrementalProjectPathCaseChangedTest.kt | 4 ++++ .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java | 5 +++-- .../custom/projectPathCaseChangedMultiFile/bar.kt | 2 ++ .../custom/projectPathCaseChangedMultiFile/build.log | 7 +++++++ .../custom/projectPathCaseChangedMultiFile/foo.kt | 2 ++ .../custom/projectPathCaseChangedMultiFile/foo.kt.new | 2 ++ 6 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt index 9a7d734a87e..27cb4449ec7 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt @@ -24,6 +24,10 @@ public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest( doTest("jps-plugin/testData/incremental/custom/projectPathCaseChanged/") } + fun testProjectPathCaseChangedMultiFile() { + doTest("jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/") + } + override fun doTest(testDataPath: String) { if (SystemInfoRt.isFileSystemCaseSensitive) { return diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index c2a386cc95f..b2e15a5f3bc 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.google.common.collect.Lists; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.testFramework.LightVirtualFile; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; @@ -614,8 +615,8 @@ public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { } private String packagePartClass(String moduleName, String fileName, String packageClassFqName) { - File file = new File(workDir, fileName); - LightVirtualFile fakeVirtualFile = new LightVirtualFile(file.getPath()) { + String path = FileUtilRt.toSystemIndependentName(new File(workDir, fileName).getAbsolutePath()); + LightVirtualFile fakeVirtualFile = new LightVirtualFile(path) { @NotNull @Override public String getPath() { diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt new file mode 100644 index 00000000000..fe45df99555 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/bar.kt @@ -0,0 +1,2 @@ +fun bar() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log new file mode 100644 index 00000000000..4cf233bbc00 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/_DefaultPackage$foo$*.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/foo.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt new file mode 100644 index 00000000000..f23d7f69d2f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt @@ -0,0 +1,2 @@ +fun foo() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new new file mode 100644 index 00000000000..f23d7f69d2f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new @@ -0,0 +1,2 @@ +fun foo() { +} \ No newline at end of file From 1e0eff74ea7ee386a2e59ee9542c117627744ea1 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 10 Jun 2015 16:01:31 +0300 Subject: [PATCH 0358/1557] Enabled rebuilding when enabling/disabling incremental compilation in IDEA. Original commit: e6bb501c1ad551bbaef75e947196b03e3712a86f --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 ++ .../jps/incremental/IncrementalCacheImpl.kt | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index cb702e2f7c1..71a57dbb898 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -350,6 +350,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR incrementalCaches: Map, generatedClasses: List ): IncrementalCacheImpl.RecompilationDecision { + incrementalCaches.values().forEach { it.saveCacheFormatVersion() } + if (!IncrementalCompilation.ENABLED) { return DO_NOTHING } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 106613c6d7b..fb6cf7e767d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -47,6 +47,7 @@ import com.intellij.util.io.BooleanDataDescriptor import java.util.ArrayList import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.incremental.storage.PathStringDescriptor +import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.utils.Printer import java.io.DataInputStream @@ -60,20 +61,28 @@ class CacheFormatVersion(targetDataRoot: File) { // Change this when incremental cache format changes private val INCREMENTAL_CACHE_OWN_VERSION = 2 private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION + + private val NON_INCREMENTAL_MODE_PSEUDO_VERSION = Int.MAX_VALUE + val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" } private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) + private fun actualCacheFormatVersion() = if (IncrementalCompilation.ENABLED) CACHE_FORMAT_VERSION else NON_INCREMENTAL_MODE_PSEUDO_VERSION + public fun isIncompatible(): Boolean { if (!file.exists()) return false - return file.readText().toInt() != CACHE_FORMAT_VERSION + val versionNumber = file.readText().toInt() + val expectedVersionNumber = actualCacheFormatVersion() + + return versionNumber != expectedVersionNumber } fun saveIfNeeded() { if (!file.exists()) { - file.writeText(CACHE_FORMAT_VERSION.toString()) + file.writeText(actualCacheFormatVersion().toString()) } } @@ -126,9 +135,11 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen else -> DO_NOTHING } - public fun saveFileToCache(sourceFiles: Collection, kotlinClass: LocalFileKotlinClass): RecompilationDecision { + public fun saveCacheFormatVersion() { cacheFormatVersion.saveIfNeeded() + } + public fun saveFileToCache(sourceFiles: Collection, kotlinClass: LocalFileKotlinClass): RecompilationDecision { val fileBytes = kotlinClass.getFileContents() val className = JvmClassName.byClassId(kotlinClass.getClassId()) val header = kotlinClass.getClassHeader() From 2c8e8c36cb02dbe31161e32c75ab88401bb0392c Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 11 Jun 2015 11:48:33 +0300 Subject: [PATCH 0359/1557] Incremented cache format version: package part hashes changed. Original commit: 4461687ae3cd0a3d57942fb50b46b5ef5c3c792a --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index fb6cf7e767d..69c1f9db283 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -59,7 +59,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin" class CacheFormatVersion(targetDataRoot: File) { companion object { // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 2 + private val INCREMENTAL_CACHE_OWN_VERSION = 3 private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION private val NON_INCREMENTAL_MODE_PSEUDO_VERSION = Int.MAX_VALUE From 20622ebe51fccf5b28e3ce1a0383d160bc13de5f Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 11 Jun 2015 18:58:32 +0300 Subject: [PATCH 0360/1557] Allowed accessing private members from same package, but different package fragment instance. Original commit: 0ddfedba498d073ed55db4dfe31354fdac27231e --- .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../incremental/pureKotlin/accessPrivateMembers/bar.kt | 7 +++++++ .../pureKotlin/accessPrivateMembers/bar.kt.new | 7 +++++++ .../pureKotlin/accessPrivateMembers/build.log | 7 +++++++ .../incremental/pureKotlin/accessPrivateMembers/foo.kt | 9 +++++++++ 5 files changed, 36 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index da0f6d5dd2c..27102441062 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -109,6 +109,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { + @TestMetadata("accessPrivateMembers") + public void testAccessPrivateMembers() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/"); + doTest(fileName); + } + @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt new file mode 100644 index 00000000000..8c016666552 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt @@ -0,0 +1,7 @@ +package test + +fun main(args: Array) { + val x: Foo = Foo() + foo() + c +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new new file mode 100644 index 00000000000..8c016666552 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new @@ -0,0 +1,7 @@ +package test + +fun main(args: Array) { + val x: Foo = Foo() + foo() + c +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log new file mode 100644 index 00000000000..6fabb2be215 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/TestPackage$bar$*.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/bar.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt new file mode 100644 index 00000000000..5f83a146f9d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt @@ -0,0 +1,9 @@ +package test + +private class Foo + +private fun foo() { + +} + +private val c = 1 \ No newline at end of file From 2293c9852a2c3944457bc5f07249f4ef904132e1 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 9 Jun 2015 20:30:52 +0300 Subject: [PATCH 0361/1557] Adjust testData: get rid of obsolete annotations Original commit: c9f79c2d05cc776afb73e22a109dfcb8a770b7e4 --- .../incremental/pureKotlin/annotations/annotations.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt index b3ba1990abf..c3d5c542a45 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/annotations.kt @@ -2,12 +2,12 @@ package test annotation class Anno -[Anno] fun f() { +@Anno fun f() { } -[Anno] val v1 = "" +@Anno val v1 = "" var v2: String get() = "" - [Anno] set(value) { + @Anno set(value) { } From 9a0e5c918548804982ac7daf4f5a0c2dbee5cd75 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 10 Jun 2015 12:45:27 +0300 Subject: [PATCH 0362/1557] Add 'constructor' keyword in whole project where needed Original commit: eb7114bd5378c39b71781fe057fd16cfaa2e1a03 --- .../jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 2665cd67063..038d44dce2b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.name.ClassId import java.io.File -class LocalFileKotlinClass private( +class LocalFileKotlinClass private constructor( private val file: File, private val fileContents: ByteArray, className: ClassId, From b70bdc75cf954c9d25f57aa835bfab4510490ab1 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 13 Jun 2015 02:39:32 +0300 Subject: [PATCH 0363/1557] Convert CompilerMessageLocation to Kotlin Original commit: 6083a18ce14b5dd2f0d66e27138345931b7f322a --- .../kotlin/jps/build/KotlinBuilder.kt | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 71a57dbb898..69f86cbc819 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -36,7 +36,6 @@ import org.jetbrains.jps.model.JpsProject import org.jetbrains.kotlin.cli.common.KotlinVersion import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.common.messages.MessageCollector @@ -97,7 +96,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val messageCollector = MessageCollectorAdapter(context) // Workaround for Android Studio if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget()) && !JavaBuilder.IS_ENABLED[context, true]) { - messageCollector.report(INFO, "Kotlin JPS plugin is disabled", NO_LOCATION) + messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION) return NOTHING_DONE } @@ -113,7 +112,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return NOTHING_DONE } - messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, NO_LOCATION) + messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION) val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getKotlinCache(it) } @@ -226,7 +225,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report( INFO, "Plugin loaded: ${argumentProvider.javaClass.getSimpleName()}", - NO_LOCATION + CompilerMessageLocation.NO_LOCATION ) } @@ -385,11 +384,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (chunk.getModules().size() > 1) { // We do not support circular dependencies, but if they are present, we do our best should not break the build, // so we simply yield a warning and report NOTHING_DONE - messageCollector.report(WARNING, "Circular dependencies are not supported. " - + "The following JS modules depend on each other: " - + chunk.getModules().map { it.getName() }.joinToString(", ") - + ". " - + "Kotlin is not compiled for these modules", NO_LOCATION) + messageCollector.report( + WARNING, + "Circular dependencies are not supported. The following JS modules depend on each other: " + + chunk.getModules().map { it.getName() }.joinToString(", ") + ". " + + "Kotlin is not compiled for these modules", + CompilerMessageLocation.NO_LOCATION + ) return null } @@ -435,11 +436,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val outputItemCollector = OutputItemsCollectorImpl() if (chunk.getModules().size() > 1) { - messageCollector.report(WARNING, "Circular dependencies are only partially supported. " - + "The following modules depend on each other: " - + chunk.getModules().map { it.getName() }.joinToString(", ") - + ". " - + "Kotlin will compile them, but some strange effect may happen", NO_LOCATION) + messageCollector.report( + WARNING, + "Circular dependencies are only partially supported. The following modules depend on each other: " + + chunk.getModules().map { it.getName() }.joinToString(", ") + ". " + + "Kotlin will compile them, but some strange effect may happen", + CompilerMessageLocation.NO_LOCATION + ) } allCompiledFiles.addAll(filesToCompile.values()) @@ -482,19 +485,19 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR CompilerRunnerConstants.KOTLIN_COMPILER_NAME, kind(severity), prefix + message + renderLocationIfNeeded(location), - location.getPath(), + location.path, -1, -1, -1, - location.getLine().toLong(), location.getColumn().toLong() + location.line.toLong(), location.column.toLong() )) } private fun renderLocationIfNeeded(location: CompilerMessageLocation): String { - if (location == NO_LOCATION) return "" + if (location == CompilerMessageLocation.NO_LOCATION) return "" // Sometimes we report errors in JavaScript library stubs, i.e. files like core/javautil.kt // IDEA can't find these files, and does not display paths in Messages View, so we add the position information // to the error message itself: - val pathname = "" + location.getPath() + val pathname = "" + location.path return if (File(pathname).exists()) "" else " (" + location + ")" } From 8c5e706092d89385c0aa53425316a3148535d75a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 13 Jun 2015 03:43:20 +0300 Subject: [PATCH 0364/1557] CLI: improve diagnostic message format - render the whole line where the error/warning points to, if any, and another line with '^', like other compilers do - lowercase diagnostic severity - decapitalize the message if it doesn't start with a proper name Original commit: 54dfd626ab1495d536271dcef8164333266f4f6a --- .../jetbrains/kotlin/compilerRunner/CompilerOutputParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java index e5bb3d4ea3d..beaebcab7f1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java @@ -161,7 +161,7 @@ public class CompilerOutputParser { reportToCollector(text); } else { - messageCollector.report(category, text, CompilerMessageLocation.create(path, line, column)); + messageCollector.report(category, text, CompilerMessageLocation.create(path, line, column, null)); } tags.pop(); } From d54b977c2cd4dd74c017b74dd14743f2f1a41771 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Mon, 15 Jun 2015 16:37:45 +0300 Subject: [PATCH 0365/1557] If KotlinBuilder throws exception, user can see its stacktrace and report by one-click. Original commit: 7511b5bafec316f50e98046a8531b400dcb565a8 --- .../kotlin/jps/build/KotlinBuilder.kt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 69f86cbc819..c6e8ec9afd2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler @@ -94,6 +95,24 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } val messageCollector = MessageCollectorAdapter(context) + try { + return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) + } catch (e: Throwable) { + messageCollector.report( + CompilerMessageSeverity.EXCEPTION, + OutputMessageUtil.renderException(e), + CompilerMessageLocation.NO_LOCATION + ) + return ABORT + } + } + + private fun doBuild( + chunk: ModuleChunk, + context: CompileContext, + dirtyFilesHolder: DirtyFilesHolder, + messageCollector: MessageCollectorAdapter, outputConsumer: ModuleLevelBuilder.OutputConsumer + ): ModuleLevelBuilder.ExitCode { // Workaround for Android Studio if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget()) && !JavaBuilder.IS_ENABLED[context, true]) { messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION) From f81eaac347de0f3c90667bf2ee2b1866b17c6ec9 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Thu, 18 Jun 2015 22:42:00 +0300 Subject: [PATCH 0366/1557] Added extra logging in incremental cache and Kotlin Builder. Original commit: 23eab735071e260e020856711ec47f1dda3aa046 --- .../kotlin/jps/build/KotlinBuilder.kt | 31 +++++--- .../jps/incremental/IncrementalCacheImpl.kt | 74 +++++++++++-------- 2 files changed, 64 insertions(+), 41 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index c6e8ec9afd2..4c15866bb05 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -59,10 +59,7 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.utils.LibraryUtils -import org.jetbrains.kotlin.utils.PathUtil -import org.jetbrains.kotlin.utils.keysToMap -import org.jetbrains.kotlin.utils.sure +import org.jetbrains.kotlin.utils.* import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.util.ArrayList @@ -74,7 +71,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR companion object { public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" - private val LOG = Logger.getInstance("#org.jetbrains.jps.cmdline.BuildSession") + val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") } private val statisticsLogger = TeamcityStatisticsLogger() @@ -122,6 +119,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val dataManager = context.getProjectDescriptor().dataManager if (chunk.getTargets().any { dataManager.getDataPaths().getKotlinCacheVersion(it).isIncompatible() }) { + LOG.info("Clearing caches for " + chunk.getTargets().map { it.getPresentableName() }.join()) chunk.getTargets().forEach { dataManager.getKotlinCache(it).clean() } return CHUNK_REBUILD_REQUIRED } @@ -160,6 +158,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] + if (compilationErrors) { + LOG.info("Compiled with errors") + } + else { + LOG.info("Compiled successfully") + } + val generatedFiles = getGeneratedFiles(chunk, outputItemCollector) registerOutputItems(outputConsumer, generatedFiles) @@ -218,6 +223,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector: MessageCollectorAdapter, project: JpsProject ): OutputItemsCollectorImpl? { if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { + LOG.debug("Compiling to JS ${filesToCompile.values().size()} files in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) return compileToJs(chunk, commonArguments, environment, messageCollector, project) } @@ -261,6 +267,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR { className -> className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.cache.") || className == "org.jetbrains.kotlin.config.Services" + || className.startsWith("org.apache.log4j.") // For logging from compiler }, compilerServices ) @@ -468,17 +475,19 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context) - var haveRemovedFiles = false + var totalRemovedFiles = 0 for (target in chunk.getTargets()) { - if (!KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target).isEmpty()) { + val removedFilesInTarget = KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target) + if (!removedFilesInTarget.isEmpty()) { if (processedTargetsWithRemoved.add(target)) { - haveRemovedFiles = true + totalRemovedFiles += removedFilesInTarget.size() } } } - val moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile, haveRemovedFiles) + val moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile, totalRemovedFiles != 0) if (moduleFile == null) { + KotlinBuilder.LOG.debug("Not compiling, because no files affected: " + filesToCompile.keySet().map { it.getPresentableName() }.join()) // No Kotlin sources found return null } @@ -487,6 +496,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) + KotlinBuilder.LOG.debug("Compiling to JVM ${filesToCompile.values().size()} files" + + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") + + " in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) + runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) moduleFile.delete() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 69c1f9db283..867eaed4866 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -16,40 +16,36 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.* -import java.io.File -import com.intellij.util.io.PersistentHashMap -import java.io.DataOutput -import com.intellij.util.io.IOUtil -import java.io.DataInput -import org.jetbrains.kotlin.name.FqName -import com.intellij.util.io.DataExternalizer -import org.jetbrains.kotlin.serialization.jvm.BitEncoding -import java.util.Arrays -import org.jetbrains.org.objectweb.asm.* -import com.intellij.util.io.EnumeratorStringDescriptor -import org.jetbrains.kotlin.load.java.JvmAnnotationNames -import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache -import java.util.HashMap -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils -import java.security.MessageDigest -import org.jetbrains.jps.incremental.storage.StorageOwner -import org.jetbrains.jps.builders.storage.StorageProvider -import java.io.IOException -import org.jetbrains.kotlin.load.java.JvmAbi -import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind -import org.jetbrains.jps.incremental.storage.BuildDataManager +import com.intellij.util.io.* +import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths -import com.intellij.util.io.BooleanDataDescriptor -import java.util.ArrayList -import org.jetbrains.annotations.TestOnly +import org.jetbrains.jps.builders.storage.StorageProvider +import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor +import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.jps.build.KotlinBuilder +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK +import org.jetbrains.kotlin.load.java.JvmAbi +import org.jetbrains.kotlin.load.java.JvmAnnotationNames +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.utils.Printer -import java.io.DataInputStream +import org.jetbrains.org.objectweb.asm.* +import java.io.* +import java.security.MessageDigest +import java.util.ArrayList +import java.util.Arrays +import java.util.HashMap val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -77,7 +73,11 @@ class CacheFormatVersion(targetDataRoot: File) { val versionNumber = file.readText().toInt() val expectedVersionNumber = actualCacheFormatVersion() - return versionNumber != expectedVersionNumber + if (versionNumber != expectedVersionNumber) { + KotlinBuilder.LOG.info("Incompatible incremental cache version, expected $expectedVersionNumber, actual $versionNumber") + return true + } + return false } fun saveIfNeeded() { @@ -147,7 +147,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen dirtyOutputClassesMap.notDirty(className.getInternalName()) sourceFiles.forEach { sourceToClassesMap.addSourceToClass(it, className) } - return when { + val decision = when { header.isCompatiblePackageFacadeKind() -> getRecompilationDecision( protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)), @@ -179,6 +179,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen DO_NOTHING } } + if (decision != DO_NOTHING) { + KotlinBuilder.LOG.debug("$decision because $className is changed") + } + return decision } public fun clearCacheForRemovedClasses(): RecompilationDecision { @@ -191,6 +195,9 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen constantsChanged = internalClassName in constantsMap, inlinesChanged = internalClassName in inlineFunctionsMap ) + if (newDecision != DO_NOTHING) { + KotlinBuilder.LOG.debug("$newDecision because $internalClassName is removed") + } recompilationDecision = recompilationDecision.merge(newDecision) @@ -204,7 +211,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } public override fun getObsoletePackageParts(): Collection { - return dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } + val obsoletePackageParts = + dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } + KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") + return obsoletePackageParts } public override fun getPackageData(fqName: String): ByteArray? { From 1bf9e7abcc4ce03a249900fb20aa35bffa2b8549 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 24 Jun 2015 16:17:34 +0300 Subject: [PATCH 0367/1557] Made it possible to easily enable debug logging in incremental compilation tests. Original commit: 041df7fd15ea4625c71fb9989b9b3896fe03aa01 --- .../jps/build/AbstractIncrementalJpsTest.kt | 77 ++++++++++++------- 1 file changed, 50 insertions(+), 27 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index fc3b4992bf3..bc116030047 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -16,40 +16,45 @@ package org.jetbrains.kotlin.jps.build -import org.jetbrains.jps.builders.JpsBuildTestCase -import kotlin.properties.Delegates +import com.intellij.openapi.diagnostic import com.intellij.openapi.util.io.FileUtil -import java.io.File -import org.jetbrains.kotlin.test.JetTestUtils +import com.intellij.openapi.util.io.FileUtilRt +import com.intellij.testFramework.TestLoggerFactory +import com.intellij.testFramework.UsefulTestCase +import junit.framework.TestCase +import org.apache.log4j.ConsoleAppender +import org.apache.log4j.Level +import org.apache.log4j.Logger +import org.apache.log4j.PatternLayout +import org.jetbrains.jps.api.CanceledStatus +import org.jetbrains.jps.builders.BuildResult import org.jetbrains.jps.builders.CompileScopeTestBuilder +import org.jetbrains.jps.builders.JpsBuildTestCase +import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase +import org.jetbrains.jps.builders.java.dependencyView.Callbacks import org.jetbrains.jps.builders.logging.BuildLoggingManager +import org.jetbrains.jps.cmdline.ProjectDescriptor +import org.jetbrains.jps.incremental.BuilderRegistry +import org.jetbrains.jps.incremental.IncProjectBuilder +import org.jetbrains.jps.incremental.messages.BuildMessage +import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil -import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.kotlin.config.IncrementalCompilation -import java.util.ArrayList -import org.jetbrains.jps.builders.impl.BuildDataPathsImpl -import kotlin.test.fail -import java.util.HashMap -import org.jetbrains.kotlin.utils.keysToMap -import org.jetbrains.jps.incremental.messages.BuildMessage -import kotlin.test.assertFalse -import kotlin.test.assertEquals -import org.jetbrains.jps.model.JpsModuleRootModificationUtil -import com.intellij.openapi.util.io.FileUtilRt -import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.jps.cmdline.ProjectDescriptor -import junit.framework.TestCase -import org.jetbrains.kotlin.jps.incremental.getKotlinCache -import java.io.ByteArrayOutputStream -import java.io.PrintStream -import org.jetbrains.jps.incremental.IncProjectBuilder -import org.jetbrains.jps.builders.BuildResult -import org.jetbrains.jps.incremental.BuilderRegistry -import org.jetbrains.jps.api.CanceledStatus -import org.jetbrains.jps.builders.java.dependencyView.Callbacks import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories +import org.jetbrains.kotlin.jps.incremental.getKotlinCache +import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.utils.Printer +import org.jetbrains.kotlin.utils.keysToMap +import java.io.ByteArrayOutputStream +import java.io.File +import java.io.PrintStream +import java.util.ArrayList +import java.util.HashMap +import kotlin.properties.Delegates +import kotlin.test.assertEquals +import kotlin.test.assertFalse +import kotlin.test.fail public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { companion object { @@ -57,15 +62,33 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { // change to "/tmp" or anything when default is too long (for easier debugging) val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) + + val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" } private var testDataDir: File by Delegates.notNull() var workDir: File by Delegates.notNull() + private fun enableDebugLogging() { + diagnostic.Logger.setFactory(javaClass()) + TestLoggerFactory.dumpLogToStdout("") + TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org") + + val console = ConsoleAppender() + console.setLayout(PatternLayout("%d [%p|%c|%C{1}] %m%n")); + console.setThreshold(Level.ALL) + console.activateOptions() + Logger.getRootLogger().addAppender(console) + } + override fun setUp() { super.setUp() System.setProperty("kotlin.jps.tests", "true") + + if (DEBUG_LOGGING_ENABLED) { + enableDebugLogging() + } } override fun tearDown() { From e29047d7198084e2ca5bf16c3d60eab4370f8f0d Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 25 Jun 2015 21:30:51 +0300 Subject: [PATCH 0368/1557] add support for cancel compilation from IDE #KT-8158 Fixed Original commit: c462d23a0e2f07b11850d8fe80f2edfcf6d7fc8d --- .../kotlin/jps/build/KotlinBuilder.kt | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 4c15866bb05..46b432d6321 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -48,6 +48,8 @@ import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.context.CompilationCanceledStatus +import org.jetbrains.kotlin.context.CompilationCanceledException import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING @@ -59,7 +61,10 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.utils.* +import org.jetbrains.kotlin.utils.LibraryUtils +import org.jetbrains.kotlin.utils.PathUtil +import org.jetbrains.kotlin.utils.keysToMap +import org.jetbrains.kotlin.utils.sure import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.util.ArrayList @@ -94,7 +99,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val messageCollector = MessageCollectorAdapter(context) try { return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) - } catch (e: Throwable) { + } + catch (e: StopBuildException) { + throw e + } + catch (e: Throwable) { messageCollector.report( CompilerMessageSeverity.EXCEPTION, OutputMessageUtil.renderException(e), @@ -133,7 +142,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getKotlinCache(it) } - val environment = createCompileEnvironment(incrementalCaches) + val environment = createCompileEnvironment(incrementalCaches, context) if (!environment.success()) { environment.reportErrorsTo(messageCollector) return ABORT @@ -169,6 +178,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR registerOutputItems(outputConsumer, generatedFiles) + context.checkCanceled() + val recompilationDecision: IncrementalCacheImpl.RecompilationDecision if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { recompilationDecision = DO_NOTHING @@ -237,7 +248,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val representativeTarget = chunk.representativeTarget() - fun concatenate(strings: Array?, cp: List) = array(*(strings ?: array()), *cp.copyToArray()) + fun concatenate(strings: Array?, cp: List) = arrayOf(*(strings ?: arrayOf()), *cp.toTypedArray()) for (argumentProvider in ServiceLoader.load(javaClass())) { // appending to pluginOptions @@ -257,9 +268,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) } - private fun createCompileEnvironment(incrementalCaches: Map): CompilerEnvironment { + private fun createCompileEnvironment(incrementalCaches: Map, context: CompileContext): CompilerEnvironment { val compilerServices = Services.Builder() .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) + .register(javaClass(), object: CompilationCanceledStatus { + override fun checkCanceled(): Unit = if (context.getCancelStatus().isCanceled()) throw CompilationCanceledException() + }) .build() return CompilerEnvironment.getEnvironmentFor( @@ -268,6 +282,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.cache.") || className == "org.jetbrains.kotlin.config.Services" || className.startsWith("org.apache.log4j.") // For logging from compiler + || className == "org.jetbrains.kotlin.context.CompilationCanceledStatus" + || className == "org.jetbrains.kotlin.context.CompilationCanceledException" }, compilerServices ) @@ -556,7 +572,7 @@ private fun getAllCompiledFilesContainer(context: CompileContext): MutableSet>("_processed_targets_with_removed_files_") @@ -566,7 +582,7 @@ private fun getProcessedTargetsWithRemovedFilesContainer(context: CompileContext set = HashSet() PROCESSED_TARGETS_WITH_REMOVED_FILES.set(context, set) } - return set!! + return set } private fun hasKotlinDirtyOrRemovedFiles( From 85230d7071bc1e862d186c682ff58f5e5b92bce1 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 25 Jun 2015 17:35:40 +0300 Subject: [PATCH 0369/1557] Compiler&plugin deprecations cleanup: *array -> *arrayOf, copyToArray -> toTypedArray. Original commit: 2c31a1a3458cdadbbbd4a4a2074cea40dc2f5e8d --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 46b432d6321..84a21e24908 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -248,7 +248,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val representativeTarget = chunk.representativeTarget() - fun concatenate(strings: Array?, cp: List) = arrayOf(*(strings ?: arrayOf()), *cp.toTypedArray()) + fun concatenate(strings: Array?, cp: List) = arrayOf(*(strings ?: emptyArray()), *cp.toTypedArray()) for (argumentProvider in ServiceLoader.load(javaClass())) { // appending to pluginOptions diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index bc116030047..05d889ce991 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -348,7 +348,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val jdk = addJdk("my jdk") val moduleDependencies = readModuleDependencies() if (moduleDependencies == null) { - addModule("module", array(getAbsolutePath("src")), null, null, jdk) + addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk) FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) @@ -356,7 +356,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { } else { val nameToModule = moduleDependencies.keySet() - .keysToMap { addModule(it, array(getAbsolutePath(it + "/src")), null, null, jdk)!! } + .keysToMap { addModule(it, arrayOf(getAbsolutePath(it + "/src")), null, null, jdk)!! } for ((moduleName, dependencies) in moduleDependencies) { val module = nameToModule[moduleName]!! From b2222119e03ae665e5875674ce4e74cb1f5b9cb9 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 25 Jun 2015 18:49:25 +0300 Subject: [PATCH 0370/1557] Compiler&plugin deprecations cleanup: length, size, indices, tail and other collection operations. Original commit: 32144257eca48a6d90c855e0ef8fe7f2fe4ea6f7 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 867eaed4866..7e04e7c4052 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -419,7 +419,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val size = `in`.readInt() val map = HashMap(size) - for (i in size.indices) { + repeat(size) { val name = IOUtil.readString(`in`)!! val kind = Kind.values()[`in`.readByte().toInt()] @@ -531,7 +531,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val size = `in`.readInt() val map = HashMap(size) - for (i in size.indices) { + repeat(size) { val name = IOUtil.readString(`in`)!! val value = `in`.readLong() From 89086cc771424a0b50f9562e093532d427eade0a Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 25 Jun 2015 23:46:18 +0300 Subject: [PATCH 0371/1557] Compiler&plugin deprecations cleanup: string operations. Original commit: 6d4e48ab9a6af97d6b0545fdcd75731756799180 --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 05d889ce991..6ae59235b9c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -170,17 +170,17 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val fileName = file.getName() if (fileName.endsWith(newSuffix)) { - modifications.add(ModifyContent(getDirPrefix(fileName) + "/" + fileName.trimTrailing(newSuffix), file)) + modifications.add(ModifyContent(getDirPrefix(fileName) + "/" + fileName.removeSuffix(newSuffix), file)) } if (fileName.endsWith(deleteSuffix)) { - modifications.add(DeleteFile(getDirPrefix(fileName) + "/" + fileName.trimTrailing(deleteSuffix))) + modifications.add(DeleteFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(deleteSuffix))) } } return modifications } - val haveFilesWithoutNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)$") }?.isNotEmpty() ?: false - val haveFilesWithNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)\\.\\d+$") }?.isNotEmpty() ?: false + val haveFilesWithoutNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false if (haveFilesWithoutNumbers && haveFilesWithNumbers) { fail("Bad test data format: files ending with both unnumbered and numbered \".new\"/\".delete\" were found") @@ -388,7 +388,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { override fun isEnabled(): Boolean = true override fun logLine(message: String?) { - logBuf.append(JetTestUtils.replaceHashWithStar(message!!.trimLeading(rootPath + "/"))).append('\n') + logBuf.append(JetTestUtils.replaceHashWithStar(message!!.removePrefix(rootPath + "/"))).append('\n') } } From dbe85daeac4be7012e047494a984d22dcec4450f Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 30 Jun 2015 17:48:34 +0300 Subject: [PATCH 0372/1557] Move CompilationCanceledStatus and related utils to "util" module It should not be in "frontend" since "jps bare plugin" artifact does not include "frontend" module Original commit: 15a4782a0c4cdc22d66fd150ad1a2eaada153dce --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 84a21e24908..5c120c79331 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -48,8 +48,8 @@ import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services -import org.jetbrains.kotlin.context.CompilationCanceledStatus -import org.jetbrains.kotlin.context.CompilationCanceledException +import org.jetbrains.kotlin.progress.CompilationCanceledStatus +import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING @@ -282,8 +282,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.cache.") || className == "org.jetbrains.kotlin.config.Services" || className.startsWith("org.apache.log4j.") // For logging from compiler - || className == "org.jetbrains.kotlin.context.CompilationCanceledStatus" - || className == "org.jetbrains.kotlin.context.CompilationCanceledException" + || className == "org.jetbrains.kotlin.progress.CompilationCanceledStatus" + || className == "org.jetbrains.kotlin.progress.CompilationCanceledException" }, compilerServices ) From af93b58c8658e0d5163076eeb042d86d7947f056 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 3 Jul 2015 13:54:52 +0300 Subject: [PATCH 0373/1557] convert KotlinJpsBuildTest to Kotlin: step 1: convert body Original commit: e09411f45f62f4dd423613058935e4b192458c74 --- .../kotlin/jps/build/KotlinJpsBuildTest.java | 965 ++++++++---------- 1 file changed, 440 insertions(+), 525 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java index b2e15a5f3bc..181a5ec8f34 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java @@ -14,662 +14,577 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.build; +package org.jetbrains.kotlin.jps.build -import com.google.common.collect.Lists; -import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.io.FileUtilRt; -import com.intellij.testFramework.LightVirtualFile; -import com.intellij.util.ArrayUtil; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.io.ZipUtil; -import kotlin.KotlinPackage; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.builders.BuildResult; -import org.jetbrains.jps.builders.impl.BuildDataPathsImpl; -import org.jetbrains.jps.model.java.JpsJavaDependencyScope; -import org.jetbrains.jps.model.java.JpsJavaExtensionService; -import org.jetbrains.jps.model.module.JpsModule; -import org.jetbrains.jps.util.JpsPathUtil; -import org.jetbrains.kotlin.codegen.AsmUtil; -import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; -import org.jetbrains.kotlin.name.FqName; -import org.jetbrains.kotlin.test.MockLibraryUtil; -import org.jetbrains.kotlin.utils.PathUtil; -import org.jetbrains.org.objectweb.asm.ClassReader; -import org.jetbrains.org.objectweb.asm.ClassVisitor; -import org.jetbrains.org.objectweb.asm.MethodVisitor; -import org.jetbrains.org.objectweb.asm.Opcodes; +import com.google.common.collect.Lists +import com.intellij.openapi.util.Condition +import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.io.FileUtilRt +import com.intellij.testFramework.LightVirtualFile +import com.intellij.util.ArrayUtil +import com.intellij.util.containers.ContainerUtil +import com.intellij.util.io.ZipUtil +import kotlin.KotlinPackage +import org.jetbrains.jps.builders.BuildResult +import org.jetbrains.jps.builders.impl.BuildDataPathsImpl +import org.jetbrains.jps.model.java.JpsJavaDependencyScope +import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.jps.util.JpsPathUtil +import org.jetbrains.kotlin.codegen.AsmUtil +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.utils.PathUtil +import org.jetbrains.org.objectweb.asm.ClassReader +import org.jetbrains.org.objectweb.asm.ClassVisitor +import org.jetbrains.org.objectweb.asm.MethodVisitor +import org.jetbrains.org.objectweb.asm.Opcodes -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.util.*; -import java.util.regex.Pattern; -import java.util.zip.ZipOutputStream; +import java.io.File +import java.io.FileNotFoundException +import java.io.FileOutputStream +import java.io.IOException +import java.util.* +import java.util.regex.Pattern +import java.util.zip.ZipOutputStream -import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; +import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName -public class KotlinJpsBuildTest extends AbstractKotlinJpsBuildTestCase { - private static final String PROJECT_NAME = "kotlinProject"; - private static final String ADDITIONAL_MODULE_NAME = "module2"; - private static final String JDK_NAME = "IDEA_JDK"; +public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { - private static final String[] EXCLUDE_FILES = { "Excluded.class", "YetAnotherExcluded.class" }; - private static final String[] NOTHING = {}; - private static final String KOTLIN_JS_LIBRARY = "jslib-example"; - private static final String PATH_TO_KOTLIN_JS_LIBRARY = TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY; - private static final String KOTLIN_JS_LIBRARY_JAR = KOTLIN_JS_LIBRARY + ".jar"; - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf( - PROJECT_NAME + ".js", - PROJECT_NAME + ".meta.js", - "lib/kotlin.js", - "lib/stdlib.meta.js" - ); - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = KotlinPackage.hashSetOf( - ADDITIONAL_MODULE_NAME + ".js", - ADDITIONAL_MODULE_NAME + ".meta.js", - "lib/kotlin.js", - "lib/stdlib.meta.js" - ); - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf( - PROJECT_NAME + ".js", - PROJECT_NAME + ".meta.js" - ); - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = - KotlinPackage.hashSetOf( - PROJECT_NAME + ".js", - PROJECT_NAME + ".meta.js", - "lib/kotlin.js", - "lib/stdlib.meta.js", - "lib/jslib-example.js", - "lib/file0.js", - "lib/dir/file1.js", - "lib/META-INF-ex/file2.js", - "lib/res0.js", - "lib/resdir/res1.js"); - private static final Set EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = - KotlinPackage.hashSetOf( - PROJECT_NAME + ".js", - PROJECT_NAME + ".meta.js", - "custom/kotlin.js", - "custom/stdlib.meta.js", - "custom/jslib-example.js", - "custom/file0.js", - "custom/dir/file1.js", - "custom/META-INF-ex/file2.js", - "custom/res0.js", - "custom/resdir/res1.js"); - - @Override - public void setUp() throws Exception { - super.setUp(); - File sourceFilesRoot = new File(TEST_DATA_PATH + "general/" + getTestName(false)); - workDir = copyTestDataToTmpDir(sourceFilesRoot); - getOrCreateProjectDir(); + throws(Exception::class) + override fun setUp() { + super.setUp() + val sourceFilesRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) + workDir = AbstractKotlinJpsBuildTestCase.copyTestDataToTmpDir(sourceFilesRoot) + getOrCreateProjectDir() } - @Override - public void tearDown() throws Exception { - FileUtil.delete(workDir); - super.tearDown(); + throws(Exception::class) + override fun tearDown() { + FileUtil.delete(workDir) + super.tearDown() } - @Override - protected File doGetProjectDir() throws IOException { - return workDir; + throws(IOException::class) + override fun doGetProjectDir(): File { + return workDir } - private void initProject() { - addJdk(JDK_NAME); - loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr"); + private fun initProject() { + addJdk(JDK_NAME) + loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr") } - public void doTest() { - initProject(); - makeAll().assertSuccessful(); + public fun doTest() { + initProject() + makeAll().assertSuccessful() } - public void doTestWithRuntime() { - initProject(); - addKotlinRuntimeDependency(); - makeAll().assertSuccessful(); + public fun doTestWithRuntime() { + initProject() + addKotlinRuntimeDependency() + makeAll().assertSuccessful() } - public void doTestWithKotlinJavaScriptLibrary() { - initProject(); - addKotlinJavaScriptStdlibDependency(); - createKotlinJavaScriptLibraryArchive(); - addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, new File(workDir, KOTLIN_JS_LIBRARY_JAR)); - makeAll().assertSuccessful(); + public fun doTestWithKotlinJavaScriptLibrary() { + initProject() + addKotlinJavaScriptStdlibDependency() + createKotlinJavaScriptLibraryArchive() + addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + makeAll().assertSuccessful() } - public void testKotlinProject() { - doTest(); + public fun testKotlinProject() { + doTest() - checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")); + checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")) } - public void testKotlinJavaScriptProject() { - initProject(); - addKotlinJavaScriptStdlibDependency(); - makeAll().assertSuccessful(); + public fun testKotlinJavaScriptProject() { + initProject() + addKotlinJavaScriptStdlibDependency() + makeAll().assertSuccessful() - assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)); - checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); + TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public void testKotlinJavaScriptProjectWithTwoModules() { - initProject(); - addKotlinJavaScriptStdlibDependency(); - makeAll().assertSuccessful(); + public fun testKotlinJavaScriptProjectWithTwoModules() { + initProject() + addKotlinJavaScriptStdlibDependency() + makeAll().assertSuccessful() - assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)); - assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY, contentOfOutputDir(ADDITIONAL_MODULE_NAME)); + TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) + TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY, contentOfOutputDir(ADDITIONAL_MODULE_NAME)) - checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); - checkWhen(touch("module2/src/module2.kt"), null, k2jsOutput(ADDITIONAL_MODULE_NAME)); - checkWhen(new Action[]{ touch("src/test1.kt"), touch("module2/src/module2.kt")}, null, k2jsOutput(PROJECT_NAME, - ADDITIONAL_MODULE_NAME)); + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) + checkWhen(touch("module2/src/module2.kt"), null, k2jsOutput(ADDITIONAL_MODULE_NAME)) + checkWhen(arrayOf(touch("src/test1.kt"), touch("module2/src/module2.kt")), null, k2jsOutput(PROJECT_NAME, ADDITIONAL_MODULE_NAME)) } - public void testKotlinJavaScriptProjectWithDirectoryAsStdlib() { - initProject(); - File jslibJar = PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath(); - File jslibDir = new File(workDir, "KotlinJavaScript"); + public fun testKotlinJavaScriptProjectWithDirectoryAsStdlib() { + initProject() + val jslibJar = PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath() + val jslibDir = File(workDir, "KotlinJavaScript") try { - ZipUtil.extract(jslibJar, jslibDir, null); + ZipUtil.extract(jslibJar, jslibDir, null) } - catch (IOException ex) { - throw new IllegalStateException(ex.getMessage()); - } - addKotlinJavaScriptDependency("KotlinJavaScript", jslibDir); - makeAll().assertSuccessful(); - - assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)); - checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); - } - - public void testKotlinJavaScriptProjectWithDirectoryAsLibrary() { - initProject(); - addKotlinJavaScriptStdlibDependency(); - addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, new File(workDir, KOTLIN_JS_LIBRARY)); - makeAll().assertSuccessful(); - - assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)); - checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); - } - - public void testKotlinJavaScriptProjectWithLibrary() { - doTestWithKotlinJavaScriptLibrary(); - - assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)); - checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); - } - - public void testKotlinJavaScriptProjectWithLibraryCustomOutputDir() { - doTestWithKotlinJavaScriptLibrary(); - - assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR, contentOfOutputDir(PROJECT_NAME)); - checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); - } - - public void testKotlinJavaScriptProjectWithLibraryNoCopy() { - doTestWithKotlinJavaScriptLibrary(); - - assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY, contentOfOutputDir(PROJECT_NAME)); - checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)); - } - - public void testKotlinJavaScriptProjectWithLibraryAndErrors() { - initProject(); - addKotlinJavaScriptStdlibDependency(); - createKotlinJavaScriptLibraryArchive(); - addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, new File(workDir, KOTLIN_JS_LIBRARY_JAR)); - makeAll().assertFailed(); - - assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)); - } - - public void testExcludeFolderInSourceRoot() { - doTest(); - - JpsModule module = myProject.getModules().get(0); - assertFilesExistInOutput(module, "Foo.class"); - assertFilesNotExistInOutput(module, EXCLUDE_FILES); - - checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); - } - - public void testExcludeModuleFolderInSourceRootOfAnotherModule() { - doTest(); - - for (JpsModule module : myProject.getModules()) { - assertFilesExistInOutput(module, "Foo.class"); + catch (ex: IOException) { + throw IllegalStateException(ex.getMessage()) } - checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); - checkWhen(touch("src/module2/src/foo.kt"), null, new String[] {klass("module2", "Foo")}); + addKotlinJavaScriptDependency("KotlinJavaScript", jslibDir) + makeAll().assertSuccessful() + + TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public void testExcludeFileUsingCompilerSettings() { - doTest(); + public fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() { + initProject() + addKotlinJavaScriptStdlibDependency() + addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY)) + makeAll().assertSuccessful() - JpsModule module = myProject.getModules().get(0); - assertFilesExistInOutput(module, "Foo.class", "Bar.class"); - assertFilesNotExistInOutput(module, EXCLUDE_FILES); - - checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); - checkWhen(touch("src/Excluded.kt"), null, NOTHING ); - checkWhen(touch("src/dir/YetAnotherExcluded.kt"), null, NOTHING); + TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public void testExcludeFolderNonRecursivelyUsingCompilerSettings() { - doTest(); + public fun testKotlinJavaScriptProjectWithLibrary() { + doTestWithKotlinJavaScriptLibrary() - JpsModule module = myProject.getModules().get(0); - assertFilesExistInOutput(module, "Foo.class", "Bar.class"); - assertFilesNotExistInOutput(module, EXCLUDE_FILES); - - checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); - checkWhen(touch("src/dir/subdir/bar.kt"), null, new String[] { klass("kotlinProject", "Bar")} ); - - checkWhen(touch("src/dir/Excluded.kt"), null, NOTHING ); - checkWhen(touch("src/dir/subdir/YetAnotherExcluded.kt"), null, NOTHING); + TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public void testExcludeFolderRecursivelyUsingCompilerSettings() { - doTest(); + public fun testKotlinJavaScriptProjectWithLibraryCustomOutputDir() { + doTestWithKotlinJavaScriptLibrary() - JpsModule module = myProject.getModules().get(0); - assertFilesExistInOutput(module, "Foo.class", "Bar.class"); - assertFilesNotExistInOutput(module, EXCLUDE_FILES); - - checkWhen(touch("src/foo.kt"), null, new String[] {klass("kotlinProject", "Foo")}); - - checkWhen(touch("src/exclude/Excluded.kt"), null, NOTHING); - checkWhen(touch("src/exclude/YetAnotherExcluded.kt"), null, NOTHING); - checkWhen(touch("src/exclude/subdir/Excluded.kt"), null, NOTHING); - checkWhen(touch("src/exclude/subdir/YetAnotherExcluded.kt"), null, NOTHING); + TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR, contentOfOutputDir(PROJECT_NAME)) + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public void testManyFiles() { - doTest(); + public fun testKotlinJavaScriptProjectWithLibraryNoCopy() { + doTestWithKotlinJavaScriptLibrary() - JpsModule module = myProject.getModules().get(0); - assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class"); - - checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); - checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); - checkWhen(touch("src/Bar.kt"), - new String[] {"src/Bar.kt"}, - new String[] {klass("kotlinProject", "foo.Bar")}); - - checkWhen(del("src/main.kt"), - new String[] {"src/Bar.kt", "src/boo.kt"}, - mergeArrays( - packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), - packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), - new String[]{ klass("kotlinProject", "foo.Bar") } - )); - assertFilesExistInOutput(module, "boo/BooPackage.class", "foo/Bar.class"); - assertFilesNotExistInOutput(module, "foo/FooPackage.class"); - - checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); - checkWhen(touch("src/Bar.kt"), null, new String[] {klass("kotlinProject", "foo.Bar")}); + TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY, contentOfOutputDir(PROJECT_NAME)) + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public void testManyFilesForPackage() { - doTest(); + public fun testKotlinJavaScriptProjectWithLibraryAndErrors() { + initProject() + addKotlinJavaScriptStdlibDependency() + createKotlinJavaScriptLibraryArchive() + addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + makeAll().assertFailed() - JpsModule module = myProject.getModules().get(0); - assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class"); - - checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")); - checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); - checkWhen(touch("src/Bar.kt"), - new String[] {"src/Bar.kt"}, - new String[] { - klass("kotlinProject", "foo.Bar"), - klass("kotlinProject", "foo.FooPackage"), - packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage")}); - - checkWhen(del("src/main.kt"), - new String[] {"src/Bar.kt", "src/boo.kt"}, - mergeArrays( - packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), - packageClasses("kotlinProject", "src/Bar.kt", "foo.FooPackage"), - packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), - new String[] {klass("kotlinProject", "foo.Bar")} - )); - assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class"); - - checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")); - checkWhen(touch("src/Bar.kt"), null, - new String[] { - klass("kotlinProject", "foo.Bar"), - klass("kotlinProject", "foo.FooPackage"), - packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage") - }); + TestCase.assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) } - public void testKotlinProjectTwoFilesInOnePackage() { - doTest(); + public fun testExcludeFolderInSourceRoot() { + doTest() - checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")); - checkWhen(touch("src/test2.kt"), null, packageClasses("kotlinProject", "src/test2.kt", "_DefaultPackage")); + val module = myProject.getModules().get(0) + assertFilesExistInOutput(module, "Foo.class") + assertFilesNotExistInOutput(module, *EXCLUDE_FILES) - checkWhen(new Action[]{ del("src/test1.kt"), del("src/test2.kt") }, NOTHING, - new String[] { - packagePartClass("kotlinProject", "src/test1.kt", "_DefaultPackage"), - packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"), - klass("kotlinProject", "_DefaultPackage") - }); - - assertFilesNotExistInOutput(myProject.getModules().get(0), "_DefaultPackage.class"); + checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) } - public void testKotlinJavaProject() { - doTestWithRuntime(); + public fun testExcludeModuleFolderInSourceRootOfAnotherModule() { + doTest() + + for (module in myProject.getModules()) { + assertFilesExistInOutput(module, "Foo.class") + } + + checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen(touch("src/module2/src/foo.kt"), null, arrayOf(klass("module2", "Foo"))) } - public void testJKJProject() { - doTestWithRuntime(); + public fun testExcludeFileUsingCompilerSettings() { + doTest() + + val module = myProject.getModules().get(0) + assertFilesExistInOutput(module, "Foo.class", "Bar.class") + assertFilesNotExistInOutput(module, *EXCLUDE_FILES) + + checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen(touch("src/Excluded.kt"), null, NOTHING) + checkWhen(touch("src/dir/YetAnotherExcluded.kt"), null, NOTHING) } - public void testKJKProject() { - doTestWithRuntime(); + public fun testExcludeFolderNonRecursivelyUsingCompilerSettings() { + doTest() + + val module = myProject.getModules().get(0) + assertFilesExistInOutput(module, "Foo.class", "Bar.class") + assertFilesNotExistInOutput(module, *EXCLUDE_FILES) + + checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(klass("kotlinProject", "Bar"))) + + checkWhen(touch("src/dir/Excluded.kt"), null, NOTHING) + checkWhen(touch("src/dir/subdir/YetAnotherExcluded.kt"), null, NOTHING) } - public void testKJCircularProject() { - doTestWithRuntime(); + public fun testExcludeFolderRecursivelyUsingCompilerSettings() { + doTest() + + val module = myProject.getModules().get(0) + assertFilesExistInOutput(module, "Foo.class", "Bar.class") + assertFilesNotExistInOutput(module, *EXCLUDE_FILES) + + checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) + + checkWhen(touch("src/exclude/Excluded.kt"), null, NOTHING) + checkWhen(touch("src/exclude/YetAnotherExcluded.kt"), null, NOTHING) + checkWhen(touch("src/exclude/subdir/Excluded.kt"), null, NOTHING) + checkWhen(touch("src/exclude/subdir/YetAnotherExcluded.kt"), null, NOTHING) } - public void testJKJInheritanceProject() { - doTestWithRuntime(); + public fun testManyFiles() { + doTest() + + val module = myProject.getModules().get(0) + assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class") + + checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")) + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) + checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar"))) + + checkWhen(del("src/main.kt"), arrayOf("src/Bar.kt", "src/boo.kt"), mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), arrayOf(klass("kotlinProject", "foo.Bar")))) + assertFilesExistInOutput(module, "boo/BooPackage.class", "foo/Bar.class") + assertFilesNotExistInOutput(module, "foo/FooPackage.class") + + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) + checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar"))) } - public void testKJKInheritanceProject() { - doTestWithRuntime(); + public fun testManyFilesForPackage() { + doTest() + + val module = myProject.getModules().get(0) + assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class") + + checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")) + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) + checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage"))) + + checkWhen(del("src/main.kt"), arrayOf("src/Bar.kt", "src/boo.kt"), mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), packageClasses("kotlinProject", "src/Bar.kt", "foo.FooPackage"), packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), arrayOf(klass("kotlinProject", "foo.Bar")))) + assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class") + + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) + checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage"))) } - public void testCircularDependenciesNoKotlinFiles() { - doTest(); + public fun testKotlinProjectTwoFilesInOnePackage() { + doTest() + + checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")) + checkWhen(touch("src/test2.kt"), null, packageClasses("kotlinProject", "src/test2.kt", "_DefaultPackage")) + + checkWhen(arrayOf(del("src/test1.kt"), del("src/test2.kt")), NOTHING, arrayOf(packagePartClass("kotlinProject", "src/test1.kt", "_DefaultPackage"), packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"), klass("kotlinProject", "_DefaultPackage"))) + + assertFilesNotExistInOutput(myProject.getModules().get(0), "_DefaultPackage.class") } - public void testCircularDependenciesDifferentPackages() { - initProject(); - BuildResult result = makeAll(); + public fun testKotlinJavaProject() { + doTestWithRuntime() + } + + public fun testJKJProject() { + doTestWithRuntime() + } + + public fun testKJKProject() { + doTestWithRuntime() + } + + public fun testKJCircularProject() { + doTestWithRuntime() + } + + public fun testJKJInheritanceProject() { + doTestWithRuntime() + } + + public fun testKJKInheritanceProject() { + doTestWithRuntime() + } + + public fun testCircularDependenciesNoKotlinFiles() { + doTest() + } + + public fun testCircularDependenciesDifferentPackages() { + initProject() + val result = makeAll() // Check that outputs are located properly - assertFilesExistInOutput(findModule("module2"), "kt1/Kt1Package.class"); - assertFilesExistInOutput(findModule("kotlinProject"), "kt2/Kt2Package.class"); + assertFilesExistInOutput(findModule("module2"), "kt1/Kt1Package.class") + assertFilesExistInOutput(findModule("kotlinProject"), "kt2/Kt2Package.class") - result.assertSuccessful(); + result.assertSuccessful() - checkWhen(touch("src/kt2.kt"), null, packageClasses("kotlinProject", "src/kt2.kt", "kt2.Kt2Package")); - checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Package")); + checkWhen(touch("src/kt2.kt"), null, packageClasses("kotlinProject", "src/kt2.kt", "kt2.Kt2Package")) + checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Package")) } - public void testCircularDependenciesSamePackage() throws IOException { - initProject(); - BuildResult result = makeAll(); - result.assertSuccessful(); + throws(IOException::class) + public fun testCircularDependenciesSamePackage() { + initProject() + val result = makeAll() + result.assertSuccessful() // Check that outputs are located properly - File facadeWithA = findFileInOutputDir(findModule("module1"), "test/TestPackage.class"); - File facadeWithB = findFileInOutputDir(findModule("module2"), "test/TestPackage.class"); - assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "getA"); - assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "getB", "setB"); + val facadeWithA = findFileInOutputDir(findModule("module1"), "test/TestPackage.class") + val facadeWithB = findFileInOutputDir(findModule("module2"), "test/TestPackage.class") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "getA") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "getB", "setB") - checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage")); - checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")); + checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage")) + checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) } - public void testCircularDependencyWithReferenceToOldVersionLib() throws IOException { - initProject(); + throws(IOException::class) + public fun testCircularDependencyWithReferenceToOldVersionLib() { + initProject() - File libraryJar = MockLibraryUtil.compileLibraryToJar( - workDir.getAbsolutePath() + File.separator + "oldModuleLib/src", "module-lib", false); + val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.getAbsolutePath() + File.separator + "oldModuleLib/src", "module-lib", false) - addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, - "module-lib", libraryJar); + AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) - BuildResult result = makeAll(); - result.assertSuccessful(); + val result = makeAll() + result.assertSuccessful() } - public void testDependencyToOldKotlinLib() throws IOException { - initProject(); + throws(IOException::class) + public fun testDependencyToOldKotlinLib() { + initProject() - File libraryJar = MockLibraryUtil.compileLibraryToJar( - workDir.getAbsolutePath() + File.separator + "oldModuleLib/src", "module-lib", false); + val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.getAbsolutePath() + File.separator + "oldModuleLib/src", "module-lib", false) - addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar); + AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) - addKotlinRuntimeDependency(); + addKotlinRuntimeDependency() - BuildResult result = makeAll(); - result.assertSuccessful(); + val result = makeAll() + result.assertSuccessful() } - private void createKotlinJavaScriptLibraryArchive() { - File jarFile = new File(workDir, KOTLIN_JS_LIBRARY_JAR); + private fun createKotlinJavaScriptLibraryArchive() { + val jarFile = File(workDir, KOTLIN_JS_LIBRARY_JAR) try { - ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(jarFile)); - ZipUtil.addDirToZipRecursively(zip, jarFile, new File(PATH_TO_KOTLIN_JS_LIBRARY), "", null, null); - zip.close(); + val zip = ZipOutputStream(FileOutputStream(jarFile)) + ZipUtil.addDirToZipRecursively(zip, jarFile, File(PATH_TO_KOTLIN_JS_LIBRARY), "", null, null) + zip.close() } - catch (FileNotFoundException ex) { - throw new IllegalStateException(ex.getMessage()); + catch (ex: FileNotFoundException) { + throw IllegalStateException(ex.getMessage()) } - catch (IOException ex) { - throw new IllegalStateException(ex.getMessage()); + catch (ex: IOException) { + throw IllegalStateException(ex.getMessage()) } + } - @NotNull - private static String[] k2jsOutput(String ...moduleNames) { - int length = moduleNames.length; - String[] result = new String[2 * length]; - int index = 0; - for(String moduleName : moduleNames) { - File outputDir = new File("out/production/" + moduleName); - result[index++] = toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName).getPath()); - result[index++] = toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName).getPath()); + private fun contentOfOutputDir(moduleName: String): Set { + val outputDir = "out/production/$moduleName" + val baseDir = File(workDir, outputDir) + val files = FileUtil.findFilesByMask(Pattern.compile(".*"), baseDir) + val result = HashSet() + for (file in files) { + val relativePath = FileUtil.getRelativePath(baseDir, file) + assert(relativePath != null, "relativePath should not be null") + result.add(toSystemIndependentName(relativePath)) } - return result; + return result } - @NotNull - private Set contentOfOutputDir(String moduleName) { - String outputDir = "out/production/" + moduleName; - File baseDir = new File(workDir, outputDir); - List files = FileUtil.findFilesByMask(Pattern.compile(".*"), baseDir); - Set result = new HashSet(); - for(File file : files) { - String relativePath = FileUtil.getRelativePath(baseDir, file); - assert relativePath != null : "relativePath should not be null"; - result.add(toSystemIndependentName(relativePath)); - } - return result; - } - - @NotNull - private static Set getMethodsOfClass(@NotNull File classFile) throws IOException { - final Set result = new TreeSet(); - new ClassReader(FileUtil.loadFileBytes(classFile)).accept(new ClassVisitor(Opcodes.ASM5) { - @Override - public MethodVisitor visitMethod(int access, @NotNull String name, @NotNull String desc, String signature, String[] exceptions) { - result.add(name); - return null; + public fun testReexportedDependency() { + initProject() + AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, ContainerUtil.filter(myProject.getModules(), object : Condition { + override fun value(module: JpsModule): Boolean { + return module.getName() == "module2" } - }, 0); - return result; + }), true) + makeAll().assertSuccessful() } - public void testReexportedDependency() { - initProject(); - addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, - ContainerUtil.filter(myProject.getModules(), new Condition() { - @Override - public boolean value(JpsModule module) { - return module.getName().equals("module2"); - } - }), true - ); - makeAll().assertSuccessful(); + throws(InterruptedException::class) + public fun testDoNotCreateUselessKotlinIncrementalCaches() { + initProject() + makeAll().assertSuccessful() + + val storageRoot = BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot() + TestCase.assertTrue(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) + TestCase.assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) } - public void testDoNotCreateUselessKotlinIncrementalCaches() throws InterruptedException { - initProject(); - makeAll().assertSuccessful(); - - File storageRoot = new BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot(); - assertTrue(new File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()); - assertFalse(new File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()); - } - - @NotNull - private JpsModule findModule(@NotNull String name) { - for (JpsModule module : myProject.getModules()) { - if (module.getName().equals(name)) { - return module; + private fun findModule(name: String): JpsModule { + for (module in myProject.getModules()) { + if (module.getName() == name) { + return module } } - throw new IllegalStateException("Couldn't find module " + name); + throw IllegalStateException("Couldn't find module $name") } - private static void assertFilesExistInOutput(JpsModule module, String... relativePaths) { - for (String path : relativePaths) { - File outputFile = findFileInOutputDir(module, path); - assertTrue("Output not written: " + - outputFile.getAbsolutePath() + - "\n Directory contents: \n" + - dirContents(outputFile.getParentFile()), - outputFile.exists()); - } + private fun checkWhen(action: Action, pathsToCompile: Array?, pathsToDelete: Array?) { + checkWhen(arrayOf(action), pathsToCompile, pathsToDelete) } - private static File findFileInOutputDir(JpsModule module, String relativePath) { - String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false); - assertNotNull(outputUrl); - File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); - return new File(outputDir, relativePath); - } - - - private static void assertFilesNotExistInOutput(JpsModule module, String... relativePaths) { - String outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false); - assertNotNull(outputUrl); - File outputDir = new File(JpsPathUtil.urlToPath(outputUrl)); - for (String path : relativePaths) { - File outputFile = new File(outputDir, path); - assertFalse("Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"", - outputFile.exists()); - } - } - - private static String dirContents(File dir) { - File[] files = dir.listFiles(); - if (files == null) { - return ""; - } - StringBuilder builder = new StringBuilder(); - for (File file : files) { - builder.append(" * ").append(file.getName()).append("\n"); - } - return builder.toString(); - } - - private void checkWhen(Action action, @Nullable String[] pathsToCompile, @Nullable String[] pathsToDelete) { - checkWhen(new Action[]{action}, pathsToCompile, pathsToDelete); - } - - private void checkWhen(Action[] actions, @Nullable String[] pathsToCompile, @Nullable String[] pathsToDelete) { - for (Action action : actions) { - action.apply(); + private fun checkWhen(actions: Array, pathsToCompile: Array?, pathsToDelete: Array?) { + for (action in actions) { + action.apply() } - makeAll().assertSuccessful(); + makeAll().assertSuccessful() if (pathsToCompile != null) { - assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, pathsToCompile); + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, *pathsToCompile) } if (pathsToDelete != null) { - assertDeleted(pathsToDelete); + assertDeleted(*pathsToDelete) } } - private static String klass(String moduleName, String classFqName) { - String outputDirPrefix = "out/production/" + moduleName + "/"; - return outputDirPrefix + classFqName.replace('.', '/') + ".class"; + private fun packageClasses(moduleName: String, fileName: String, packageClassFqName: String): Array { + return arrayOf(klass(moduleName, packageClassFqName), packagePartClass(moduleName, fileName, packageClassFqName)) } - private String[] packageClasses(String moduleName, String fileName, String packageClassFqName) { - return new String[] {klass(moduleName, packageClassFqName), packagePartClass(moduleName, fileName, packageClassFqName)}; - } - - private String packagePartClass(String moduleName, String fileName, String packageClassFqName) { - String path = FileUtilRt.toSystemIndependentName(new File(workDir, fileName).getAbsolutePath()); - LightVirtualFile fakeVirtualFile = new LightVirtualFile(path) { - @NotNull - @Override - public String getPath() { + private fun packagePartClass(moduleName: String, fileName: String, packageClassFqName: String): String { + val path = FileUtilRt.toSystemIndependentName(File(workDir, fileName).getAbsolutePath()) + val fakeVirtualFile = object : LightVirtualFile(path) { + override fun getPath(): String { // strip extra "/" from the beginning - return super.getPath().substring(1); + return super.getPath().substring(1) } - }; - - FqName packagePartFqName = PackagePartClassUtils.getPackagePartFqName(new FqName(packageClassFqName), fakeVirtualFile); - return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName)); - } - - public static String[] mergeArrays(String[]... stringArrays) { - Set result = new HashSet(); - for (String[] array : stringArrays) { - result.addAll(Arrays.asList(array)); - } - return ArrayUtil.toStringArray(result); - } - - private enum Operation { - CHANGE, DELETE - } - - protected Action touch(String path) { - return new Action(Operation.CHANGE, path); - } - - protected Action del(String path) { - return new Action(Operation.DELETE, path); - } - - protected class Action { - private final Operation operation; - private final String path; - - protected Action(Operation operation, String path) { - this.operation = operation; - this.path = path; } - protected void apply() { - File file = new File(workDir, path); + val packagePartFqName = PackagePartClassUtils.getPackagePartFqName(FqName(packageClassFqName), fakeVirtualFile) + return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName)) + } - if (operation == Operation.CHANGE) { - change(file.getAbsolutePath()); + private enum class Operation { + CHANGE, + DELETE + } + + protected fun touch(path: String): Action { + return Action(Operation.CHANGE, path) + } + + protected fun del(path: String): Action { + return Action(Operation.DELETE, path) + } + + protected inner class Action protected constructor(private val operation: Operation, private val path: String) { + + protected fun apply() { + val file = File(workDir, path) + + if (operation === Operation.CHANGE) { + JpsBuildTestCase.change(file.getAbsolutePath()) } - else if(operation == Operation.DELETE) { - assertTrue("Can not delete file \"" + file.getAbsolutePath() + "\"", file.delete()); + else if (operation === Operation.DELETE) { + TestCase.assertTrue("Can not delete file \"" + file.getAbsolutePath() + "\"", file.delete()) } else { - fail("Unknown operation"); + TestCase.fail("Unknown operation") } } } + + companion object { + private val PROJECT_NAME = "kotlinProject" + private val ADDITIONAL_MODULE_NAME = "module2" + private val JDK_NAME = "IDEA_JDK" + + private val EXCLUDE_FILES = arrayOf("Excluded.class", "YetAnotherExcluded.class") + private val NOTHING = arrayOf() + private val KOTLIN_JS_LIBRARY = "jslib-example" + private val PATH_TO_KOTLIN_JS_LIBRARY = AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY + private val KOTLIN_JS_LIBRARY_JAR = "$KOTLIN_JS_LIBRARY.jar" + private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "lib/kotlin.js", "lib/stdlib.meta.js") + private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = KotlinPackage.hashSetOf("$ADDITIONAL_MODULE_NAME.js", "$ADDITIONAL_MODULE_NAME.meta.js", "lib/kotlin.js", "lib/stdlib.meta.js") + private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js") + private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = KotlinPackage.hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "lib/kotlin.js", "lib/stdlib.meta.js", "lib/jslib-example.js", "lib/file0.js", "lib/dir/file1.js", "lib/META-INF-ex/file2.js", "lib/res0.js", "lib/resdir/res1.js") + private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = KotlinPackage.hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "custom/kotlin.js", "custom/stdlib.meta.js", "custom/jslib-example.js", "custom/file0.js", "custom/dir/file1.js", "custom/META-INF-ex/file2.js", "custom/res0.js", "custom/resdir/res1.js") + + private fun k2jsOutput(vararg moduleNames: String): Array { + val length = moduleNames.size() + val result = arrayOfNulls(2 * length) + var index = 0 + for (moduleName in moduleNames) { + val outputDir = File("out/production/$moduleName") + result[index++] = toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName).getPath()) + result[index++] = toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName).getPath()) + } + return result + } + + throws(IOException::class) + private fun getMethodsOfClass(classFile: File): Set { + val result = TreeSet() + ClassReader(FileUtil.loadFileBytes(classFile)).accept(object : ClassVisitor(Opcodes.ASM5) { + override fun visitMethod(access: Int, name: String, desc: String, signature: String, exceptions: Array): MethodVisitor? { + result.add(name) + return null + } + }, 0) + return result + } + + private fun assertFilesExistInOutput(module: JpsModule, vararg relativePaths: String) { + for (path in relativePaths) { + val outputFile = findFileInOutputDir(module, path) + TestCase.assertTrue("Output not written: " + outputFile.getAbsolutePath() + "\n Directory contents: \n" + dirContents(outputFile.getParentFile()), outputFile.exists()) + } + } + + private fun findFileInOutputDir(module: JpsModule, relativePath: String): File { + val outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false) + TestCase.assertNotNull(outputUrl) + val outputDir = File(JpsPathUtil.urlToPath(outputUrl)) + return File(outputDir, relativePath) + } + + + private fun assertFilesNotExistInOutput(module: JpsModule, vararg relativePaths: String) { + val outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false) + TestCase.assertNotNull(outputUrl) + val outputDir = File(JpsPathUtil.urlToPath(outputUrl)) + for (path in relativePaths) { + val outputFile = File(outputDir, path) + TestCase.assertFalse("Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"", outputFile.exists()) + } + } + + private fun dirContents(dir: File): String { + val files = dir.listFiles() ?: return "" + val builder = StringBuilder() + for (file in files) { + builder.append(" * ").append(file.getName()).append("\n") + } + return builder.toString() + } + + private fun klass(moduleName: String, classFqName: String): String { + val outputDirPrefix = "out/production/$moduleName/" + return outputDirPrefix + classFqName.replace('.', '/') + ".class" + } + + public fun mergeArrays(vararg stringArrays: Array): Array { + val result = HashSet() + for (array in stringArrays) { + result.addAll(Arrays.asList(*array)) + } + return ArrayUtil.toStringArray(result) + } + } } From 83502506ba7e13e5f92fba8bf49669669069b83b Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 3 Jul 2015 13:55:24 +0300 Subject: [PATCH 0374/1557] convert KotlinJpsBuildTest to Kotlin: step 1: rename Original commit: 13bda2de448e9499041212cff7d8516c78c59aee --- .../jps/build/{KotlinJpsBuildTest.java => KotlinJpsBuildTest.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/{KotlinJpsBuildTest.java => KotlinJpsBuildTest.kt} (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.java rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt From f57c51c26ef3adc47b1a760e6a12ab4732174486 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 3 Jul 2015 14:38:56 +0300 Subject: [PATCH 0375/1557] KotlinJpsBuildTest.kt: minor refactoring after converting Original commit: ea0c14d7ad9ddce3de1bf501775f22a812425e94 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 282 +++++++++--------- 1 file changed, 149 insertions(+), 133 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 181a5ec8f34..0c633517d4a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -19,13 +19,14 @@ package org.jetbrains.kotlin.jps.build import com.google.common.collect.Lists import com.intellij.openapi.util.Condition import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName import com.intellij.openapi.util.io.FileUtilRt import com.intellij.testFramework.LightVirtualFile +import com.intellij.testFramework.UsefulTestCase import com.intellij.util.ArrayUtil import com.intellij.util.containers.ContainerUtil import com.intellij.util.io.ZipUtil -import kotlin.KotlinPackage -import org.jetbrains.jps.builders.BuildResult +import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService @@ -40,20 +41,136 @@ import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassVisitor import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes - import java.io.File import java.io.FileNotFoundException import java.io.FileOutputStream import java.io.IOException -import java.util.* +import java.util.Arrays +import java.util.Collections +import java.util.HashSet +import java.util.TreeSet import java.util.regex.Pattern import java.util.zip.ZipOutputStream - -import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName +import kotlin.test.* public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { + companion object { + private val PROJECT_NAME = "kotlinProject" + private val ADDITIONAL_MODULE_NAME = "module2" + private val JDK_NAME = "IDEA_JDK" + + private val EXCLUDE_FILES = arrayOf("Excluded.class", "YetAnotherExcluded.class") + private val NOTHING = arrayOf() + private val KOTLIN_JS_LIBRARY = "jslib-example" + private val PATH_TO_KOTLIN_JS_LIBRARY = AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY + private val KOTLIN_JS_LIBRARY_JAR = "$KOTLIN_JS_LIBRARY.jar" + private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = hashSetOf( + "$PROJECT_NAME.js", + "$PROJECT_NAME.meta.js", + "lib/kotlin.js", + "lib/stdlib.meta.js" + ) + private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = hashSetOf( + "$ADDITIONAL_MODULE_NAME.js", + "$ADDITIONAL_MODULE_NAME.meta.js", + "lib/kotlin.js", + "lib/stdlib.meta.js" + ) + private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js") + private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf( + "$PROJECT_NAME.js", + "$PROJECT_NAME.meta.js", + "lib/kotlin.js", + "lib/stdlib.meta.js", + "lib/jslib-example.js", + "lib/file0.js", + "lib/dir/file1.js", + "lib/META-INF-ex/file2.js", + "lib/res0.js", + "lib/resdir/res1.js" + ) + private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = hashSetOf( + "$PROJECT_NAME.js", + "$PROJECT_NAME.meta.js", + "custom/kotlin.js", + "custom/stdlib.meta.js", + "custom/jslib-example.js", + "custom/file0.js", + "custom/dir/file1.js", + "custom/META-INF-ex/file2.js", + "custom/res0.js", + "custom/resdir/res1.js" + ) + + private fun k2jsOutput(vararg moduleNames: String): Array { + val list = arrayListOf() + for (moduleName in moduleNames) { + val outputDir = File("out/production/$moduleName") + list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName).getPath())) + list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName).getPath())) + } + return list.toTypedArray() + } + + private fun getMethodsOfClass(classFile: File): Set { + val result = TreeSet() + ClassReader(FileUtil.loadFileBytes(classFile)).accept(object : ClassVisitor(Opcodes.ASM5) { + override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { + result.add(name) + return null + } + }, 0) + return result + } + + private fun assertFilesExistInOutput(module: JpsModule, vararg relativePaths: String) { + for (path in relativePaths) { + val outputFile = findFileInOutputDir(module, path) + assertTrue(outputFile.exists(), "Output not written: " + outputFile.getAbsolutePath() + "\n Directory contents: \n" + dirContents(outputFile.getParentFile())) + } + } + + private fun findFileInOutputDir(module: JpsModule, relativePath: String): File { + val outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false) + assertNotNull(outputUrl) + val outputDir = File(JpsPathUtil.urlToPath(outputUrl)) + return File(outputDir, relativePath) + } + + + private fun assertFilesNotExistInOutput(module: JpsModule, vararg relativePaths: String) { + val outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false) + assertNotNull(outputUrl) + val outputDir = File(JpsPathUtil.urlToPath(outputUrl)) + for (path in relativePaths) { + val outputFile = File(outputDir, path) + assertFalse(outputFile.exists(), "Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"") + } + } + + private fun dirContents(dir: File): String { + val files = dir.listFiles() ?: return "" + val builder = StringBuilder() + for (file in files) { + builder.append(" * ").append(file.getName()).append("\n") + } + return builder.toString() + } + + private fun klass(moduleName: String, classFqName: String): String { + val outputDirPrefix = "out/production/$moduleName/" + return outputDirPrefix + classFqName.replace('.', '/') + ".class" + } + + public fun mergeArrays(vararg stringArrays: Array): Array { + val result = HashSet() + for (array in stringArrays) { + result.addAll(Arrays.asList(*array)) + } + return ArrayUtil.toStringArray(result) + } + } - throws(Exception::class) override fun setUp() { super.setUp() val sourceFilesRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) @@ -61,16 +178,12 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { getOrCreateProjectDir() } - throws(Exception::class) override fun tearDown() { FileUtil.delete(workDir) super.tearDown() } - throws(IOException::class) - override fun doGetProjectDir(): File { - return workDir - } + override fun doGetProjectDir(): File = workDir private fun initProject() { addJdk(JDK_NAME) @@ -107,7 +220,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { addKotlinJavaScriptStdlibDependency() makeAll().assertSuccessful() - TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } @@ -116,8 +229,8 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { addKotlinJavaScriptStdlibDependency() makeAll().assertSuccessful() - TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) - TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY, contentOfOutputDir(ADDITIONAL_MODULE_NAME)) + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY, contentOfOutputDir(ADDITIONAL_MODULE_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) checkWhen(touch("module2/src/module2.kt"), null, k2jsOutput(ADDITIONAL_MODULE_NAME)) @@ -138,7 +251,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { addKotlinJavaScriptDependency("KotlinJavaScript", jslibDir) makeAll().assertSuccessful() - TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } @@ -148,28 +261,28 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY)) makeAll().assertSuccessful() - TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } public fun testKotlinJavaScriptProjectWithLibrary() { doTestWithKotlinJavaScriptLibrary() - TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } public fun testKotlinJavaScriptProjectWithLibraryCustomOutputDir() { doTestWithKotlinJavaScriptLibrary() - TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR, contentOfOutputDir(PROJECT_NAME)) + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } public fun testKotlinJavaScriptProjectWithLibraryNoCopy() { doTestWithKotlinJavaScriptLibrary() - TestCase.assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY, contentOfOutputDir(PROJECT_NAME)) + assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } @@ -180,7 +293,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) makeAll().assertFailed() - TestCase.assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) + assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) } public fun testExcludeFolderInSourceRoot() { @@ -333,7 +446,6 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Package")) } - throws(IOException::class) public fun testCircularDependenciesSamePackage() { initProject() val result = makeAll() @@ -349,7 +461,6 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) } - throws(IOException::class) public fun testCircularDependencyWithReferenceToOldVersionLib() { initProject() @@ -361,7 +472,6 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.assertSuccessful() } - throws(IOException::class) public fun testDependencyToOldKotlinLib() { initProject() @@ -399,7 +509,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { for (file in files) { val relativePath = FileUtil.getRelativePath(baseDir, file) assert(relativePath != null, "relativePath should not be null") - result.add(toSystemIndependentName(relativePath)) + result.add(toSystemIndependentName(relativePath!!)) } return result } @@ -414,14 +524,13 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { makeAll().assertSuccessful() } - throws(InterruptedException::class) public fun testDoNotCreateUselessKotlinIncrementalCaches() { initProject() makeAll().assertSuccessful() val storageRoot = BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot() - TestCase.assertTrue(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) - TestCase.assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) + assertTrue(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) + assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) } private fun findModule(name: String): JpsModule { @@ -475,116 +584,23 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { DELETE } - protected fun touch(path: String): Action { - return Action(Operation.CHANGE, path) - } + protected fun touch(path: String): Action = Action(Operation.CHANGE, path) - protected fun del(path: String): Action { - return Action(Operation.DELETE, path) - } + protected fun del(path: String): Action = Action(Operation.DELETE, path) - protected inner class Action protected constructor(private val operation: Operation, private val path: String) { + protected fun change(filePath: String): Unit = JpsBuildTestCase.change(filePath) - protected fun apply() { + protected inner class Action constructor(private val operation: Operation, private val path: String) { + fun apply() { val file = File(workDir, path) - - if (operation === Operation.CHANGE) { - JpsBuildTestCase.change(file.getAbsolutePath()) + when (operation) { + Operation.CHANGE -> + change(file.getAbsolutePath()) + Operation.DELETE -> + assertTrue(file.delete(), "Can not delete file \"" + file.getAbsolutePath() + "\"") + else -> + fail("Unknown operation") } - else if (operation === Operation.DELETE) { - TestCase.assertTrue("Can not delete file \"" + file.getAbsolutePath() + "\"", file.delete()) - } - else { - TestCase.fail("Unknown operation") - } - } - } - - companion object { - private val PROJECT_NAME = "kotlinProject" - private val ADDITIONAL_MODULE_NAME = "module2" - private val JDK_NAME = "IDEA_JDK" - - private val EXCLUDE_FILES = arrayOf("Excluded.class", "YetAnotherExcluded.class") - private val NOTHING = arrayOf() - private val KOTLIN_JS_LIBRARY = "jslib-example" - private val PATH_TO_KOTLIN_JS_LIBRARY = AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY - private val KOTLIN_JS_LIBRARY_JAR = "$KOTLIN_JS_LIBRARY.jar" - private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY = KotlinPackage.hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "lib/kotlin.js", "lib/stdlib.meta.js") - private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = KotlinPackage.hashSetOf("$ADDITIONAL_MODULE_NAME.js", "$ADDITIONAL_MODULE_NAME.meta.js", "lib/kotlin.js", "lib/stdlib.meta.js") - private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = KotlinPackage.hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js") - private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = KotlinPackage.hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "lib/kotlin.js", "lib/stdlib.meta.js", "lib/jslib-example.js", "lib/file0.js", "lib/dir/file1.js", "lib/META-INF-ex/file2.js", "lib/res0.js", "lib/resdir/res1.js") - private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = KotlinPackage.hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "custom/kotlin.js", "custom/stdlib.meta.js", "custom/jslib-example.js", "custom/file0.js", "custom/dir/file1.js", "custom/META-INF-ex/file2.js", "custom/res0.js", "custom/resdir/res1.js") - - private fun k2jsOutput(vararg moduleNames: String): Array { - val length = moduleNames.size() - val result = arrayOfNulls(2 * length) - var index = 0 - for (moduleName in moduleNames) { - val outputDir = File("out/production/$moduleName") - result[index++] = toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName).getPath()) - result[index++] = toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName).getPath()) - } - return result - } - - throws(IOException::class) - private fun getMethodsOfClass(classFile: File): Set { - val result = TreeSet() - ClassReader(FileUtil.loadFileBytes(classFile)).accept(object : ClassVisitor(Opcodes.ASM5) { - override fun visitMethod(access: Int, name: String, desc: String, signature: String, exceptions: Array): MethodVisitor? { - result.add(name) - return null - } - }, 0) - return result - } - - private fun assertFilesExistInOutput(module: JpsModule, vararg relativePaths: String) { - for (path in relativePaths) { - val outputFile = findFileInOutputDir(module, path) - TestCase.assertTrue("Output not written: " + outputFile.getAbsolutePath() + "\n Directory contents: \n" + dirContents(outputFile.getParentFile()), outputFile.exists()) - } - } - - private fun findFileInOutputDir(module: JpsModule, relativePath: String): File { - val outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false) - TestCase.assertNotNull(outputUrl) - val outputDir = File(JpsPathUtil.urlToPath(outputUrl)) - return File(outputDir, relativePath) - } - - - private fun assertFilesNotExistInOutput(module: JpsModule, vararg relativePaths: String) { - val outputUrl = JpsJavaExtensionService.getInstance().getOutputUrl(module, false) - TestCase.assertNotNull(outputUrl) - val outputDir = File(JpsPathUtil.urlToPath(outputUrl)) - for (path in relativePaths) { - val outputFile = File(outputDir, path) - TestCase.assertFalse("Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"", outputFile.exists()) - } - } - - private fun dirContents(dir: File): String { - val files = dir.listFiles() ?: return "" - val builder = StringBuilder() - for (file in files) { - builder.append(" * ").append(file.getName()).append("\n") - } - return builder.toString() - } - - private fun klass(moduleName: String, classFqName: String): String { - val outputDirPrefix = "out/production/$moduleName/" - return outputDirPrefix + classFqName.replace('.', '/') + ".class" - } - - public fun mergeArrays(vararg stringArrays: Array): Array { - val result = HashSet() - for (array in stringArrays) { - result.addAll(Arrays.asList(*array)) - } - return ArrayUtil.toStringArray(result) } } } From 22c07485ddf34f784da5792a514ebbba58c92510 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 3 Jul 2015 15:37:20 +0300 Subject: [PATCH 0376/1557] add tests for KT-8158 make Kotlin compiler invoked from IDEA cancellable Original commit: 8cd978bfd82a88ff6aa9d881fcbf97d1af683d55 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 106 +++++++++++++++++- .../CancelKotlinCompilation/kotlinProject.iml | 12 ++ .../CancelKotlinCompilation/kotlinProject.ipr | 14 +++ .../CancelKotlinCompilation/src/Bar.kt | 3 + .../CancelLongKotlinCompilation/expected.log | 3 + .../kotlinProject.iml | 12 ++ .../kotlinProject.ipr | 14 +++ 7 files changed, 160 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/testData/general/CancelKotlinCompilation/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/CancelKotlinCompilation/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/CancelKotlinCompilation/src/Bar.kt create mode 100644 jps/jps-plugin/testData/general/CancelLongKotlinCompilation/expected.log create mode 100644 jps/jps-plugin/testData/general/CancelLongKotlinCompilation/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/CancelLongKotlinCompilation/kotlinProject.ipr diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 0c633517d4a..3d1f63bbe35 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -26,8 +26,16 @@ import com.intellij.testFramework.UsefulTestCase import com.intellij.util.ArrayUtil import com.intellij.util.containers.ContainerUtil import com.intellij.util.io.ZipUtil +import org.jetbrains.jps.api.CanceledStatus +import org.jetbrains.jps.builders.BuildResult +import org.jetbrains.jps.builders.CompileScopeTestBuilder import org.jetbrains.jps.builders.JpsBuildTestCase +import org.jetbrains.jps.builders.TestProjectBuilderLogger import org.jetbrains.jps.builders.impl.BuildDataPathsImpl +import org.jetbrains.jps.builders.logging.BuildLoggingManager +import org.jetbrains.jps.incremental.BuilderRegistry +import org.jetbrains.jps.incremental.IncProjectBuilder +import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule @@ -41,10 +49,7 @@ import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassVisitor import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes -import java.io.File -import java.io.FileNotFoundException -import java.io.FileOutputStream -import java.io.IOException +import java.io.* import java.util.Arrays import java.util.Collections import java.util.HashSet @@ -533,6 +538,99 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) } + public fun testCancelLongKotlinCompilation() { + generateLongKotlinFile("Foo.kt", "foo", "Foo") + initProject() + + val start = System.currentTimeMillis() + val canceledStatus = CanceledStatus() { System.currentTimeMillis() - start > 2000 } + + val logger = TestProjectBuilderLogger() + val buildResult = BuildResult() + buildCustom(canceledStatus, logger, buildResult) + val interval = System.currentTimeMillis() - start + + assertCanceled(buildResult) + buildResult.assertSuccessful() + assert(interval < 8000, "expected time for canceled compilation < 8000 ms, but $interval") + + val module = myProject.getModules().get(0) + assertFilesNotExistInOutput(module, "foo/Foo.class") + + val expectedLog = workDir.getAbsolutePath() + File.separator + "expected.log" + checkFullLog(logger, File(expectedLog)) + } + + public fun testCancelKotlinCompilation() { + initProject() + makeAll().assertSuccessful() + + val module = myProject.getModules().get(0) + assertFilesExistInOutput(module, "foo/Bar.class") + + val buildResult = BuildResult() + val canceledStatus = object: CanceledStatus { + var checkFromIndex = 0; + + public override fun isCanceled(): Boolean { + val messages = buildResult.getMessages(BuildMessage.Kind.INFO) + for (i in checkFromIndex..messages.size()-1) { + if (messages.get(i).getMessageText().startsWith("Kotlin JPS plugin version")) return true; + } + + checkFromIndex = messages.size(); + return false; + } + } + + touch("src/Bar.kt").apply() + buildCustom(canceledStatus, TestProjectBuilderLogger(), buildResult) + assertCanceled(buildResult) + + assertFilesNotExistInOutput(module, "foo/Bar.class") + } + + private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) { + val scopeBuilder = CompileScopeTestBuilder.make().all() + val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger)) + try { + val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), this.myBuildParams, canceledStatus, null, true) + builder.addMessageHandler(buildResult) + builder.build(scopeBuilder.build(), false) + } + finally { + descriptor.release() + } + } + + private fun checkFullLog(logger: TestProjectBuilderLogger, expectedLogFile: File) { + UsefulTestCase.assertSameLinesWithFile(expectedLogFile.getAbsolutePath(), logger.getFullLog(getOrCreateProjectDir(), myDataStorageRoot)) + } + + private fun assertCanceled(buildResult: BuildResult) { + val list = buildResult.getMessages(BuildMessage.Kind.INFO) + assertTrue("The build has been canceled".equals(list.last().getMessageText())) + } + + private fun generateLongKotlinFile(filePath: String, packagename: String, className: String) { + val file = File(workDir.getAbsolutePath() + File.separator + "src" + File.separator + filePath) + FileUtilRt.createIfNotExists(file) + val writer = BufferedWriter(FileWriter(file)) + try { + writer.write("package $packagename\n\n") + writer.write("public class $className {\n") + + for (i in 0..10000) { + writer.write("fun f$i():Int = $i\n\n") + } + + writer.write("}\n") + } + finally { + writer.close() + } + } + private fun findModule(name: String): JpsModule { for (module in myProject.getModules()) { if (module.getName() == name) { diff --git a/jps/jps-plugin/testData/general/CancelKotlinCompilation/kotlinProject.iml b/jps/jps-plugin/testData/general/CancelKotlinCompilation/kotlinProject.iml new file mode 100644 index 00000000000..0c4fb67a3d4 --- /dev/null +++ b/jps/jps-plugin/testData/general/CancelKotlinCompilation/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CancelKotlinCompilation/kotlinProject.ipr b/jps/jps-plugin/testData/general/CancelKotlinCompilation/kotlinProject.ipr new file mode 100644 index 00000000000..8226e21ade3 --- /dev/null +++ b/jps/jps-plugin/testData/general/CancelKotlinCompilation/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CancelKotlinCompilation/src/Bar.kt b/jps/jps-plugin/testData/general/CancelKotlinCompilation/src/Bar.kt new file mode 100644 index 00000000000..2c990ada4c7 --- /dev/null +++ b/jps/jps-plugin/testData/general/CancelKotlinCompilation/src/Bar.kt @@ -0,0 +1,3 @@ +package foo + +class Bar diff --git a/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/expected.log b/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/expected.log new file mode 100644 index 00000000000..d5d22ab8abe --- /dev/null +++ b/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/expected.log @@ -0,0 +1,3 @@ +Compiling files: +src/Foo.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/kotlinProject.iml b/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/kotlinProject.iml new file mode 100644 index 00000000000..0c4fb67a3d4 --- /dev/null +++ b/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/kotlinProject.ipr b/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/kotlinProject.ipr new file mode 100644 index 00000000000..8226e21ade3 --- /dev/null +++ b/jps/jps-plugin/testData/general/CancelLongKotlinCompilation/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + From e4a96670f457a6b1ee16118513212cfa0c1d7efa Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 8 Jul 2015 12:13:24 +0300 Subject: [PATCH 0377/1557] Make project compilable after types enhancement Original commit: 0a19fb7df27ec4fed0b85916e22ea792f132c586 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7e04e7c4052..2fb84a3378a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -150,14 +150,14 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val decision = when { header.isCompatiblePackageFacadeKind() -> getRecompilationDecision( - protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)), + protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!)), constantsChanged = false, inlinesChanged = false ) header.isCompatibleClassKind() -> when (header.classKind!!) { JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision( - protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData)), + protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!)), constantsChanged = constantsMap.process(className, fileBytes), inlinesChanged = inlineFunctionsMap.process(className, fileBytes) ) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 6ae59235b9c..5da8374ea31 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -292,7 +292,7 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { val mapping = project.dataManager.getSourceToOutputMap(target) mapping.getSources().forEach { - val outputs = mapping.getOutputs(it).sort() + val outputs = mapping.getOutputs(it)!!.sort() if (outputs.isNotEmpty()) { result.println("source $it -> " + outputs) } From 8313978c9fa089f36733782684c552a8119fe324 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 21 Jul 2015 14:57:25 +0300 Subject: [PATCH 0378/1557] incremental.cache -> incremental.components; IncrementalCacheProvider -> IncrementalCompilationComponents Original commit: 91b87f41bc333f61e759d05a1d6b4ebfe8159d6e --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 ++++---- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 2 +- ...derImpl.kt => IncrementalCompilationComponentsImpl.kt} | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/{IncrementalCacheProviderImpl.kt => IncrementalCompilationComponentsImpl.kt} (74%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 5c120c79331..478f291a287 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -58,8 +58,8 @@ import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDe import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.utils.LibraryUtils import org.jetbrains.kotlin.utils.PathUtil @@ -270,7 +270,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun createCompileEnvironment(incrementalCaches: Map, context: CompileContext): CompilerEnvironment { val compilerServices = Services.Builder() - .register(javaClass(), IncrementalCacheProviderImpl(incrementalCaches)) + .register(javaClass(), IncrementalCompilationComponentsImpl(incrementalCaches)) .register(javaClass(), object: CompilationCanceledStatus { override fun checkCanceled(): Unit = if (context.getCancelStatus().isCanceled()) throw CompilationCanceledException() }) @@ -279,7 +279,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return CompilerEnvironment.getEnvironmentFor( PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), { className -> - className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.cache.") + className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.components.") || className == "org.jetbrains.kotlin.config.Services" || className.startsWith("org.apache.log4j.") // For logging from compiler || className == "org.jetbrains.kotlin.progress.CompilationCanceledStatus" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 2fb84a3378a..834c67f3ff4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.serialization.jvm.BitEncoding diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt similarity index 74% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt index 299432c43ce..26ca656d72b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheProviderImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCacheProvider import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.load.kotlin.incremental.cache.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -public class IncrementalCacheProviderImpl(caches: Map): IncrementalCacheProvider { +public class IncrementalCompilationComponentsImpl(caches: Map): IncrementalCompilationComponents { private val idToCache = caches.mapKeys { it.key.getId()!! } override fun getIncrementalCache(moduleId: String): IncrementalCache { From 90206fc21f67322f41958d477ca7e2457058fb59 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 20 Jul 2015 16:48:21 +0300 Subject: [PATCH 0379/1557] Introduce UsageCollector Original commit: 679d5fe4967dafa05a65361d373e896b93ea2fd8 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 1 + .../jps/incremental/IncrementalCompilationComponentsImpl.kt | 3 +++ 2 files changed, 4 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 478f291a287..ed82ef9b6f2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -280,6 +280,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), { className -> className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.components.") + || className.startsWith("org.jetbrains.kotlin.incremental.components.") || className == "org.jetbrains.kotlin.config.Services" || className.startsWith("org.apache.log4j.") // For logging from compiler || className == "org.jetbrains.kotlin.progress.CompilationCanceledStatus" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt index 26ca656d72b..1d0f2f95f8b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.kotlin.incremental.components.UsageCollector import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents @@ -26,4 +27,6 @@ public class IncrementalCompilationComponentsImpl(caches: Map Date: Tue, 21 Jul 2015 17:47:05 +0300 Subject: [PATCH 0380/1557] add GenerateProtoBufCompare Original commit: 2f304c0d9907338ffbbb70d3dafb440c8db15747 --- .../jps/incremental/ProtoCompareGenerated.kt | 520 ++++++++++++++++++ 1 file changed, 520 insertions(+) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt new file mode 100644 index 00000000000..c8a62f6143e --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -0,0 +1,520 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import org.jetbrains.kotlin.serialization.ProtoBuf +import org.jetbrains.kotlin.serialization.deserialization.NameResolver +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf + +/** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */ + +open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, private val newNameResolver: NameResolver) { + private val nameIdMap: MutableMap = hashMapOf() + private val fqNameIdMap: MutableMap = hashMapOf() + + + open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { + if (!checkEqualsPackageMember(old, new)) return false + + return true + } + + open fun checkEquals(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.hasFlags() != new.hasFlags()) return false + if (old.hasFlags()) { + if (old.flags != new.flags) return false + } + + if (!checkFqNameIdEquals(old.fqName, new.fqName)) return false + + if (old.hasCompanionObjectName() != new.hasCompanionObjectName()) return false + if (old.hasCompanionObjectName()) { + if (!checkNameIdEquals(old.companionObjectName, new.companionObjectName)) return false + } + + if (!checkEqualsClassTypeParameter(old, new)) return false + + if (!checkEqualsClassSupertype(old, new)) return false + + if (!checkEqualsClassNestedClassName(old, new)) return false + + if (!checkEqualsClassMember(old, new)) return false + + if (!checkEqualsClassEnumEntry(old, new)) return false + + if (old.hasPrimaryConstructor() != new.hasPrimaryConstructor()) return false + if (old.hasPrimaryConstructor()) { + if (!checkEquals(old.primaryConstructor, new.primaryConstructor)) return false + } + + if (!checkEqualsClassSecondaryConstructor(old, new)) return false + + if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) return false + + for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { + if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) return false + } + + + return true + } + + open fun checkEquals(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean { + if (old.hasFlags() != new.hasFlags()) return false + if (old.hasFlags()) { + if (old.flags != new.flags) return false + } + + if (old.hasGetterFlags() != new.hasGetterFlags()) return false + if (old.hasGetterFlags()) { + if (old.getterFlags != new.getterFlags) return false + } + + if (old.hasSetterFlags() != new.hasSetterFlags()) return false + if (old.hasSetterFlags()) { + if (old.setterFlags != new.setterFlags) return false + } + + if (!checkEqualsCallableTypeParameter(old, new)) return false + + if (old.hasReceiverType() != new.hasReceiverType()) return false + if (old.hasReceiverType()) { + if (!checkEquals(old.receiverType, new.receiverType)) return false + } + + if (!checkNameIdEquals(old.name, new.name)) return false + + if (!checkEqualsCallableValueParameter(old, new)) return false + + if (!checkEquals(old.returnType, new.returnType)) return false + + if (old.hasExtension(JvmProtoBuf.methodSignature) != new.hasExtension(JvmProtoBuf.methodSignature)) return false + if (old.hasExtension(JvmProtoBuf.methodSignature)) { + if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false + } + + if (old.hasExtension(JvmProtoBuf.propertySignature) != new.hasExtension(JvmProtoBuf.propertySignature)) return false + if (old.hasExtension(JvmProtoBuf.propertySignature)) { + if (!checkEquals(old.getExtension(JvmProtoBuf.propertySignature), new.getExtension(JvmProtoBuf.propertySignature))) return false + } + + if (old.hasExtension(JvmProtoBuf.implClassName) != new.hasExtension(JvmProtoBuf.implClassName)) return false + if (old.hasExtension(JvmProtoBuf.implClassName)) { + if (!checkNameIdEquals(old.getExtension(JvmProtoBuf.implClassName), new.getExtension(JvmProtoBuf.implClassName))) return false + } + + return true + } + + open fun checkEquals(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { + if (old.id != new.id) return false + + if (!checkNameIdEquals(old.name, new.name)) return false + + if (old.hasReified() != new.hasReified()) return false + if (old.hasReified()) { + if (old.reified != new.reified) return false + } + + if (old.hasVariance() != new.hasVariance()) return false + if (old.hasVariance()) { + if (old.variance != new.variance) return false + } + + if (!checkEqualsTypeParameterUpperBound(old, new)) return false + + return true + } + + open fun checkEquals(old: ProtoBuf.Type, new: ProtoBuf.Type): Boolean { + if (!checkEquals(old.constructor, new.constructor)) return false + + if (!checkEqualsTypeArgument(old, new)) return false + + if (old.hasNullable() != new.hasNullable()) return false + if (old.hasNullable()) { + if (old.nullable != new.nullable) return false + } + + if (old.hasFlexibleTypeCapabilitiesId() != new.hasFlexibleTypeCapabilitiesId()) return false + if (old.hasFlexibleTypeCapabilitiesId()) { + if (!checkNameIdEquals(old.flexibleTypeCapabilitiesId, new.flexibleTypeCapabilitiesId)) return false + } + + if (old.hasFlexibleUpperBound() != new.hasFlexibleUpperBound()) return false + if (old.hasFlexibleUpperBound()) { + if (!checkEquals(old.flexibleUpperBound, new.flexibleUpperBound)) return false + } + + if (old.hasConstructorClassName() != new.hasConstructorClassName()) return false + if (old.hasConstructorClassName()) { + if (!checkFqNameIdEquals(old.constructorClassName, new.constructorClassName)) return false + } + + if (old.hasConstructorTypeParameter() != new.hasConstructorTypeParameter()) return false + if (old.hasConstructorTypeParameter()) { + if (old.constructorTypeParameter != new.constructorTypeParameter) return false + } + + if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false + + for(i in 0..old.getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { + if (!checkEquals(old.getExtension(JvmProtoBuf.typeAnnotation, i), new.getExtension(JvmProtoBuf.typeAnnotation, i))) return false + } + + + return true + } + + open fun checkEquals(old: ProtoBuf.Class.PrimaryConstructor, new: ProtoBuf.Class.PrimaryConstructor): Boolean { + if (old.hasData() != new.hasData()) return false + if (old.hasData()) { + if (!checkEquals(old.data, new.data)) return false + } + + return true + } + + open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { + if (!checkFqNameIdEquals(old.id, new.id)) return false + + if (!checkEqualsAnnotationArgument(old, new)) return false + + return true + } + + open fun checkEquals(old: ProtoBuf.Callable.ValueParameter, new: ProtoBuf.Callable.ValueParameter): Boolean { + if (old.hasFlags() != new.hasFlags()) return false + if (old.hasFlags()) { + if (old.flags != new.flags) return false + } + + if (!checkNameIdEquals(old.name, new.name)) return false + + if (!checkEquals(old.type, new.type)) return false + + if (old.hasVarargElementType() != new.hasVarargElementType()) return false + if (old.hasVarargElementType()) { + if (!checkEquals(old.varargElementType, new.varargElementType)) return false + } + + if (old.hasExtension(JvmProtoBuf.index) != new.hasExtension(JvmProtoBuf.index)) return false + if (old.hasExtension(JvmProtoBuf.index)) { + if (old.getExtension(JvmProtoBuf.index) != new.getExtension(JvmProtoBuf.index)) return false + } + + return true + } + + open fun checkEquals(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { + if (!checkNameIdEquals(old.name, new.name)) return false + + if (!checkEquals(old.returnType, new.returnType)) return false + + if (!checkEqualsJvmMethodSignatureParameterType(old, new)) return false + + return true + } + + open fun checkEquals(old: JvmProtoBuf.JvmPropertySignature, new: JvmProtoBuf.JvmPropertySignature): Boolean { + if (old.hasField() != new.hasField()) return false + if (old.hasField()) { + if (!checkEquals(old.field, new.field)) return false + } + + if (old.hasSyntheticMethod() != new.hasSyntheticMethod()) return false + if (old.hasSyntheticMethod()) { + if (!checkEquals(old.syntheticMethod, new.syntheticMethod)) return false + } + + if (old.hasGetter() != new.hasGetter()) return false + if (old.hasGetter()) { + if (!checkEquals(old.getter, new.getter)) return false + } + + if (old.hasSetter() != new.hasSetter()) return false + if (old.hasSetter()) { + if (!checkEquals(old.setter, new.setter)) return false + } + + return true + } + + open fun checkEquals(old: ProtoBuf.Type.Constructor, new: ProtoBuf.Type.Constructor): Boolean { + return true + } + + open fun checkEquals(old: ProtoBuf.Type.Argument, new: ProtoBuf.Type.Argument): Boolean { + if (old.hasProjection() != new.hasProjection()) return false + if (old.hasProjection()) { + if (old.projection != new.projection) return false + } + + if (old.hasType() != new.hasType()) return false + if (old.hasType()) { + if (!checkEquals(old.type, new.type)) return false + } + + return true + } + + open fun checkEquals(old: ProtoBuf.Annotation.Argument, new: ProtoBuf.Annotation.Argument): Boolean { + if (!checkNameIdEquals(old.nameId, new.nameId)) return false + + if (!checkEquals(old.value, new.value)) return false + + return true + } + + open fun checkEquals(old: JvmProtoBuf.JvmType, new: JvmProtoBuf.JvmType): Boolean { + if (old.hasPrimitiveType() != new.hasPrimitiveType()) return false + if (old.hasPrimitiveType()) { + if (old.primitiveType != new.primitiveType) return false + } + + if (old.hasClassFqName() != new.hasClassFqName()) return false + if (old.hasClassFqName()) { + if (!checkFqNameIdEquals(old.classFqName, new.classFqName)) return false + } + + if (old.hasArrayDimension() != new.hasArrayDimension()) return false + if (old.hasArrayDimension()) { + if (old.arrayDimension != new.arrayDimension) return false + } + + return true + } + + open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { + if (!checkNameIdEquals(old.name, new.name)) return false + + if (!checkEquals(old.type, new.type)) return false + + if (old.hasIsStaticInOuter() != new.hasIsStaticInOuter()) return false + if (old.hasIsStaticInOuter()) { + if (old.isStaticInOuter != new.isStaticInOuter) return false + } + + return true + } + + open fun checkEquals(old: ProtoBuf.Annotation.Argument.Value, new: ProtoBuf.Annotation.Argument.Value): Boolean { + if (old.hasType() != new.hasType()) return false + if (old.hasType()) { + if (old.type != new.type) return false + } + + if (old.hasIntValue() != new.hasIntValue()) return false + if (old.hasIntValue()) { + if (old.intValue != new.intValue) return false + } + + if (old.hasFloatValue() != new.hasFloatValue()) return false + if (old.hasFloatValue()) { + if (old.floatValue != new.floatValue) return false + } + + if (old.hasDoubleValue() != new.hasDoubleValue()) return false + if (old.hasDoubleValue()) { + if (old.doubleValue != new.doubleValue) return false + } + + if (old.hasStringValue() != new.hasStringValue()) return false + if (old.hasStringValue()) { + if (!checkNameIdEquals(old.stringValue, new.stringValue)) return false + } + + if (old.hasClassId() != new.hasClassId()) return false + if (old.hasClassId()) { + if (!checkFqNameIdEquals(old.classId, new.classId)) return false + } + + if (old.hasEnumValueId() != new.hasEnumValueId()) return false + if (old.hasEnumValueId()) { + if (!checkNameIdEquals(old.enumValueId, new.enumValueId)) return false + } + + if (old.hasAnnotation() != new.hasAnnotation()) return false + if (old.hasAnnotation()) { + if (!checkEquals(old.annotation, new.annotation)) return false + } + + if (!checkEqualsAnnotationArgumentValueArrayElement(old, new)) return false + + return true + } + + open fun checkEqualsPackageMember(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { + if (old.memberCount != new.memberCount) return false + + for(i in 0..old.memberCount - 1) { + if (!checkEquals(old.getMember(i), new.getMember(i))) return false + } + + return true + } + + open fun checkEqualsClassTypeParameter(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.typeParameterCount != new.typeParameterCount) return false + + for(i in 0..old.typeParameterCount - 1) { + if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false + } + + return true + } + + open fun checkEqualsClassSupertype(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.supertypeCount != new.supertypeCount) return false + + for(i in 0..old.supertypeCount - 1) { + if (!checkEquals(old.getSupertype(i), new.getSupertype(i))) return false + } + + return true + } + + open fun checkEqualsClassNestedClassName(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.nestedClassNameCount != new.nestedClassNameCount) return false + + for(i in 0..old.nestedClassNameCount - 1) { + if (!checkNameIdEquals(old.getNestedClassName(i), new.getNestedClassName(i))) return false + } + + return true + } + + open fun checkEqualsClassMember(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.memberCount != new.memberCount) return false + + for(i in 0..old.memberCount - 1) { + if (!checkEquals(old.getMember(i), new.getMember(i))) return false + } + + return true + } + + open fun checkEqualsClassEnumEntry(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.enumEntryCount != new.enumEntryCount) return false + + for(i in 0..old.enumEntryCount - 1) { + if (!checkNameIdEquals(old.getEnumEntry(i), new.getEnumEntry(i))) return false + } + + return true + } + + open fun checkEqualsClassSecondaryConstructor(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.secondaryConstructorCount != new.secondaryConstructorCount) return false + + for(i in 0..old.secondaryConstructorCount - 1) { + if (!checkEquals(old.getSecondaryConstructor(i), new.getSecondaryConstructor(i))) return false + } + + return true + } + + open fun checkEqualsCallableTypeParameter(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean { + if (old.typeParameterCount != new.typeParameterCount) return false + + for(i in 0..old.typeParameterCount - 1) { + if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false + } + + return true + } + + open fun checkEqualsCallableValueParameter(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean { + if (old.valueParameterCount != new.valueParameterCount) return false + + for(i in 0..old.valueParameterCount - 1) { + if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false + } + + return true + } + + open fun checkEqualsTypeParameterUpperBound(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { + if (old.upperBoundCount != new.upperBoundCount) return false + + for(i in 0..old.upperBoundCount - 1) { + if (!checkEquals(old.getUpperBound(i), new.getUpperBound(i))) return false + } + + return true + } + + open fun checkEqualsTypeArgument(old: ProtoBuf.Type, new: ProtoBuf.Type): Boolean { + if (old.argumentCount != new.argumentCount) return false + + for(i in 0..old.argumentCount - 1) { + if (!checkEquals(old.getArgument(i), new.getArgument(i))) return false + } + + return true + } + + open fun checkEqualsAnnotationArgument(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { + if (old.argumentCount != new.argumentCount) return false + + for(i in 0..old.argumentCount - 1) { + if (!checkEquals(old.getArgument(i), new.getArgument(i))) return false + } + + return true + } + + open fun checkEqualsJvmMethodSignatureParameterType(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { + if (old.parameterTypeCount != new.parameterTypeCount) return false + + for(i in 0..old.parameterTypeCount - 1) { + if (!checkEquals(old.getParameterType(i), new.getParameterType(i))) return false + } + + return true + } + + open fun checkEqualsAnnotationArgumentValueArrayElement(old: ProtoBuf.Annotation.Argument.Value, new: ProtoBuf.Annotation.Argument.Value): Boolean { + if (old.arrayElementCount != new.arrayElementCount) return false + + for(i in 0..old.arrayElementCount - 1) { + if (!checkEquals(old.getArrayElement(i), new.getArrayElement(i))) return false + } + + return true + } + + + + fun checkNameIdEquals(old: Int, new: Int): Boolean { + nameIdMap.get(old)?.let { return it == new } + + val oldValue = oldNameResolver.getName(old).asString() + val newValue = newNameResolver.getName(new).asString() + + return if (oldValue == newValue) { nameIdMap[old] = new; true } else false + } + + fun checkFqNameIdEquals(old: Int, new: Int): Boolean { + fqNameIdMap.get(old)?.let { return it == new } + + val oldValue = oldNameResolver.getFqName(old).asString() + val newValue = newNameResolver.getFqName(new).asString() + + return if (oldValue == newValue) { fqNameIdMap[old] = new; true } else false + } +} From d41a3e205ce5a53a89177b5d113083f272aae681 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 22 Jul 2015 23:59:15 +0300 Subject: [PATCH 0381/1557] add tests for incremental compilation when only private part changed Original commit: 62f6cc7f0b7f80c159d1946ffb547cedff81d5eb --- .../build/IncrementalJpsTestGenerated.java | 78 +++++++++++++++++++ .../pureKotlin/privateMethodAdded/ClassA.kt | 5 ++ .../privateMethodAdded/ClassA.kt.new | 6 ++ .../pureKotlin/privateMethodAdded/build.log | 6 ++ .../pureKotlin/privateMethodAdded/usage.kt | 7 ++ .../pureKotlin/privateMethodDeleted/ClassA.kt | 6 ++ .../privateMethodDeleted/ClassA.kt.new | 5 ++ .../pureKotlin/privateMethodDeleted/build.log | 6 ++ .../pureKotlin/privateMethodDeleted/usage.kt | 7 ++ .../privateMethodSignatureChanged/ClassA.kt | 6 ++ .../ClassA.kt.new | 6 ++ .../privateMethodSignatureChanged/build.log | 6 ++ .../privateMethodSignatureChanged/usage.kt | 7 ++ .../ClassA.kt | 5 ++ .../ClassA.kt.new | 6 ++ .../build.log | 6 ++ .../privateSecondaryConstructorAdded/usage.kt | 7 ++ .../ClassA.kt | 6 ++ .../ClassA.kt.new | 5 ++ .../build.log | 6 ++ .../usage.kt | 7 ++ .../privateValAccessorChanged/ClassA.kt | 6 ++ .../privateValAccessorChanged/ClassA.kt.new | 7 ++ .../privateValAccessorChanged/build.log | 6 ++ .../privateValAccessorChanged/usage.kt | 7 ++ .../pureKotlin/privateValAdded/ClassA.kt | 5 ++ .../pureKotlin/privateValAdded/ClassA.kt.new | 6 ++ .../pureKotlin/privateValAdded/build.log | 6 ++ .../pureKotlin/privateValAdded/usage.kt | 7 ++ .../pureKotlin/privateValDeleted/ClassA.kt | 6 ++ .../privateValDeleted/ClassA.kt.new | 5 ++ .../pureKotlin/privateValDeleted/build.log | 6 ++ .../pureKotlin/privateValDeleted/usage.kt | 7 ++ .../privateValSignatureChanged/ClassA.kt | 6 ++ .../privateValSignatureChanged/ClassA.kt.new | 6 ++ .../privateValSignatureChanged/build.log | 6 ++ .../privateValSignatureChanged/usage.kt | 7 ++ .../pureKotlin/privateVarAdded/ClassA.kt | 5 ++ .../pureKotlin/privateVarAdded/ClassA.kt.new | 6 ++ .../pureKotlin/privateVarAdded/build.log | 6 ++ .../pureKotlin/privateVarAdded/usage.kt | 7 ++ .../pureKotlin/privateVarDeleted/ClassA.kt | 6 ++ .../privateVarDeleted/ClassA.kt.new | 5 ++ .../pureKotlin/privateVarDeleted/build.log | 6 ++ .../pureKotlin/privateVarDeleted/usage.kt | 7 ++ .../privateVarSignatureChanged/ClassA.kt | 6 ++ .../privateVarSignatureChanged/ClassA.kt.new | 6 ++ .../privateVarSignatureChanged/build.log | 6 ++ .../privateVarSignatureChanged/usage.kt | 7 ++ .../kotlinUsedInJava/privateChanges/ClassA.kt | 6 ++ .../privateChanges/ClassA.kt.new | 6 ++ .../privateChanges/Usage.java | 7 ++ .../kotlinUsedInJava/privateChanges/build.log | 6 ++ 53 files changed, 396 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 27102441062..2c46a29b403 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -401,6 +401,78 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("privateMethodAdded") + public void testPrivateMethodAdded() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/"); + doTest(fileName); + } + + @TestMetadata("privateMethodDeleted") + public void testPrivateMethodDeleted() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/"); + doTest(fileName); + } + + @TestMetadata("privateMethodSignatureChanged") + public void testPrivateMethodSignatureChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/"); + doTest(fileName); + } + + @TestMetadata("privateSecondaryConstructorAdded") + public void testPrivateSecondaryConstructorAdded() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("privateSecondaryConstructorDeleted") + public void testPrivateSecondaryConstructorDeleted() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/"); + doTest(fileName); + } + + @TestMetadata("privateValAccessorChanged") + public void testPrivateValAccessorChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/"); + doTest(fileName); + } + + @TestMetadata("privateValAdded") + public void testPrivateValAdded() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAdded/"); + doTest(fileName); + } + + @TestMetadata("privateValDeleted") + public void testPrivateValDeleted() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValDeleted/"); + doTest(fileName); + } + + @TestMetadata("privateValSignatureChanged") + public void testPrivateValSignatureChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/"); + doTest(fileName); + } + + @TestMetadata("privateVarAdded") + public void testPrivateVarAdded() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarAdded/"); + doTest(fileName); + } + + @TestMetadata("privateVarDeleted") + public void testPrivateVarDeleted() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/"); + doTest(fileName); + } + + @TestMetadata("privateVarSignatureChanged") + public void testPrivateVarSignatureChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/"); + doTest(fileName); + } + @TestMetadata("propertyRedeclaration") public void testPropertyRedeclaration() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/"); @@ -640,6 +712,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("privateChanges") + public void testPrivateChanges() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/"); + doTest(fileName); + } + @TestMetadata("propertyRenamed") public void testPropertyRenamed() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt new file mode 100644 index 00000000000..0e3beda7f35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt @@ -0,0 +1,5 @@ +package test + +public class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new new file mode 100644 index 00000000000..723e5e37f85 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private fun meth2() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt new file mode 100644 index 00000000000..723e5e37f85 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private fun meth2() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new new file mode 100644 index 00000000000..0e3beda7f35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/ClassA.kt.new @@ -0,0 +1,5 @@ +package test + +public class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt new file mode 100644 index 00000000000..3f088c6061b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private fun meth2(x: Int): Unit {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new new file mode 100644 index 00000000000..e24e8d0cd8d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private fun meth2(x: String, y: Int): Int = 10 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt new file mode 100644 index 00000000000..0e3beda7f35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt @@ -0,0 +1,5 @@ +package test + +public class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new new file mode 100644 index 00000000000..ab54ddbefc2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private constructor(x: Int) : this() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt new file mode 100644 index 00000000000..ab54ddbefc2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private constructor(x: Int) : this() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new new file mode 100644 index 00000000000..0e3beda7f35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/ClassA.kt.new @@ -0,0 +1,5 @@ +package test + +public class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt new file mode 100644 index 00000000000..0ff30762c8d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private val x = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new new file mode 100644 index 00000000000..d01d489eb33 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/ClassA.kt.new @@ -0,0 +1,7 @@ +package test + +public class ClassA() { + public fun meth1() {} + private val x: Int + get() = 200 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt new file mode 100644 index 00000000000..0e3beda7f35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt @@ -0,0 +1,5 @@ +package test + +public class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new new file mode 100644 index 00000000000..0ff30762c8d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private val x = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt new file mode 100644 index 00000000000..0ff30762c8d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private val x = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new new file mode 100644 index 00000000000..0e3beda7f35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/ClassA.kt.new @@ -0,0 +1,5 @@ +package test + +public class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt new file mode 100644 index 00000000000..0ff30762c8d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private val x = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new new file mode 100644 index 00000000000..65e28f46525 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private val x: String = "X" +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt new file mode 100644 index 00000000000..0e3beda7f35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt @@ -0,0 +1,5 @@ +package test + +public class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new new file mode 100644 index 00000000000..d561df31754 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private var x = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt new file mode 100644 index 00000000000..d561df31754 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private var x = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new new file mode 100644 index 00000000000..0e3beda7f35 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/ClassA.kt.new @@ -0,0 +1,5 @@ +package test + +public class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt new file mode 100644 index 00000000000..d561df31754 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private var x = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new new file mode 100644 index 00000000000..b0a5c26784b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +public class ClassA() { + public fun meth1() {} + private var x: String = "X" +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt new file mode 100644 index 00000000000..8ef96f4bcc8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt @@ -0,0 +1,6 @@ +package test + +public class ClassA { + public fun meth1() {} + private fun meth2() {} +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new new file mode 100644 index 00000000000..6d0606c2c96 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +public class ClassA { + public fun meth1() {} + private fun meth3() {} +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java new file mode 100644 index 00000000000..92adacc5303 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/Usage.java @@ -0,0 +1,7 @@ +package test; + +public class Usage { + public static void f() { + new ClassA().meth1(); + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log new file mode 100644 index 00000000000..b71c6615b9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files \ No newline at end of file From 010d721b388c7db819fc4ade3dd0f38c19f6d39d Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 23 Jul 2015 00:00:01 +0300 Subject: [PATCH 0382/1557] IncrementalCacheImpl: do not recompile other files if all changes are private Original commit: b3659486d90c7a72eb5033728b10a81af632fdff --- .../jps/incremental/IncrementalCacheImpl.kt | 63 ++++++++++++++++++- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 834c67f3ff4..ed13a80f55b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -25,6 +25,7 @@ import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS @@ -38,7 +39,11 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.kotlin.serialization.Flags +import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.jvm.BitEncoding +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil +import org.jetbrains.kotlin.serialization.deserialization.visibility import org.jetbrains.kotlin.utils.Printer import org.jetbrains.org.objectweb.asm.* import java.io.* @@ -150,14 +155,14 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val decision = when { header.isCompatiblePackageFacadeKind() -> getRecompilationDecision( - protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!)), + protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = true), constantsChanged = false, inlinesChanged = false ) header.isCompatibleClassKind() -> when (header.classKind!!) { JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision( - protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!)), + protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = false), constantsChanged = constantsMap.process(className, fileBytes), inlinesChanged = inlineFunctionsMap.process(className, fileBytes) ) @@ -299,13 +304,18 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen ByteArrayExternalizer ) - public fun put(className: JvmClassName, data: ByteArray): Boolean { + public fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean): Boolean { val key = className.getInternalName() val oldData = storage[key] if (Arrays.equals(data, oldData)) { return false } storage.put(key, data) + + if (oldData != null && isOpenPartNotChanged(oldData, data, isPackage)) { + return false + } + return true } @@ -320,6 +330,53 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: ByteArray): String { return java.lang.Long.toHexString(value.md5()) } + + private fun isOpenPartNotChanged(oldData: ByteArray, newData: ByteArray, isPackageFacade: Boolean): Boolean { + if (isPackageFacade) { + return isPackageFacadeOpenPartNotChanged(oldData, newData) + } + else { + return isClassOpenPartNotChanged(oldData, newData) + } + } + + private fun isPackageFacadeOpenPartNotChanged(oldData: ByteArray, newData: ByteArray): Boolean { + val oldPackageData = JvmProtoBufUtil.readPackageDataFrom(oldData) + val newPackageData = JvmProtoBufUtil.readPackageDataFrom(newData) + + val compareObject = ProtoCompareGenerated(oldPackageData.nameResolver, newPackageData.nameResolver) + return compareObject.checkEquals(oldPackageData.packageProto, newPackageData.packageProto) + } + + private fun isClassOpenPartNotChanged(oldData: ByteArray, newData: ByteArray): Boolean { + val oldClassData = JvmProtoBufUtil.readClassDataFrom(oldData) + val newClassData = JvmProtoBufUtil.readClassDataFrom(newData) + + val compareObject = object : ProtoCompareGenerated(oldClassData.nameResolver, newClassData.nameResolver) { + override fun checkEqualsClassMember(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean = + checkEquals(old.memberList, new.memberList) + + override fun checkEqualsClassSecondaryConstructor(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean = + checkEquals(old.secondaryConstructorList, new.secondaryConstructorList) + + private fun checkEquals(oldList: List, newList: List): Boolean { + val oldListFiltered = oldList.filter { !it.isPrivate() } + val newListFiltered = newList.filter { !it.isPrivate() } + + if (oldListFiltered.size() != newListFiltered.size()) return false + + for (i in oldListFiltered.indices) { + if (!checkEquals(oldListFiltered[i], newListFiltered[i])) return false + } + + return true + } + + private fun ProtoBuf.Callable.isPrivate(): Boolean = Visibilities.isPrivate(visibility(Flags.VISIBILITY.get(flags))) + } + + return compareObject.checkEquals(oldClassData.classProto, newClassData.classProto) + } } private inner class ConstantsMap : BasicMap>() { From 3a377fbde4404a365b5dd65111469f69d6f2e83e Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 29 Jul 2015 13:55:39 +0300 Subject: [PATCH 0383/1557] fix KT-8648 Exception from incremental compilation #KT-8648 Fixed Original commit: e9d7bbf493c3d9b07de7423e0958c5d9742f41c9 --- .../jps/incremental/ProtoCompareGenerated.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index c8a62f6143e..c5d63391f5e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf /** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, private val newNameResolver: NameResolver) { - private val nameIdMap: MutableMap = hashMapOf() + private val stringIdMap: MutableMap = hashMapOf() private val fqNameIdMap: MutableMap = hashMapOf() @@ -152,7 +152,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.hasFlexibleTypeCapabilitiesId() != new.hasFlexibleTypeCapabilitiesId()) return false if (old.hasFlexibleTypeCapabilitiesId()) { - if (!checkNameIdEquals(old.flexibleTypeCapabilitiesId, new.flexibleTypeCapabilitiesId)) return false + if (!checkStringIdEquals(old.flexibleTypeCapabilitiesId, new.flexibleTypeCapabilitiesId)) return false } if (old.hasFlexibleUpperBound() != new.hasFlexibleUpperBound()) return false @@ -221,7 +221,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } open fun checkEquals(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { - if (!checkNameIdEquals(old.name, new.name)) return false + if (!checkStringIdEquals(old.name, new.name)) return false if (!checkEquals(old.returnType, new.returnType)) return false @@ -300,7 +300,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { - if (!checkNameIdEquals(old.name, new.name)) return false + if (!checkStringIdEquals(old.name, new.name)) return false if (!checkEquals(old.type, new.type)) return false @@ -335,7 +335,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.hasStringValue() != new.hasStringValue()) return false if (old.hasStringValue()) { - if (!checkNameIdEquals(old.stringValue, new.stringValue)) return false + if (!checkStringIdEquals(old.stringValue, new.stringValue)) return false } if (old.hasClassId() != new.hasClassId()) return false @@ -500,15 +500,17 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv - fun checkNameIdEquals(old: Int, new: Int): Boolean { - nameIdMap.get(old)?.let { return it == new } + fun checkStringIdEquals(old: Int, new: Int): Boolean { + stringIdMap.get(old)?.let { return it == new } - val oldValue = oldNameResolver.getName(old).asString() - val newValue = newNameResolver.getName(new).asString() + val oldValue = oldNameResolver.stringTable.getString(old) + val newValue = newNameResolver.stringTable.getString(new) - return if (oldValue == newValue) { nameIdMap[old] = new; true } else false + return if (oldValue == newValue) { stringIdMap[old] = new; true } else false } + fun checkNameIdEquals(old: Int, new: Int): Boolean = checkStringIdEquals(old, new) + fun checkFqNameIdEquals(old: Int, new: Int): Boolean { fqNameIdMap.get(old)?.let { return it == new } From ec73f8a84fb4cad9d33a7e3d7afa80c525cf5cec Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 3 Aug 2015 17:52:05 +0300 Subject: [PATCH 0384/1557] Implement raw types (de)serialization via special TypeCapabilities Original commit: 32c23728b3c3536377069a803d2d5310ab0c7791 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index c5d63391f5e..20335502d91 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -177,6 +177,11 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } + if (old.hasExtension(JvmProtoBuf.isRaw) != new.hasExtension(JvmProtoBuf.isRaw)) return false + if (old.hasExtension(JvmProtoBuf.isRaw)) { + if (old.getExtension(JvmProtoBuf.isRaw) != new.getExtension(JvmProtoBuf.isRaw)) return false + } + return true } From 28469ae2d033e52bc9612daf51e81d41f3c7b99e Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 4 Aug 2015 21:53:36 +0300 Subject: [PATCH 0385/1557] UsageCollector -> LookupTracker Original commit: 96696c6846923bc3212a29ec7d33eab4e51849d7 --- .../jps/incremental/IncrementalCompilationComponentsImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt index 1d0f2f95f8b..60b9c3b93e3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.incremental.components.UsageCollector +import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents @@ -28,5 +28,5 @@ public class IncrementalCompilationComponentsImpl(caches: Map Date: Fri, 7 Aug 2015 14:37:33 +0300 Subject: [PATCH 0386/1557] Add ability to provide custom LookupTracker from JPS Original commit: 7cd678e03ba60c86549f803317298fe80a991737 --- .../kotlin/jps/build/KotlinBuilder.kt | 44 +++++++++++++------ .../IncrementalCompilationComponentsImpl.kt | 13 +++--- 2 files changed, 38 insertions(+), 19 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index ed82ef9b6f2..4606b72da80 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -33,6 +33,8 @@ import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jps.model.JpsSimpleElement +import org.jetbrains.jps.model.ex.JpsElementChildRoleBase import org.jetbrains.kotlin.cli.common.KotlinVersion import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation @@ -48,8 +50,7 @@ import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services -import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.progress.CompilationCanceledException +import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING @@ -60,6 +61,8 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents +import org.jetbrains.kotlin.progress.CompilationCanceledException +import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.utils.LibraryUtils import org.jetbrains.kotlin.utils.PathUtil @@ -75,6 +78,7 @@ import java.util.ServiceLoader public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" + public val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") } @@ -125,7 +129,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return NOTHING_DONE } - val dataManager = context.getProjectDescriptor().dataManager + val projectDescriptor = context.projectDescriptor + + val dataManager = projectDescriptor.dataManager if (chunk.getTargets().any { dataManager.getDataPaths().getKotlinCacheVersion(it).isIncompatible() }) { LOG.info("Clearing caches for " + chunk.getTargets().map { it.getPresentableName() }.join()) @@ -142,13 +148,20 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getKotlinCache(it) } - val environment = createCompileEnvironment(incrementalCaches, context) + val project = projectDescriptor.project + + val lookupTracker = + project.container.getChild(LOOKUP_TRACKER)?.let { + assert("true".equals(System.getProperty("kotlin.jps.tests"), ignoreCase = true), "LOOKUP_TRACKER allowed only for jps tests") + it.data + } ?: LookupTracker.DO_NOTHING + + val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) if (!environment.success()) { environment.reportErrorsTo(messageCollector) return ABORT } - val project = context.getProjectDescriptor().getProject() val commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project) commonArguments.verbose = true // Make compiler report source to output files mapping @@ -210,7 +223,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR Class.forName("org.jetbrains.jps.incremental.fs.CompilationRound") FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, { file -> file !in allCompiledFiles }) - } catch (e: ClassNotFoundException) { + } + catch (e: ClassNotFoundException) { allCompiledFiles.clear() FSOperations.markDirtyRecursively(context, chunk) } @@ -268,12 +282,16 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) } - private fun createCompileEnvironment(incrementalCaches: Map, context: CompileContext): CompilerEnvironment { + private fun createCompileEnvironment( + incrementalCaches: Map, + lookupTracker: LookupTracker, + context: CompileContext + ): CompilerEnvironment { val compilerServices = Services.Builder() - .register(javaClass(), IncrementalCompilationComponentsImpl(incrementalCaches)) - .register(javaClass(), object: CompilationCanceledStatus { + .register(javaClass(), IncrementalCompilationComponentsImpl(incrementalCaches, lookupTracker)) + .register(javaClass(), object : CompilationCanceledStatus { override fun checkCanceled(): Unit = if (context.getCancelStatus().isCanceled()) throw CompilationCanceledException() - }) + }) .build() return CompilerEnvironment.getEnvironmentFor( @@ -514,8 +532,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) KotlinBuilder.LOG.debug("Compiling to JVM ${filesToCompile.values().size()} files" - + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") - + " in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) + + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") + + " in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) moduleFile.delete() @@ -603,7 +621,7 @@ private open class GeneratedFile( val outputFile: File ) -private class GeneratedJvmClass ( +private class GeneratedJvmClass( target: ModuleBuildTarget, sourceFiles: Collection, outputFile: File diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt index 60b9c3b93e3..9e423f5a262 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt @@ -21,12 +21,13 @@ import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -public class IncrementalCompilationComponentsImpl(caches: Map): IncrementalCompilationComponents { - private val idToCache = caches.mapKeys { it.key.getId()!! } +public class IncrementalCompilationComponentsImpl( + caches: Map, + private val lookupTracker: LookupTracker +): IncrementalCompilationComponents { + private val idToCache = caches.mapKeys { it.key.id!! } - override fun getIncrementalCache(moduleId: String): IncrementalCache { - return idToCache[moduleId]!! - } + override fun getIncrementalCache(moduleId: String): IncrementalCache = idToCache[moduleId]!! - override fun getLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING + override fun getLookupTracker(): LookupTracker = lookupTracker } From 65031eb2c97083953433e45981e79b286520d031 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 4 Aug 2015 15:03:38 +0300 Subject: [PATCH 0387/1557] Minor: move some properties of AbstractIncrementalJpsTest to constructor Original commit: 36f69d9fd6bf990a6d3b379a9ad9129be186d347 --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 11 ++++------- .../jps/build/IncrementalCacheVersionChangedTest.kt | 6 +----- .../build/IncrementalProjectPathCaseChangedTest.kt | 5 +---- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 5da8374ea31..0e35256e173 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -56,7 +56,10 @@ import kotlin.test.assertEquals import kotlin.test.assertFalse import kotlin.test.fail -public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { +public abstract class AbstractIncrementalJpsTest( + private val allowNoFilesWithSuffixInTestData: Boolean = false, + private val checkDumpsCaseInsensitively: Boolean = false +) : JpsBuildTestCase() { companion object { val COMPILATION_FAILED = "COMPILATION FAILED" @@ -96,15 +99,9 @@ public abstract class AbstractIncrementalJpsTest : JpsBuildTestCase() { super.tearDown() } - protected open val allowNoFilesWithSuffixInTestData: Boolean - get() = false - protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver? get() = null - protected open val checkDumpsCaseInsensitively: Boolean - get() = false - fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) val logger = MyLogger(workDirPath) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt index 2df81660a18..97c7880cfc8 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt @@ -19,11 +19,10 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import java.io.File import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl import kotlin.test.assertTrue import org.jetbrains.kotlin.jps.incremental.CacheFormatVersion -public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() { +public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { fun testCacheVersionChanged() { doTest("jps-plugin/testData/incremental/custom/cacheVersionChanged/") } @@ -36,9 +35,6 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest() { doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/") } - override val allowNoFilesWithSuffixInTestData: Boolean - get() = true - override fun performAdditionalModifications() { val storageForTargetType = BuildDataPathsImpl(myDataStorageRoot).getTargetTypeDataRoot(JavaModuleBuildTargetType.PRODUCTION) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt index 27cb4449ec7..13954948030 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.SystemInfoRt import org.jetbrains.jps.model.java.JavaSourceRootType -public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest() { +public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) { fun testProjectPathCaseChanged() { doTest("jps-plugin/testData/incremental/custom/projectPathCaseChanged/") } @@ -36,9 +36,6 @@ public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest( super.doTest(testDataPath) } - override val checkDumpsCaseInsensitively: Boolean - get() = true - override fun performAdditionalModifications() { val module = myProject.getModules()[0] val sourceRoot = module.getSourceRoots()[0].getUrl() From 27ac8066f6fb868cd74afaa275600ccb5e8df5a7 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 7 Aug 2015 15:01:30 +0300 Subject: [PATCH 0388/1557] Add test infrastructure to check the tracking lookups Added simple test to verify infrastructure. Original commit: 7e250ab2ca051b45036e74072b2f4d28ca881cd0 --- .../jps/build/AbstractIncrementalJpsTest.kt | 71 +++++++++++++------ .../jps/build/AbstractLookupTrackerTest.kt | 23 ++++++ .../jps/build/LookupTrackerTestGenerated.java | 44 ++++++++++++ .../lookupTracker/simple/lookups.txt | 5 ++ .../incremental/lookupTracker/simple/main.kt | 6 ++ 5 files changed, 128 insertions(+), 21 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/simple/lookups.txt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 0e35256e173..54d0d999e27 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -38,9 +38,12 @@ import org.jetbrains.jps.cmdline.ProjectDescriptor import org.jetbrains.jps.incremental.BuilderRegistry import org.jetbrains.jps.incremental.IncProjectBuilder import org.jetbrains.jps.incremental.messages.BuildMessage +import org.jetbrains.jps.model.JpsElementFactory import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil +import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.test.JetTestUtils @@ -58,7 +61,9 @@ import kotlin.test.fail public abstract class AbstractIncrementalJpsTest( private val allowNoFilesWithSuffixInTestData: Boolean = false, - private val checkDumpsCaseInsensitively: Boolean = false + private val checkDumpsCaseInsensitively: Boolean = false, + private val allowNoBuildLogFileInTestData: Boolean = false, + private val allowNoLookupsFileInTestData: Boolean = true ) : JpsBuildTestCase() { companion object { val COMPILATION_FAILED = "COMPILATION FAILED" @@ -106,6 +111,11 @@ public abstract class AbstractIncrementalJpsTest( val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) val logger = MyLogger(workDirPath) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) + + val lookupTracker = TestLookupTracker(workDirPath) + val dataContainer = JpsElementFactory.getInstance().createSimpleElement(lookupTracker) + descriptor.project.container.setChild(KotlinBuilder.LOOKUP_TRACKER, dataContainer) + try { val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), myBuildParams, CanceledStatus.NULL, mockConstantSearch, true) val buildResult = BuildResult() @@ -119,19 +129,20 @@ public abstract class AbstractIncrementalJpsTest( .map { it.getMessageText() } .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() } .joinToString("\n") - return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null) + return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null, lookupTracker.lookups) } else { - return MakeResult(logger.log, false, createMappingsDump(descriptor)) + return MakeResult(logger.log, false, createMappingsDump(descriptor), lookupTracker.lookups) } } finally { descriptor.release() } } - private fun initialMake() { + private fun initialMake(): MakeResult { val makeResult = build() assertFalse(makeResult.makeFailed, "Initial make failed:\n$makeResult") + return makeResult } private fun make(): MakeResult { @@ -252,13 +263,26 @@ public abstract class AbstractIncrementalJpsTest( workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) val moduleNames = configureModules() - initialMake() + val initialMakeResult = initialMake() - val makeOverallResult = performModificationsAndMake(moduleNames) - UsefulTestCase.assertSameLinesWithFile(File(testDataDir, "build.log").getAbsolutePath(), makeOverallResult.log) + val otherMakeResults = performModificationsAndMake(moduleNames) - rebuildAndCheckOutput(makeOverallResult) - clearCachesRebuildAndCheckOutput(makeOverallResult) + val buildLogFile = File(testDataDir, "build.log") + if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) { + val logs = otherMakeResults.joinToString("\n\n") { it.log } + UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs) + } + + val lookupsFile = File(testDataDir, "lookups.txt") + if (lookupsFile.exists() || !allowNoLookupsFileInTestData) { + val allActualLookups = otherMakeResults.mapTo(arrayListOf(initialMakeResult.lookups), MakeResult::lookups.getter) + val actualLookups = allActualLookups.joinToString("\n\n") { it.toSortedList().join("\n") } + "\n" + UsefulTestCase.assertSameLinesWithFile(lookupsFile.absolutePath, actualLookups) + } + + val lastMakeResult = otherMakeResults.last() + rebuildAndCheckOutput(lastMakeResult) + clearCachesRebuildAndCheckOutput(lastMakeResult) } private fun createMappingsDump(project: ProjectDescriptor) = @@ -312,25 +336,18 @@ public abstract class AbstractIncrementalJpsTest( return byteArrayOutputStream.toString() } - private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?) + private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?, val lookups: List) - private fun performModificationsAndMake(moduleNames: Set?): MakeResult { - val logs = ArrayList() + private fun performModificationsAndMake(moduleNames: Set?): List { + val results = arrayListOf() val modifications = getModificationsToPerform(moduleNames) - var lastCompilationFailed = false - var lastMappingsDump: String? = null for (step in modifications) { step.forEach { it.perform(workDir) } performAdditionalModifications() - - val makeResult = make() - logs.add(makeResult.log) - lastCompilationFailed = makeResult.makeFailed - lastMappingsDump = makeResult.mappingsDump + results.add(make()) } - - return MakeResult(logs.join("\n\n"), lastCompilationFailed, lastMappingsDump) + return results } protected open fun performAdditionalModifications() { @@ -377,6 +394,18 @@ public abstract class AbstractIncrementalJpsTest( override fun doGetProjectDir(): File? = workDir + private class TestLookupTracker(val rootPath: String) : LookupTracker { + val lookups = arrayListOf() + + override val verbose: Boolean + get() = true + + override fun record(lookupLocation: String, scopeFqName: String, scopeContainingFile: String?, scopeKind: ScopeKind, name: String) { + val s = """from "$lookupLocation" by "$name" in $scopeKind scope "$scopeFqName" in file ${scopeContainingFile?.let { "$it" } ?: null}""" + lookups.add(s.replace(rootPath, "\$TEST_DIR$")) + } + } + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt new file mode 100644 index 00000000000..623a800dede --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -0,0 +1,23 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( + allowNoFilesWithSuffixInTestData = true, + allowNoBuildLogFileInTestData = true, + allowNoLookupsFileInTestData = false +) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java new file mode 100644 index 00000000000..72dc1d1a9c1 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -0,0 +1,44 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/lookupTracker") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { + public void testAllFilesPresentInLookupTracker() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("simple") + public void testSimple() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/simple/"); + doTest(fileName); + } + +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/simple/lookups.txt b/jps/jps-plugin/testData/incremental/lookupTracker/simple/lookups.txt new file mode 100644 index 00000000000..5502708b8ab --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/simple/lookups.txt @@ -0,0 +1,5 @@ +from "$TEST_DIR$/src/main.kt:3:16" by "Array" in PACKAGE scope "foo.bar" in file null +from "$TEST_DIR$/src/main.kt:3:22" by "String" in PACKAGE scope "foo.bar" in file null +from "$TEST_DIR$/src/main.kt:4:12" by "Array" in PACKAGE scope "foo.bar" in file null +from "$TEST_DIR$/src/main.kt:4:18" by "Int" in PACKAGE scope "foo.bar" in file null +from "$TEST_DIR$/src/main.kt:5:12" by "String" in PACKAGE scope "foo.bar" in file null diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt new file mode 100644 index 00000000000..380d4f3998f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt @@ -0,0 +1,6 @@ +package foo.bar + +fun main(args: Array) { + val f: Array + val s: String +} From e2130c606e2b60c1aa82d842ccdfc7e11ea80dce Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Tue, 11 Aug 2015 02:24:34 +0300 Subject: [PATCH 0389/1557] temporarily adjust timeout limit for testCancelLongKotlinCompilation Original commit: 6a1eb91e18fbd5b288d64697b034a17bb4ff8c93 --- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 3d1f63bbe35..2d52adb3e56 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -542,13 +542,15 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { generateLongKotlinFile("Foo.kt", "foo", "Foo") initProject() + val INITIAL_DELAY = 2000 + val start = System.currentTimeMillis() - val canceledStatus = CanceledStatus() { System.currentTimeMillis() - start > 2000 } + val canceledStatus = CanceledStatus() { System.currentTimeMillis() - start > INITIAL_DELAY } val logger = TestProjectBuilderLogger() val buildResult = BuildResult() buildCustom(canceledStatus, logger, buildResult) - val interval = System.currentTimeMillis() - start + val interval = System.currentTimeMillis() - start - INITIAL_DELAY assertCanceled(buildResult) buildResult.assertSuccessful() From 83f9db33ce75e62f45a1fa0271314b1285ea8759 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 18 Aug 2015 20:56:12 +0300 Subject: [PATCH 0390/1557] Don't filter class files and jars from build script. Get a warning about their absence. Original commit: 5b3c05d03965f772e2625999845b61d7bcf61c07 --- .../KotlinBuilderModuleScriptGenerator.java | 12 ++++++++- .../build/AbstractKotlinJpsBuildTestCase.java | 8 ++++-- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 26 +++++++++++++++++++ .../FileDoesNotExistWarning/kotlinProject.ipr | 14 ++++++++++ .../FileDoesNotExistWarning/module.iml | 11 ++++++++ .../FileDoesNotExistWarning/src/Bar.kt | 3 +++ 6 files changed, 71 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/testData/general/FileDoesNotExistWarning/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/FileDoesNotExistWarning/module.iml create mode 100644 jps/jps-plugin/testData/general/FileDoesNotExistWarning/src/Bar.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 5f3c1397d04..b4913701685 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -22,6 +22,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import kotlin.KotlinPackage; +import kotlin.io.IoPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.ModuleChunk; @@ -117,7 +118,16 @@ public class KotlinBuilderModuleScriptGenerator { return ContainerUtil.filter(getAllDependencies(target).classes().getRoots(), new Condition() { @Override public boolean value(File file) { - return file.exists(); + if (!file.exists()) { + String extension = IoPackage.getExtension(file); + + // Don't filter out files, we want to report warnings about absence through the common place + if (!(extension.equals("class") || extension.equals("jar"))) { + return false; + } + } + + return true; } }); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index 2d58b1bf060..c72a724e30f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -105,9 +105,13 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { return addDependency(type, modules, exported, "KotlinJavaScript", PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()); } - protected static JpsLibrary addDependency(JpsJavaDependencyScope type, Collection modules, boolean exported, String libraryName, File file) { + protected static JpsLibrary addDependency(JpsJavaDependencyScope type, Collection modules, boolean exported, String libraryName, File... file) { JpsLibrary library = modules.iterator().next().getProject().addLibrary(libraryName, JpsJavaLibraryType.INSTANCE); - library.addRoot(file, JpsOrderRootType.COMPILED); + + for (File fileRoot : file) { + library.addRoot(fileRoot, JpsOrderRootType.COMPILED); + } + for (JpsModule module : modules) { JpsModuleRootModificationUtil.addDependency(module, library, type, exported); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 2d52adb3e56..e6ad036a5ed 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -49,6 +49,7 @@ import org.jetbrains.org.objectweb.asm.ClassReader import org.jetbrains.org.objectweb.asm.ClassVisitor import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes +import org.junit.Assert import java.io.* import java.util.Arrays import java.util.Collections @@ -592,6 +593,31 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesNotExistInOutput(module, "foo/Bar.class") } + public fun testFileDoesNotExistWarning() { + initProject() + + AbstractKotlinJpsBuildTestCase.addDependency( + JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "LibraryWithBadRoots", + File("badroot.jar"), + File("test/other/file.xml"), + File("some/test.class"), + File("some/other/baddir")) + + val result = makeAll() + result.assertSuccessful() + + val warnings = result.getMessages(BuildMessage.Kind.WARNING) + + Assert.assertArrayEquals( + arrayOf( + """Classpath entry points to a non-existent location: TEST_PATH/badroot.jar""", + """Classpath entry points to a non-existent location: TEST_PATH/some/test.class"""), + warnings.map { + it.messageText.replace(File("").absolutePath, "TEST_PATH").replace("\\", "/") + }.sort().toTypedArray() + ) + } + private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) { val scopeBuilder = CompileScopeTestBuilder.make().all() val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger)) diff --git a/jps/jps-plugin/testData/general/FileDoesNotExistWarning/kotlinProject.ipr b/jps/jps-plugin/testData/general/FileDoesNotExistWarning/kotlinProject.ipr new file mode 100644 index 00000000000..04d418ca179 --- /dev/null +++ b/jps/jps-plugin/testData/general/FileDoesNotExistWarning/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/FileDoesNotExistWarning/module.iml b/jps/jps-plugin/testData/general/FileDoesNotExistWarning/module.iml new file mode 100644 index 00000000000..4c925d6cab7 --- /dev/null +++ b/jps/jps-plugin/testData/general/FileDoesNotExistWarning/module.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/FileDoesNotExistWarning/src/Bar.kt b/jps/jps-plugin/testData/general/FileDoesNotExistWarning/src/Bar.kt new file mode 100644 index 00000000000..2c990ada4c7 --- /dev/null +++ b/jps/jps-plugin/testData/general/FileDoesNotExistWarning/src/Bar.kt @@ -0,0 +1,3 @@ +package foo + +class Bar From 2ea65e1cbcf8f3ea1ff62382757f70ac8420f781 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 11 Aug 2015 19:13:28 -0700 Subject: [PATCH 0391/1557] Refactor command-line interface to kotlin-preloader.jar Use reasonable defaults for the options: no time profiling, no instrumenters, empty classpath, 4096 as the class number estimate. Replace 4096 in the codebase with the constant field. Keep the old interface intact until the build is bootstrapped and the new one can be used in all compilation steps Original commit: aba6ab129991d100508c1e13e28f597813b89bc3 --- .../jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index 75036a84842..47bee730d39 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -20,6 +20,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.preloading.ClassPreloadingUtils; +import org.jetbrains.kotlin.preloading.Preloader; import org.jetbrains.kotlin.utils.KotlinPaths; import java.io.File; @@ -45,7 +46,7 @@ public class CompilerRunnerUtil { if (classLoader == null) { classLoader = ClassPreloadingUtils.preloadClasses( Collections.singletonList(new File(libPath, "kotlin-compiler.jar")), - /* estimatedClassNumber = */ 4096, + Preloader.DEFAULT_CLASS_NUMBER_ESTIMATE, CompilerRunnerUtil.class.getClassLoader(), environment.getClassesToLoadByParent() ); From b983e9c86811731cd9b97c47aecbafbcfa5a5a19 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 10 Aug 2015 22:50:05 +0300 Subject: [PATCH 0392/1557] Store lookup info inside testData code instead of separate file Original commit: b32040f6104aaaf3c6fcd84636a952d05375dfb6 --- .../jps/build/AbstractIncrementalJpsTest.kt | 56 +++++----- .../jps/build/AbstractLookupTrackerTest.kt | 104 +++++++++++++++++- .../lookupTracker/simple/lookups.txt | 5 - .../incremental/lookupTracker/simple/main.kt | 6 +- 4 files changed, 130 insertions(+), 41 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/simple/lookups.txt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 54d0d999e27..e939d5f5f65 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -43,7 +43,6 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.test.JetTestUtils @@ -62,8 +61,7 @@ import kotlin.test.fail public abstract class AbstractIncrementalJpsTest( private val allowNoFilesWithSuffixInTestData: Boolean = false, private val checkDumpsCaseInsensitively: Boolean = false, - private val allowNoBuildLogFileInTestData: Boolean = false, - private val allowNoLookupsFileInTestData: Boolean = true + private val allowNoBuildLogFileInTestData: Boolean = false ) : JpsBuildTestCase() { companion object { val COMPILATION_FAILED = "COMPILATION FAILED" @@ -74,9 +72,9 @@ public abstract class AbstractIncrementalJpsTest( val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" } - private var testDataDir: File by Delegates.notNull() + protected var testDataDir: File by Delegates.notNull() - var workDir: File by Delegates.notNull() + protected var workDir: File by Delegates.notNull() private fun enableDebugLogging() { diagnostic.Logger.setFactory(javaClass()) @@ -107,12 +105,16 @@ public abstract class AbstractIncrementalJpsTest( protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver? get() = null + protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING + + protected open fun checkLookups(@suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {} + fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) val logger = MyLogger(workDirPath) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) - val lookupTracker = TestLookupTracker(workDirPath) + val lookupTracker = createLookupTracker() val dataContainer = JpsElementFactory.getInstance().createSimpleElement(lookupTracker) descriptor.project.container.setChild(KotlinBuilder.LOOKUP_TRACKER, dataContainer) @@ -122,6 +124,8 @@ public abstract class AbstractIncrementalJpsTest( builder.addMessageHandler(buildResult) builder.build(scope.build(), false) + checkLookups(lookupTracker) + if (!buildResult.isSuccessful()) { val errorMessages = buildResult @@ -129,10 +133,10 @@ public abstract class AbstractIncrementalJpsTest( .map { it.getMessageText() } .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() } .joinToString("\n") - return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null, lookupTracker.lookups) + return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null) } else { - return MakeResult(logger.log, false, createMappingsDump(descriptor), lookupTracker.lookups) + return MakeResult(logger.log, false, createMappingsDump(descriptor)) } } finally { descriptor.release() @@ -263,7 +267,7 @@ public abstract class AbstractIncrementalJpsTest( workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) val moduleNames = configureModules() - val initialMakeResult = initialMake() + initialMake() val otherMakeResults = performModificationsAndMake(moduleNames) @@ -273,13 +277,6 @@ public abstract class AbstractIncrementalJpsTest( UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs) } - val lookupsFile = File(testDataDir, "lookups.txt") - if (lookupsFile.exists() || !allowNoLookupsFileInTestData) { - val allActualLookups = otherMakeResults.mapTo(arrayListOf(initialMakeResult.lookups), MakeResult::lookups.getter) - val actualLookups = allActualLookups.joinToString("\n\n") { it.toSortedList().join("\n") } + "\n" - UsefulTestCase.assertSameLinesWithFile(lookupsFile.absolutePath, actualLookups) - } - val lastMakeResult = otherMakeResults.last() rebuildAndCheckOutput(lastMakeResult) clearCachesRebuildAndCheckOutput(lastMakeResult) @@ -336,7 +333,7 @@ public abstract class AbstractIncrementalJpsTest( return byteArrayOutputStream.toString() } - private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?, val lookups: List) + private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?) private fun performModificationsAndMake(moduleNames: Set?): List { val results = arrayListOf() @@ -364,7 +361,10 @@ public abstract class AbstractIncrementalJpsTest( if (moduleDependencies == null) { addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk) - FileUtil.copyDir(testDataDir, File(workDir, "src"), { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) + val srcDir = File(workDir, "src") + FileUtil.copyDir(testDataDir, srcDir, { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) + + preProcessSources(srcDir) moduleNames = null } @@ -382,8 +382,11 @@ public abstract class AbstractIncrementalJpsTest( for (module in nameToModule.values()) { val moduleName = module.getName() - FileUtil.copyDir(testDataDir, File(workDir, moduleName + "/src"), + val srcDir = File(workDir, moduleName + "/src") + FileUtil.copyDir(testDataDir, srcDir, { it.getName().startsWith(moduleName + "_") && (it.getName().endsWith(".kt") || it.getName().endsWith(".java")) }) + + preProcessSources(srcDir) } moduleNames = nameToModule.keySet() @@ -392,20 +395,11 @@ public abstract class AbstractIncrementalJpsTest( return moduleNames } - override fun doGetProjectDir(): File? = workDir - - private class TestLookupTracker(val rootPath: String) : LookupTracker { - val lookups = arrayListOf() - - override val verbose: Boolean - get() = true - - override fun record(lookupLocation: String, scopeFqName: String, scopeContainingFile: String?, scopeKind: ScopeKind, name: String) { - val s = """from "$lookupLocation" by "$name" in $scopeKind scope "$scopeFqName" in file ${scopeContainingFile?.let { "$it" } ?: null}""" - lookups.add(s.replace(rootPath, "\$TEST_DIR$")) - } + protected open fun preProcessSources(srcDir: File) { } + override fun doGetProjectDir(): File? = workDir + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 623a800dede..c58f6f95791 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -16,8 +16,108 @@ package org.jetbrains.kotlin.jps.build +import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.components.ScopeKind +import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.utils.join +import java.io.File +import java.util.ArrayList +import kotlin.test.fail + abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( allowNoFilesWithSuffixInTestData = true, - allowNoBuildLogFileInTestData = true, - allowNoLookupsFileInTestData = false + allowNoBuildLogFileInTestData = true +) { + val MULTILINE_COMMENT = "/\\*[^\\*]*\\*/".toRegex() + + override fun createLookupTracker() = TestLookupTracker() + + override fun checkLookups(lookupTracker: LookupTracker) { + if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker.javaClass}") + + val fileToLookups = lookupTracker.lookups.groupBy { it.lookupContainingFile } + val workSrcDir = File(workDir, "src") + + for (file in workSrcDir.walkTopDown()) { + if (!file.isFile) continue + + val lookupsFromFile = fileToLookups[file.path] ?: continue + + val text = file.readText() + + val matchResult = MULTILINE_COMMENT.match(text) + if (matchResult != null) { + matchResult.groups + fail("File $file unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") + } + + val lines = text.lines().toArrayList() + + for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.lookupLine!! }) { + val columnToLookups = lookupsFromLine.groupBy { it.lookupColumn!! }.toList().sortBy { it.first } + + val lineContent = lines[line - 1] + val parts = ArrayList(columnToLookups.size() * 2) + + var start = 0 + + for ((column, lookupsFromColumn) in columnToLookups) { + val end = column - 1 + parts.add(lineContent.subSequence(start, end)) + + val stringifyLookupInfo: LookupInfo.() -> String = { + val scopeKindChar = scopeKind.toString()[0].toLowerCase() + val scopeFileOrEmpty = scopeContainingFile?.let { "($it)" } ?: "" + "$scopeKindChar:$scopeFqName$scopeFileOrEmpty" + } + + parts.add(lookupsFromColumn.distinct().joinToString(separator = " ", prefix = "/*", postfix = "*/", transform = stringifyLookupInfo)) + + start = end + } + + lines[line - 1] = parts.join("") + lineContent.subSequence(start, lineContent.length()) + } + + val actual = lines.joinToString("\n") + + JetTestUtils.assertEqualsToFile(File(testDataDir, file.path.replace(".*/src/".toRegex(), "")), actual) + } + } + + override fun preProcessSources(srcDir: File) = dropBlockComments(srcDir) + + private fun dropBlockComments(workSrcDir: File) { + for (file in workSrcDir.walkTopDown()) { + if (!file.isFile) continue + file.writeText(file.readText().replace(MULTILINE_COMMENT, "")) + } + } +} + +private data class LookupInfo( + val lookupContainingFile: String, + val lookupLine: Int?, + val lookupColumn: Int?, + val scopeFqName: String, + val scopeContainingFile: String?, + val scopeKind: ScopeKind, + val name: String ) + +private class TestLookupTracker : LookupTracker { + val lookups = arrayListOf() + + override val requiresLookupLineAndColumn: Boolean + get() = true + + override fun record( + lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, + scopeFqName: String, scopeContainingFile: String?, scopeKind: ScopeKind, + name: String + ) { + lookups.add(LookupInfo(lookupContainingFile, lookupLine, lookupColumn, scopeFqName, scopeContainingFile, scopeKind, name)) + } +} + + diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/simple/lookups.txt b/jps/jps-plugin/testData/incremental/lookupTracker/simple/lookups.txt deleted file mode 100644 index 5502708b8ab..00000000000 --- a/jps/jps-plugin/testData/incremental/lookupTracker/simple/lookups.txt +++ /dev/null @@ -1,5 +0,0 @@ -from "$TEST_DIR$/src/main.kt:3:16" by "Array" in PACKAGE scope "foo.bar" in file null -from "$TEST_DIR$/src/main.kt:3:22" by "String" in PACKAGE scope "foo.bar" in file null -from "$TEST_DIR$/src/main.kt:4:12" by "Array" in PACKAGE scope "foo.bar" in file null -from "$TEST_DIR$/src/main.kt:4:18" by "Int" in PACKAGE scope "foo.bar" in file null -from "$TEST_DIR$/src/main.kt:5:12" by "String" in PACKAGE scope "foo.bar" in file null diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt index 380d4f3998f..20aa0463ba6 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt @@ -1,6 +1,6 @@ package foo.bar -fun main(args: Array) { - val f: Array - val s: String +fun main(args: /*p:foo.bar*/Array) { + val f: /*p:foo.bar*/Array + val s: /*p:foo.bar*/String } From b068d19bd2df7b6da76c6c81f96b4c6599721396 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 13 Aug 2015 22:12:16 +0300 Subject: [PATCH 0393/1557] Minor: fix warnings in AbstractIncrementalJpsTest.kt * used new property access syntax * splitBy -> split * used string template instead of concatenation Original commit: 6bed0762288c3d3f5f746712b5c3538067919cbc --- .../jps/build/AbstractIncrementalJpsTest.kt | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index e939d5f5f65..ac2a13f6547 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -82,8 +82,8 @@ public abstract class AbstractIncrementalJpsTest( TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org") val console = ConsoleAppender() - console.setLayout(PatternLayout("%d [%p|%c|%C{1}] %m%n")); - console.setThreshold(Level.ALL) + console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n"); + console.threshold = Level.ALL console.activateOptions() Logger.getRootLogger().addAppender(console) } @@ -110,7 +110,7 @@ public abstract class AbstractIncrementalJpsTest( protected open fun checkLookups(@suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {} fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { - val workDirPath = FileUtil.toSystemIndependentName(workDir.getAbsolutePath()) + val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath) val logger = MyLogger(workDirPath) val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) @@ -126,11 +126,11 @@ public abstract class AbstractIncrementalJpsTest( checkLookups(lookupTracker) - if (!buildResult.isSuccessful()) { + if (!buildResult.isSuccessful) { val errorMessages = buildResult .getMessages(BuildMessage.Kind.ERROR) - .map { it.getMessageText() } + .map { it.messageText } .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() } .joinToString("\n") return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null) @@ -170,7 +170,7 @@ public abstract class AbstractIncrementalJpsTest( assert(moduleNames != null) { "File name has module prefix, but multi-module environment is absent" } assert(module in moduleNames!!) { "Module not found for file with prefix: $fileName" } - return module + "/src" + return "$module/src" } assert(moduleNames == null) { "Test is multi-module, but file has no module prefix: $fileName" } @@ -240,7 +240,7 @@ public abstract class AbstractIncrementalJpsTest( } private fun clearCachesRebuildAndCheckOutput(makeOverallResult: MakeResult) { - FileUtil.delete(BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot()!!) + FileUtil.delete(BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot!!) rebuildAndCheckOutput(makeOverallResult) } @@ -251,10 +251,10 @@ public abstract class AbstractIncrementalJpsTest( val result = HashMap>() for (line in dependenciesTxt.readLines()) { - val split = line.splitBy("->") + val split = line.split("->") val module = split[0] val dependencies = if (split.size() > 1) split[1] else "" - val dependencyList = dependencies.splitBy(",").filterNot { it.isEmpty() } + val dependencyList = dependencies.split(",").filterNot { it.isEmpty() } result[module] = dependencyList } @@ -289,7 +289,7 @@ public abstract class AbstractIncrementalJpsTest( private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { return StringBuilder { - for (target in project.getBuildTargetIndex().getAllTargets().sortBy { it.getPresentableName() }) { + for (target in project.buildTargetIndex.allTargets.sortBy { it.presentableName }) { append("\n") append(project.dataManager.getKotlinCache(target).dump()) append("\n\n\n") @@ -304,15 +304,15 @@ public abstract class AbstractIncrementalJpsTest( result.println("Begin of SourceToOutputMap") result.pushIndent() - for (target in project.getBuildTargetIndex().getAllTargets()) { + for (target in project.buildTargetIndex.allTargets) { result.println(target) result.pushIndent() val mapping = project.dataManager.getSourceToOutputMap(target) - mapping.getSources().forEach { + mapping.sources.forEach { val outputs = mapping.getOutputs(it)!!.sort() if (outputs.isNotEmpty()) { - result.println("source $it -> " + outputs) + result.println("source $it -> $outputs") } } @@ -328,7 +328,7 @@ public abstract class AbstractIncrementalJpsTest( private fun createJavaMappingsDump(project: ProjectDescriptor): String { val byteArrayOutputStream = ByteArrayOutputStream() PrintStream(byteArrayOutputStream).use { - project.dataManager.getMappings().toStream(it) + project.dataManager.mappings.toStream(it) } return byteArrayOutputStream.toString() } @@ -353,8 +353,7 @@ public abstract class AbstractIncrementalJpsTest( // null means one module private fun configureModules(): Set? { var moduleNames: Set? - JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject) - .setOutputUrl(JpsPathUtil.pathToUrl(getAbsolutePath("out"))) + JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject).outputUrl = JpsPathUtil.pathToUrl(getAbsolutePath("out")) val jdk = addJdk("my jdk") val moduleDependencies = readModuleDependencies() @@ -370,7 +369,7 @@ public abstract class AbstractIncrementalJpsTest( } else { val nameToModule = moduleDependencies.keySet() - .keysToMap { addModule(it, arrayOf(getAbsolutePath(it + "/src")), null, null, jdk)!! } + .keysToMap { addModule(it, arrayOf(getAbsolutePath("$it/src")), null, null, jdk)!! } for ((moduleName, dependencies) in moduleDependencies) { val module = nameToModule[moduleName]!! @@ -380,9 +379,9 @@ public abstract class AbstractIncrementalJpsTest( } for (module in nameToModule.values()) { - val moduleName = module.getName() + val moduleName = module.name - val srcDir = File(workDir, moduleName + "/src") + val srcDir = File(workDir, "$moduleName/src") FileUtil.copyDir(testDataDir, srcDir, { it.getName().startsWith(moduleName + "_") && (it.getName().endsWith(".kt") || it.getName().endsWith(".java")) }) @@ -408,14 +407,14 @@ public abstract class AbstractIncrementalJpsTest( override fun isEnabled(): Boolean = true override fun logLine(message: String?) { - logBuf.append(JetTestUtils.replaceHashWithStar(message!!.removePrefix(rootPath + "/"))).append('\n') + logBuf.append(JetTestUtils.replaceHashWithStar(message!!.removePrefix("$rootPath/"))).append('\n') } } private abstract class Modification(val path: String) { abstract fun perform(workDir: File) - override fun toString(): String = "${javaClass.getSimpleName()} $path" + override fun toString(): String = "${javaClass.simpleName} $path" } private class ModifyContent(path: String, val dataFile: File) : Modification(path) { From d3e29843aa6fb791dea2889df5dbf86833bdd9ef Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 14 Aug 2015 15:13:47 +0300 Subject: [PATCH 0394/1557] Minor: ignore KDoc like comments which starts with `/**` for example it can be used to mark lookups which we can't report yet Original commit: 7790c2fd71ae44d5337c98b6413d32828d2e30b3 --- .../kotlin/jps/build/AbstractLookupTrackerTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index c58f6f95791..71295fc989b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -28,7 +28,8 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( allowNoFilesWithSuffixInTestData = true, allowNoBuildLogFileInTestData = true ) { - val MULTILINE_COMMENT = "/\\*[^\\*]*\\*/".toRegex() + // ignore KDoc like comments which starts with `/**`, example: /** text */ + val COMMENT_WITH_LOOKUP_INFO = "/\\*[^*]+\\*/".toRegex() override fun createLookupTracker() = TestLookupTracker() @@ -45,7 +46,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val text = file.readText() - val matchResult = MULTILINE_COMMENT.match(text) + val matchResult = COMMENT_WITH_LOOKUP_INFO.match(text) if (matchResult != null) { matchResult.groups fail("File $file unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") @@ -90,7 +91,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( private fun dropBlockComments(workSrcDir: File) { for (file in workSrcDir.walkTopDown()) { if (!file.isFile) continue - file.writeText(file.readText().replace(MULTILINE_COMMENT, "")) + file.writeText(file.readText().replace(COMMENT_WITH_LOOKUP_INFO, "")) } } } From 6ce54f59b83ff64242e2671a806dd1c6b9b6773b Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 18 Aug 2015 20:08:22 +0300 Subject: [PATCH 0395/1557] No more record path to file which contains current scope in LookupTracker Original commit: 673df1f0853d5343a0ffa6f439df23cf80db701a --- .../kotlin/jps/build/AbstractLookupTrackerTest.kt | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 71295fc989b..27e54d25e60 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -66,13 +66,10 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val end = column - 1 parts.add(lineContent.subSequence(start, end)) - val stringifyLookupInfo: LookupInfo.() -> String = { - val scopeKindChar = scopeKind.toString()[0].toLowerCase() - val scopeFileOrEmpty = scopeContainingFile?.let { "($it)" } ?: "" - "$scopeKindChar:$scopeFqName$scopeFileOrEmpty" + val lookups = lookupsFromColumn.distinct().joinToString(separator = " ", prefix = "/*", postfix = "*/") { + it.scopeKind.toString()[0].toLowerCase().toString() + ":" + it.scopeFqName } - - parts.add(lookupsFromColumn.distinct().joinToString(separator = " ", prefix = "/*", postfix = "*/", transform = stringifyLookupInfo)) + parts.add(lookups) start = end } @@ -101,7 +98,6 @@ private data class LookupInfo( val lookupLine: Int?, val lookupColumn: Int?, val scopeFqName: String, - val scopeContainingFile: String?, val scopeKind: ScopeKind, val name: String ) @@ -114,10 +110,9 @@ private class TestLookupTracker : LookupTracker { override fun record( lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, - scopeFqName: String, scopeContainingFile: String?, scopeKind: ScopeKind, - name: String + scopeFqName: String, scopeKind: ScopeKind, name: String ) { - lookups.add(LookupInfo(lookupContainingFile, lookupLine, lookupColumn, scopeFqName, scopeContainingFile, scopeKind, name)) + lookups.add(LookupInfo(lookupContainingFile, lookupLine, lookupColumn, scopeFqName, scopeKind, name)) } } From 2d5f0f428c68fdce569d1e2ad6c4c180da21b441 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 14 Aug 2015 19:21:28 +0300 Subject: [PATCH 0396/1557] Add test for lookups to top level declarations Original commit: 556c755e83a96d53f49183ee34682c6a4481672a --- .../jps/build/LookupTrackerTestGenerated.java | 6 ++++++ .../lookupTracker/packageDeclarations/bar.kt | 7 +++++++ .../lookupTracker/packageDeclarations/baz.kt | 7 +++++++ .../lookupTracker/packageDeclarations/foo1.kt | 17 +++++++++++++++++ .../lookupTracker/packageDeclarations/foo2.kt | 7 +++++++ .../incremental/lookupTracker/simple/main.kt | 2 +- 6 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/baz.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 72dc1d1a9c1..401d4211141 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -35,6 +35,12 @@ public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("packageDeclarations") + public void testPackageDeclarations() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/packageDeclarations/"); + doTest(fileName); + } + @TestMetadata("simple") public void testSimple() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/simple/"); diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/bar.kt new file mode 100644 index 00000000000..d69fc70de05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/bar.kt @@ -0,0 +1,7 @@ +package bar + +/*p:bar*/class A + +/*p:bar*/class B + +/*p:bar*/object O diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/baz.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/baz.kt new file mode 100644 index 00000000000..b6af61fb0db --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/baz.kt @@ -0,0 +1,7 @@ +package baz + +/*p:baz*/class A + +/*p:baz*/class B + +/*p:baz*/class C diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt new file mode 100644 index 00000000000..063c61fbc00 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -0,0 +1,17 @@ +package foo + +import bar.* +import baz./*p:baz*/C + +/*p:foo*/val a = /**p:foo p:bar*/A() +/*p:foo*/var b: /*p:foo p:bar*/baz./*p:baz*/B = /**p:foo p:bar*/baz./**p:baz*/B() + +/*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B { + /**p:foo*/a + return /**p:foo p:bar*/B() +} + +/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { + /**p:foo*/b + return /**p:foo*/MyClass() +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt new file mode 100644 index 00000000000..cf303aa5f0d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt @@ -0,0 +1,7 @@ +package foo + +/*p:foo*/interface MyInterface + +/*p:foo*/class MyClass : /*p:foo*/MyInterface + +/*p:foo*/enum class MyEnum diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt index 20aa0463ba6..33b7fbf143c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt @@ -1,6 +1,6 @@ package foo.bar -fun main(args: /*p:foo.bar*/Array) { +/*p:foo.bar*/fun main(args: /*p:foo.bar*/Array) { val f: /*p:foo.bar*/Array val s: /*p:foo.bar*/String } From 60ce016ca558b43da1cc94d927576c0e96ba6489 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 18 Aug 2015 20:40:43 +0300 Subject: [PATCH 0397/1557] Provide LookupLocation when resolve calls Original commit: cca57af40194501325af8eb0de81eb5f2ea3f7a3 --- .../lookupTracker/packageDeclarations/foo1.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 063c61fbc00..530a33c0558 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -3,15 +3,15 @@ package foo import bar.* import baz./*p:baz*/C -/*p:foo*/val a = /**p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar*/baz./*p:baz*/B = /**p:foo p:bar*/baz./**p:baz*/B() +/*p:foo*/val a = /*p:foo p:bar*/A() +/*p:foo*/var b: /*p:foo p:bar*/baz./*p:baz*/B = /*p:foo p:bar*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B { - /**p:foo*/a - return /**p:foo p:bar*/B() + /*p:foo p:bar*/a + return /*p:foo p:bar*/B() } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /**p:foo*/b - return /**p:foo*/MyClass() + /*p:foo p:bar c:foo.MyClass*/b + return /*p:foo p:bar c:foo.MyClass*/MyClass() } From 4032df49605656b9dee553d6ed79f016bd6a1b56 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 20 Aug 2015 16:22:26 +0300 Subject: [PATCH 0398/1557] Add test for lookups to classifier members Original commit: 3b21d391c5c01c2b753bd777e5cc6e9d5af7137a --- .../jps/build/LookupTrackerTestGenerated.java | 6 ++ .../lookupTracker/classifierMembers/bar.kt | 1 + .../lookupTracker/classifierMembers/foo.kt | 94 +++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 401d4211141..4b1bd5a3648 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -35,6 +35,12 @@ public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("classifierMembers") + public void testClassifierMembers() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/classifierMembers/"); + doTest(fileName); + } + @TestMetadata("packageDeclarations") public void testPackageDeclarations() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/packageDeclarations/"); diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/bar.kt new file mode 100644 index 00000000000..ddac0faf273 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/bar.kt @@ -0,0 +1 @@ +package bar diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt new file mode 100644 index 00000000000..d05d4009476 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -0,0 +1,94 @@ +package foo + +import bar.* + +/*p:foo*/class A { + val a = 1 + var b = "" + + val c: /*c:foo.A p:foo*/String + get() = /*c:foo.A p:foo p:bar c:foo.A.Companion*/b + + var d: /*c:foo.A p:foo*/String = "ddd" + get() = /*c:foo.A p:foo p:bar c:foo.A.Companion*/$d + set(v) { /*c:foo.A p:foo p:bar c:foo.A.Companion*/$d = v } + + fun foo() { + /*c:foo.A p:foo p:bar c:foo.A.Companion*/a + /*c:foo.A p:foo p:bar c:foo.A.Companion*/foo() + this./*c:foo.A*/a + this./*c:foo.A*/foo() + /*c:foo.A p:foo p:bar c:foo.A.Companion*/baz() + /*c:foo.A p:foo p:bar c:foo.A.Companion*/Companion./*c:foo.A.Companion*/a + /*c:foo.A p:foo p:bar c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" + } + + class B { + val a = 1 + + companion object CO { + fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A p:foo*/Int) {} + } + } + + companion object { + val a = 1 + fun baz() {} + } + + object O { + var v = "vvv" + } +} + +/*p:foo*/interface I { + var a: /*c:foo.I p:foo*/Int + fun foo() +} + +/*p:foo*/object Obj : /*p:foo*/I { + override var a = 1 + override fun foo() {} + val b = 1 + fun bar(): /*c:foo.Obj p:foo*/I = null as /*c:foo.Obj p:foo*/I +} + +/*p:foo*/enum class E { + X, + Y; + + val a = 1 + fun foo() { + /*c:foo.E p:foo p:bar*/a + /*c:foo.E p:foo p:bar*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar*/foo() + /*c:foo.E p:foo p:bar*/X./*c:foo.E*/foo() + } +} + +/*p:foo*/fun usages(i: /*p:foo*/I) { + /*p:foo p:bar*/A()./*c:foo.A*/a + /*p:foo p:bar*/A()./*c:foo.A*/b + /*p:foo p:bar*/A()./*c:foo.A*/c + /*p:foo p:bar*/A()./*c:foo.A*/d = "new value" + /*p:foo p:bar*/A()./*c:foo.A*/foo() + /*p:foo p:bar*/A./*c:foo.A*/B()./*c:foo.A.B*/a + /*p:foo p:bar*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) + /*p:foo p:bar*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo p:bar*/A./*c:foo.A c:foo.A.Companion*/a + /*p:foo p:bar*/A./*c:foo.A c:foo.A.Companion*/baz() + /*p:foo p:bar*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() + /*p:foo p:bar*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" + i./*c:foo.I*/a = 2 + /*p:foo p:bar*/Obj./*c:foo.Obj*/a + /*p:foo p:bar*/Obj./*c:foo.Obj*/foo() + var ii: /*p:foo*/I = /*p:foo p:bar*/Obj + ii./*c:foo.I*/a + ii./*c:foo.I*/foo() + /*p:foo p:bar*/Obj./*c:foo.Obj*/b + val iii = /*p:foo p:bar*/Obj./*c:foo.Obj*/bar() + iii./*c:foo.I*/foo() + /*p:foo p:bar*/E./*c:foo.E*/X + /*p:foo p:bar*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar*/E./*c:foo.E*/Y./*c:foo.E*/foo() +} From 7a7064677b0b03f367a3d95c5b1a006a0f778bdb Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 20 Aug 2015 17:16:13 +0300 Subject: [PATCH 0399/1557] Add test lookup tracking for local declarations Original commit: 3465126bee7492154f355fddb0d01eaaaf43e171 --- .../jps/build/LookupTrackerTestGenerated.java | 6 +++ .../lookupTracker/localDeclarations/bar.kt | 1 + .../lookupTracker/localDeclarations/locals.kt | 49 +++++++++++++++++++ 3 files changed, 56 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 4b1bd5a3648..c7db1b2dbfb 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -41,6 +41,12 @@ public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { doTest(fileName); } + @TestMetadata("localDeclarations") + public void testLocalDeclarations() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/localDeclarations/"); + doTest(fileName); + } + @TestMetadata("packageDeclarations") public void testPackageDeclarations() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/packageDeclarations/"); diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/bar.kt new file mode 100644 index 00000000000..ddac0faf273 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/bar.kt @@ -0,0 +1 @@ +package bar diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt new file mode 100644 index 00000000000..b6c26a2dafb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -0,0 +1,49 @@ +package local.declarations + +import bar.* + +/*p:local.declarations*/fun f(p: /*p:local.declarations*/Any) { + p.toString() + + val a = 1 + val b = a + fun localFun() = b + fun /*p:local.declarations*/Int.localExtFun() = /*p:local.declarations p:bar*/localFun() + + interface LocalI { + var a: /*p:local.declarations*/Int + fun foo() + } + + class LocalC : LocalI { + override var a = 1 + + override fun foo() {} + + var b = "bbb" + + fun bar() = b + } + + val o = object { + val a = "aaa" + fun foo(): LocalI = null as LocalI + } + + /*p:local.declarations p:bar*/localFun() + 1./*p:local.declarations p:bar*/localExtFun() + + val c = /*p:local.declarations p:bar*/LocalC() + c.a + c.b + c.foo() + c.bar() + + val i: LocalI = c + i.a + i.foo() + + o.a + val ii = o.foo() + ii.a +} From 87f9913f34205f2ad714d57938aa74d59220c6fa Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 26 Aug 2015 23:00:29 +0300 Subject: [PATCH 0400/1557] disable parallel compilation for Kotlin modules Original commit: c061a3dbd8de11575e979752837437963fa176ca --- .../org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index 47bee730d39..e8701e0c366 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -70,7 +70,7 @@ public class CompilerRunnerUtil { } @Nullable - public static Object invokeExecMethod( + public synchronized static Object invokeExecMethod( @NotNull String compilerClassName, @NotNull String[] arguments, @NotNull CompilerEnvironment environment, From 29305a70142a1993e5b171c633095156f87779ec Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Tue, 25 Aug 2015 20:32:05 +0300 Subject: [PATCH 0401/1557] Changed JetScope to LexicalScope in ClassDescriptorWithResolutionScopes and DeclarationScopeProvider Original commit: d92e71861e252920c3ac7d180e143fdde2b9dc60 --- .../lookupTracker/classifierMembers/foo.kt | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index d05d4009476..964ef2290ca 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -6,28 +6,28 @@ import bar.* val a = 1 var b = "" - val c: /*c:foo.A p:foo*/String - get() = /*c:foo.A p:foo p:bar c:foo.A.Companion*/b + val c: /*c:foo.A c:foo.A.Companion p:foo*/String + get() = /*p:foo p:bar c:foo.A c:foo.A.Companion*/b - var d: /*c:foo.A p:foo*/String = "ddd" - get() = /*c:foo.A p:foo p:bar c:foo.A.Companion*/$d - set(v) { /*c:foo.A p:foo p:bar c:foo.A.Companion*/$d = v } + var d: /*c:foo.A c:foo.A.Companion p:foo*/String = "ddd" + get() = /*p:foo p:bar c:foo.A c:foo.A.Companion*/$d + set(v) { /*p:foo p:bar c:foo.A c:foo.A.Companion*/$d = v } fun foo() { - /*c:foo.A p:foo p:bar c:foo.A.Companion*/a - /*c:foo.A p:foo p:bar c:foo.A.Companion*/foo() + /*p:foo p:bar c:foo.A c:foo.A.Companion*/a + /*p:foo p:bar c:foo.A c:foo.A.Companion*/foo() this./*c:foo.A*/a this./*c:foo.A*/foo() - /*c:foo.A p:foo p:bar c:foo.A.Companion*/baz() - /*c:foo.A p:foo p:bar c:foo.A.Companion*/Companion./*c:foo.A.Companion*/a - /*c:foo.A p:foo p:bar c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" + /*p:foo p:bar c:foo.A c:foo.A.Companion*/baz() + /*p:foo p:bar c:foo.A c:foo.A.Companion*/Companion./*c:foo.A.Companion*/a + /*p:foo p:bar c:foo.A c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" } class B { val a = 1 companion object CO { - fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A p:foo*/Int) {} + fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo*/Int) {} } } @@ -59,10 +59,10 @@ import bar.* val a = 1 fun foo() { - /*c:foo.E p:foo p:bar*/a - /*c:foo.E p:foo p:bar*/Y./*c:foo.E*/a - /*c:foo.E p:foo p:bar*/foo() - /*c:foo.E p:foo p:bar*/X./*c:foo.E*/foo() + /*p:foo p:bar c:foo.E*/a + /*p:foo p:bar c:foo.E*/Y./*c:foo.E*/a + /*p:foo p:bar c:foo.E*/foo() + /*p:foo p:bar c:foo.E*/X./*c:foo.E*/foo() } } From a559e825cea13eb1d1cbd32ffb085cfc10c2f5c8 Mon Sep 17 00:00:00 2001 From: ligee Date: Tue, 11 Aug 2015 15:44:30 +0200 Subject: [PATCH 0402/1557] incremental compilation via daemon Original commit: b55894499fdaad17089998e07f9063205897a29c --- jps/jps-plugin/jps-plugin.iml | 2 ++ .../compilerRunner/KotlinCompilerRunner.java | 36 +++++++++++++++---- .../kotlin/jps/build/KotlinBuilder.kt | 19 +++++----- 3 files changed, 42 insertions(+), 15 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index bae91cce456..e092109dfa7 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -21,5 +21,7 @@ + + \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 887f515087a..5da5119d20a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -30,6 +30,9 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; import org.jetbrains.kotlin.config.CompilerSettings; +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; +import org.jetbrains.kotlin.rmi.CompilerFacade; +import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; import org.jetbrains.kotlin.utils.UtilsPackage; import java.io.*; @@ -38,6 +41,7 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; @@ -54,13 +58,14 @@ public class KotlinCompilerRunner { CompilerSettings compilerSettings, MessageCollector messageCollector, CompilerEnvironment environment, - File moduleFile, + Map incrementalCaches, File moduleFile, OutputItemsCollector collector ) { K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments); setupK2JvmArguments(moduleFile, arguments); - runCompiler(K2JVM_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment); + runCompiler(K2JVM_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment, + incrementalCaches); } public static void runK2JsCompiler( @@ -69,7 +74,7 @@ public class KotlinCompilerRunner { @NotNull CompilerSettings compilerSettings, @NotNull MessageCollector messageCollector, @NotNull CompilerEnvironment environment, - @NotNull OutputItemsCollector collector, + Map incrementalCaches, @NotNull OutputItemsCollector collector, @NotNull Collection sourceFiles, @NotNull List libraryFiles, @NotNull File outputFile @@ -77,7 +82,8 @@ public class KotlinCompilerRunner { K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments); - runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment); + runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment, + incrementalCaches); } private static void runCompiler( @@ -86,12 +92,13 @@ public class KotlinCompilerRunner { String additionalArguments, MessageCollector messageCollector, OutputItemsCollector collector, - CompilerEnvironment environment + CompilerEnvironment environment, + Map incrementalCaches ) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); PrintStream out = new PrintStream(stream); - String exitCode = execCompiler(compilerClassName, arguments, additionalArguments, environment, out, messageCollector); + String exitCode = execCompiler(compilerClassName, arguments, additionalArguments, environment, incrementalCaches, out, messageCollector); BufferedReader reader = new BufferedReader(new StringReader(stream.toString())); CompilerOutputParser.parseCompilerMessagesFromReader(messageCollector, reader, collector); @@ -107,6 +114,7 @@ public class KotlinCompilerRunner { CommonCompilerArguments arguments, String additionalArguments, CompilerEnvironment environment, + Map incrementalCaches, PrintStream out, MessageCollector messageCollector ) { @@ -116,13 +124,27 @@ public class KotlinCompilerRunner { List argumentsList = ArgumentUtils.convertArgumentsToStringList(arguments); argumentsList.addAll(StringUtil.split(additionalArguments, " ")); + String[] argsArray = ArrayUtil.toStringArray(argumentsList); + + // trying the daemon first + if (incrementalCaches != null) { + CompilerFacade daemon = KotlinCompilerClient.Companion.connectToCompilerServer(); + if (daemon != null) { + Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); + return res.toString(); + } + } + + // otherwise fallback to in-process + Object rc = CompilerRunnerUtil.invokeExecMethod( - compilerClassName, ArrayUtil.toStringArray(argumentsList), environment, messageCollector, out + compilerClassName, argsArray, environment, messageCollector, out ); // exec() returns an ExitCode object, class of which is loaded with a different class loader, // so we take it's contents through reflection return getReturnCodeFromObject(rc); + } catch (Throwable e) { MessageCollectorUtil.reportException(messageCollector, e); diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 4606b72da80..e207b2e7200 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -247,9 +247,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR filesToCompile: MultiMap, incrementalCaches: Map, messageCollector: MessageCollectorAdapter, project: JpsProject ): OutputItemsCollectorImpl? { + if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { LOG.debug("Compiling to JS ${filesToCompile.values().size()} files in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) - return compileToJs(chunk, commonArguments, environment, messageCollector, project) + return compileToJs(chunk, commonArguments, environment, null, messageCollector, project) } if (IncrementalCompilation.ENABLED) { @@ -279,7 +280,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ) } - return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) + return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, + incrementalCaches.mapKeysTo(HashMap(incrementalCaches.size()), { it.getKey().id }), + filesToCompile, messageCollector) } private fun createCompileEnvironment( @@ -436,8 +439,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, environment: CompilerEnvironment, - messageCollector: KotlinBuilder.MessageCollectorAdapter, - project: JpsProject + incrementalCaches: MutableMap?, + messageCollector: MessageCollectorAdapter, project: JpsProject ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() @@ -468,7 +471,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) - runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, incrementalCaches, outputItemCollector, sourceFiles, libraryFiles, outputFile) return outputItemCollector } @@ -491,8 +494,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, environment: CompilerEnvironment, - filesToCompile: MultiMap, - messageCollector: KotlinBuilder.MessageCollectorAdapter + incrementalCaches: MutableMap?, + filesToCompile: MultiMap, messageCollector: MessageCollectorAdapter ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() @@ -535,7 +538,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") + " in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) - runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) + runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, incrementalCaches, moduleFile, outputItemCollector) moduleFile.delete() return outputItemCollector From 0ac755da00ded3f10522d34216e8301e2763ab1f Mon Sep 17 00:00:00 2001 From: ligee Date: Sun, 16 Aug 2015 22:44:06 +0200 Subject: [PATCH 0403/1557] implementing daemon startup, basic check and restart machanisms, switching to kotlin everythere, additional logging and checks, in JPS plugin daemon compilation is off by default, turned on by "kotlin.daemon.enabled" property Original commit: 7ab2208fc5a671c10ab0fda88ae5a141b461da06 --- .../kotlin/compilerRunner/CompilerRunnerUtil.java | 2 +- .../compilerRunner/KotlinCompilerRunner.java | 14 +++++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index e8701e0c366..cc97d0376f3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -56,7 +56,7 @@ public class CompilerRunnerUtil { } @Nullable - private static File getLibPath(@NotNull KotlinPaths paths, @NotNull MessageCollector messageCollector) { + public static File getLibPath(@NotNull KotlinPaths paths, @NotNull MessageCollector messageCollector) { File libs = paths.getLibPath(); if (libs.exists() && !libs.isFile()) return libs; diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 5da5119d20a..e313bd74d6a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -31,7 +31,9 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; -import org.jetbrains.kotlin.rmi.CompilerFacade; +import org.jetbrains.kotlin.rmi.CompileService; +import org.jetbrains.kotlin.rmi.CompilerId; +import org.jetbrains.kotlin.rmi.DaemonOptions; import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; import org.jetbrains.kotlin.utils.UtilsPackage; @@ -42,6 +44,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.logging.Logger; import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; @@ -127,8 +130,13 @@ public class KotlinCompilerRunner { String[] argsArray = ArrayUtil.toStringArray(argumentsList); // trying the daemon first - if (incrementalCaches != null) { - CompilerFacade daemon = KotlinCompilerClient.Companion.connectToCompilerServer(); + if (incrementalCaches != null && KotlinCompilerClient.Companion.isDaemonEnabled()) { + File libPath = CompilerRunnerUtil.getLibPath(environment.getKotlinPaths(), messageCollector); + CompilerId compilerId = CompilerId.makeCompilerId(libPath); + DaemonOptions daemonOptions = new DaemonOptions(); + // TODO: find a proper logger + Logger log = Logger.getAnonymousLogger(); + CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonOptions, log); if (daemon != null) { Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); return res.toString(); From b26b1f7e9e395a84c4a04b992de064bdc7e487e9 Mon Sep 17 00:00:00 2001 From: ligee Date: Mon, 17 Aug 2015 10:57:41 +0200 Subject: [PATCH 0404/1557] Switching to stream for logging to simplify interaction with use sites Original commit: d8be8313398aa5649e6ac21cbc6c914943048cc0 --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index e313bd74d6a..4ce09052a0f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.compilerRunner; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; @@ -44,7 +45,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.logging.Logger; import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; @@ -132,11 +132,10 @@ public class KotlinCompilerRunner { // trying the daemon first if (incrementalCaches != null && KotlinCompilerClient.Companion.isDaemonEnabled()) { File libPath = CompilerRunnerUtil.getLibPath(environment.getKotlinPaths(), messageCollector); - CompilerId compilerId = CompilerId.makeCompilerId(libPath); + CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); DaemonOptions daemonOptions = new DaemonOptions(); - // TODO: find a proper logger - Logger log = Logger.getAnonymousLogger(); - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonOptions, log); + // TODO: find proper stream to report daemon connection progress + CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonOptions, System.out); if (daemon != null) { Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); return res.toString(); From bd89b58a705bd7f4bb0996447306dee2abe2ca0d Mon Sep 17 00:00:00 2001 From: ligee Date: Mon, 17 Aug 2015 19:13:03 +0200 Subject: [PATCH 0405/1557] Adding compiler id digest calculation and check to detect replaced compiler jar, minor fixes and refactorings Original commit: 39d6592e1fb027fb05e6b719e08e078bcac79d7f --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 4ce09052a0f..4921e35768b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -132,10 +132,12 @@ public class KotlinCompilerRunner { // trying the daemon first if (incrementalCaches != null && KotlinCompilerClient.Companion.isDaemonEnabled()) { File libPath = CompilerRunnerUtil.getLibPath(environment.getKotlinPaths(), messageCollector); + // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\ + // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); DaemonOptions daemonOptions = new DaemonOptions(); // TODO: find proper stream to report daemon connection progress - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonOptions, System.out); + CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonOptions, System.out, true, true); if (daemon != null) { Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); return res.toString(); From 9edbe4f0d651b37c8cf0d55dbd8ff8d24e0c2e0a Mon Sep 17 00:00:00 2001 From: ligee Date: Wed, 19 Aug 2015 15:36:26 +0200 Subject: [PATCH 0406/1557] Shutting down daemon from kotlin plugin on idea exit, passing jvm params to daemon launch Original commit: 6e3ce69faa8263eeffd8648a209a956b3b814f55 --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 4921e35768b..25b917c6b6e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -34,6 +34,7 @@ import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; import org.jetbrains.kotlin.rmi.CompileService; import org.jetbrains.kotlin.rmi.CompilerId; +import org.jetbrains.kotlin.rmi.DaemonLaunchingOptions; import org.jetbrains.kotlin.rmi.DaemonOptions; import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; import org.jetbrains.kotlin.utils.UtilsPackage; @@ -136,8 +137,10 @@ public class KotlinCompilerRunner { // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); DaemonOptions daemonOptions = new DaemonOptions(); + DaemonLaunchingOptions daemonLaunchingOptions = new DaemonLaunchingOptions(); + KotlinCompilerClient.Companion.configureDaemonLaunchingOptions(daemonLaunchingOptions); // TODO: find proper stream to report daemon connection progress - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonOptions, System.out, true, true); + CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonLaunchingOptions, daemonOptions, System.out, true, true); if (daemon != null) { Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); return res.toString(); From 4145f431a087c1854b6b1440e2b7abe5aab3d9b4 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 20 Aug 2015 17:36:26 +0200 Subject: [PATCH 0407/1557] Fixes after review Original commit: 61de1c3212715e67b3c5314edabf6352ec30f78f --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 25b917c6b6e..658343708d3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -62,7 +62,8 @@ public class KotlinCompilerRunner { CompilerSettings compilerSettings, MessageCollector messageCollector, CompilerEnvironment environment, - Map incrementalCaches, File moduleFile, + Map incrementalCaches, + File moduleFile, OutputItemsCollector collector ) { K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments); @@ -78,7 +79,8 @@ public class KotlinCompilerRunner { @NotNull CompilerSettings compilerSettings, @NotNull MessageCollector messageCollector, @NotNull CompilerEnvironment environment, - Map incrementalCaches, @NotNull OutputItemsCollector collector, + Map incrementalCaches, + @NotNull OutputItemsCollector collector, @NotNull Collection sourceFiles, @NotNull List libraryFiles, @NotNull File outputFile @@ -156,7 +158,6 @@ public class KotlinCompilerRunner { // exec() returns an ExitCode object, class of which is loaded with a different class loader, // so we take it's contents through reflection return getReturnCodeFromObject(rc); - } catch (Throwable e) { MessageCollectorUtil.reportException(messageCollector, e); From 09090497f63eeb97f99f4a0eaf97fd293b8b0c53 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 21 Aug 2015 19:35:02 +0200 Subject: [PATCH 0408/1557] Passing JPS process JVM memory options to daemon, refactoring options processing Original commit: 2d45a37884404f072a5b3aee29fce73596d48abc --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 658343708d3..c5460c78d48 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -32,10 +32,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; -import org.jetbrains.kotlin.rmi.CompileService; -import org.jetbrains.kotlin.rmi.CompilerId; -import org.jetbrains.kotlin.rmi.DaemonLaunchingOptions; -import org.jetbrains.kotlin.rmi.DaemonOptions; +import org.jetbrains.kotlin.rmi.*; import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; import org.jetbrains.kotlin.utils.UtilsPackage; @@ -133,14 +130,13 @@ public class KotlinCompilerRunner { String[] argsArray = ArrayUtil.toStringArray(argumentsList); // trying the daemon first - if (incrementalCaches != null && KotlinCompilerClient.Companion.isDaemonEnabled()) { + if (incrementalCaches != null && RmiPackage.isDaemonEnabled()) { File libPath = CompilerRunnerUtil.getLibPath(environment.getKotlinPaths(), messageCollector); // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\ // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); - DaemonOptions daemonOptions = new DaemonOptions(); - DaemonLaunchingOptions daemonLaunchingOptions = new DaemonLaunchingOptions(); - KotlinCompilerClient.Companion.configureDaemonLaunchingOptions(daemonLaunchingOptions); + DaemonOptions daemonOptions = RmiPackage.configureDaemonOptions(); + DaemonLaunchingOptions daemonLaunchingOptions = RmiPackage.configureDaemonLaunchingOptions(true); // TODO: find proper stream to report daemon connection progress CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonLaunchingOptions, daemonOptions, System.out, true, true); if (daemon != null) { From 7bbbd354376e0c40163cebde12c840d2f5043b1e Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 28 Aug 2015 14:18:39 +0200 Subject: [PATCH 0409/1557] Refactoring after review Original commit: 9bee97e810fb7aedcda233391fb6d3d76ebe35ed --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index c5460c78d48..3f62f14e35b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.compilerRunner; -import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; @@ -136,9 +135,9 @@ public class KotlinCompilerRunner { // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); DaemonOptions daemonOptions = RmiPackage.configureDaemonOptions(); - DaemonLaunchingOptions daemonLaunchingOptions = RmiPackage.configureDaemonLaunchingOptions(true); + DaemonJVMOptions daemonJVMOptions = RmiPackage.configureDaemonLaunchingOptions(true); // TODO: find proper stream to report daemon connection progress - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonLaunchingOptions, daemonOptions, System.out, true, true); + CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, System.out, true, true); if (daemon != null) { Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); return res.toString(); From 3ff9dff919a7253769fd954476e4e1d655de9131 Mon Sep 17 00:00:00 2001 From: nik Date: Fri, 4 Sep 2015 11:31:00 +0300 Subject: [PATCH 0410/1557] kotlin builder: print 'label in local history' message to log with 'debug' level and once per build (https://github.com/JetBrains/kotlin/pull/745) Original commit: 0772bbeb4fc86bce18d8bcffa102256523581ee1 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e207b2e7200..2951f654eb9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -70,10 +70,7 @@ import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.kotlin.utils.sure import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File -import java.util.ArrayList -import java.util.HashMap -import java.util.HashSet -import java.util.ServiceLoader +import java.util.* public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { @@ -89,17 +86,19 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR override fun getCompilableFileExtensions() = arrayListOf("kt") + override fun buildStarted(context: CompileContext) { + val historyLabel = context.getBuilderParameter("history label") + if (historyLabel != null) { + LOG.debug("Label in local history: $historyLabel") + } + } + override fun build( context: CompileContext, chunk: ModuleChunk, dirtyFilesHolder: DirtyFilesHolder, outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { - val historyLabel = context.getBuilderParameter("history label") - if (historyLabel != null) { - LOG.info("Label in local history: $historyLabel") - } - val messageCollector = MessageCollectorAdapter(context) try { return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) From 25fafd4201f4c6e8fcd8e3bc18ce64ba68a14fcc Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Fri, 26 Jun 2015 16:33:00 +0300 Subject: [PATCH 0411/1557] Incremental tests patched Original commit: 0936351983d3550fd831770846bde7c1858f1210 --- .../build/IncrementalJpsTestGenerated.java | 6 ++++ .../custom/cacheVersionChanged/build.log | 4 +-- .../build.log | 6 ++-- .../cacheVersionChangedMultiModule/build.log | 4 +-- .../custom/projectPathCaseChanged/build.log | 2 +- .../projectPathCaseChangedMultiFile/build.log | 2 +- .../build.log | 2 +- .../build.log | 6 ++-- .../constantValueChanged/build.log | 2 +- .../inlineFunctionChanged/build.log | 8 ++--- .../inlineFunctionInlined/build.log | 8 ++--- .../multiModule/simpleDependency/build.log | 4 +-- .../simpleDependencyUnchanged/build.log | 4 +-- .../transitiveDependency/build.log | 4 +-- .../multiModule/transitiveInlining/build.log | 10 +++---- .../multiModule/twoDependants/build.log | 6 ++-- .../pureKotlin/accessPrivateMembers/build.log | 2 +- .../build.log | 4 +-- .../accessingPropertiesViaField/build.log | 4 +-- .../pureKotlin/allConstants/build.log | 4 +-- .../pureKotlin/annotations/build.log | 2 +- .../anonymousObjectChanged/build.log | 4 +-- .../classInlineFunctionChanged/build.log | 2 +- .../pureKotlin/classRecreated/build.log | 4 +-- .../classSignatureChanged/build.log | 2 +- .../build.log | 2 +- .../build.log | 4 +-- .../build.log | 6 ++-- .../build.log | 18 ++++++++++-- .../build.log | 29 +++++++++++++++++++ .../fun.kt | 4 +++ .../likePart.kt | 5 ++++ .../other.kt | 5 ++++ .../other.kt.new.1 | 7 +++++ .../usage.kt | 6 ++++ .../usage.kt.new.1 | 6 ++++ .../usage.kt.new.2 | 5 ++++ .../conflictingPlatformDeclarations/build.log | 2 +- .../pureKotlin/constantRemoved/build.log | 2 +- .../pureKotlin/constantsUnchanged/build.log | 2 +- .../pureKotlin/defaultArguments/build.log | 2 +- .../dependencyClassReferenced/build.log | 2 +- .../fileWithConstantRemoved/build.log | 4 +-- .../fileWithInlineFunctionRemoved/build.log | 4 +-- .../filesExchangePackages/build.log | 11 +++++-- .../pureKotlin/funRedeclaration/build.log | 2 +- .../inlineFunctionRemoved/build.log | 4 +-- .../build.log | 6 ++-- .../inlineFunctionsUnchanged/build.log | 2 +- .../pureKotlin/localClassChanged/build.log | 4 +-- .../multiplePackagesModified/build.log | 6 ++-- .../pureKotlin/optionalParameter/build.log | 2 +- .../pureKotlin/ourClassReferenced/build.log | 4 +-- .../packageConstantChanged/build.log | 2 +- .../pureKotlin/packageFileAdded/build.log | 2 +- .../packageFileChangedPackage/build.log | 7 +++-- .../build.log | 6 ++-- .../pureKotlin/packageFileRemoved/build.log | 8 ++--- .../packageFilesChangedInTurn/build.log | 6 ++-- .../build.log | 2 +- .../packageInlineFunctionChanged/build.log | 6 ++-- .../build.log | 2 +- .../pureKotlin/packageRecreated/build.log | 2 +- .../packageRecreatedAfterRenaming/build.log | 11 +++++-- .../pureKotlin/packageRemoved/build.log | 4 +-- .../propertyRedeclaration/build.log | 2 +- .../pureKotlin/returnTypeChanged/build.log | 4 +-- .../soleFileChangesPackage/build.log | 9 +++++- .../pureKotlin/subpackage/build.log | 4 +-- .../topLevelFunctionSameSignature/build.log | 2 +- .../topLevelMembersInTwoFiles/build.log | 2 +- .../javaToKotlin/build.log | 4 +-- .../{usage.kt => usageInKotlin.kt} | 0 .../javaToKotlinAndBack/build.log | 6 ++-- .../kotlinToJava/build.log | 4 +-- .../{usage.kt => usageInKotlin.kt} | 0 .../changeSignature/build.log | 2 +- .../build.log | 2 +- .../javaUsedInKotlin/methodRenamed/build.log | 6 ++-- .../samConversions/methodAdded/build.log | 8 ++--- .../methodSignatureChanged/build.log | 8 ++--- .../addOptionalParameter/build.log | 4 +-- .../changeNotUsedSignature/build.log | 2 +- .../changeSignature/build.log | 2 +- .../kotlinUsedInJava/funRenamed/build.log | 2 +- .../notChangeSignature/build.log | 2 +- .../build.log | 4 +-- .../packageFileAdded/build.log | 2 +- .../propertyRenamed/build.log | 2 +- 89 files changed, 255 insertions(+), 148 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 rename jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/{usage.kt => usageInKotlin.kt} (100%) rename jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/{usage.kt => usageInKotlin.kt} (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 2c46a29b403..92823c69b89 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -209,6 +209,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("compilationErrorThenFixedWithPhantomPart3") + public void testCompilationErrorThenFixedWithPhantomPart3() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/"); + doTest(fileName); + } + @TestMetadata("conflictingPlatformDeclarations") public void testConflictingPlatformDeclarations() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log index 5811eb1266c..4515d41dc9c 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class -out/production/module/test/TestPackage$b$*.class +out/production/module/test/A.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log index dcc343c872e..6a64cdced63 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/other/OtherPackage$other$*.class +out/production/module/other/Other.class out/production/module/other/OtherPackage.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log index ec0b0e5da7c..d171334035e 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log index 4cf233bbc00..7f88bf9c5a4 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage$foo$*.class +out/production/module/Foo.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log index 4cf233bbc00..7f88bf9c5a4 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage$foo$*.class +out/production/module/Foo.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index d51f6f61402..fdc98eb8730 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/TestPackage$module1_a$*.class +out/production/module1/test/Module1_a.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index 03390944246..ffac776c374 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,15 +1,15 @@ Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt End of files Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 3d42c783058..12e559d1298 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/TestPackage$module1_const$*.class +out/production/module1/test/Module1_const.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log index 54958ea07a8..3e4fd010efb 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log @@ -1,21 +1,21 @@ Cleaning output files: -out/production/module1/inline/InlinePackage$module1_inline$*.class out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inline.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: -out/production/module1/inline/InlinePackage$module1_inline$*.class -out/production/module1/inline/InlinePackage$module1_other$*.class out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_other.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/UsagePackage$module2_usage$*.class +out/production/module2/usage/Module2_usage.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index 54958ea07a8..3e4fd010efb 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,21 +1,21 @@ Cleaning output files: -out/production/module1/inline/InlinePackage$module1_inline$*.class out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inline.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: -out/production/module1/inline/InlinePackage$module1_inline$*.class -out/production/module1/inline/InlinePackage$module1_other$*.class out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_other.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/UsagePackage$module2_usage$*.class +out/production/module2/usage/Module2_usage.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index ec0b0e5da7c..d171334035e 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index 490a4ad2f8a..dab8c472205 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,8 +1,8 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index ec0b0e5da7c..d171334035e 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 4a046b83b59..6733bf955d1 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,29 +1,29 @@ Cleaning output files: -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module1/a/APackage$module1_a$*.class -out/production/module1/a/APackage$module1_other$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_other.class End of files Compiling files: module1/src/module1_a.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt End of files Cleaning output files: -out/production/module3/c/CPackage$module3_c$*.class out/production/module3/c/CPackage.class +out/production/module3/c/Module3_c.class End of files Compiling files: module3/src/module3_c.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index 0bcfc0ab0e0..c5045143b2a 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/a/A.class -out/production/module1/a/APackage$module1_a$*.class out/production/module1/a/APackage.class +out/production/module1/a/Module1_a.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module3/c/CPackage$module3_c$*.class out/production/module3/c/CPackage.class +out/production/module3/c/Module3_c.class End of files Compiling files: module3/src/module3_c.kt End of files Cleaning output files: -out/production/module2/b/BPackage$module2_b$*.class out/production/module2/b/BPackage.class +out/production/module2/b/Module2_b.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log index 6fabb2be215..4b8f2ce15de 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$bar$*.class +out/production/module/test/Bar.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index 38c3e40467d..3231a7e0e4f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class -out/production/module/test/TestPackage$usage$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/b.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 38c3e40467d..3231a7e0e4f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class -out/production/module/test/TestPackage$usage$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/b.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index aec0fb80c88..8b44b97716e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 830fd9d2ae7..7d0f02c00a4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index c56d69d0001..0f0bb774f44 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/a/APackage$a$*$foo$1.class -out/production/module/a/APackage$a$*.class +out/production/module/a/A$foo$1.class +out/production/module/a/A.class out/production/module/a/APackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index eafec833b17..5ea037dc95a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,7 +6,7 @@ src/inline.kt End of files Cleaning output files: out/production/module/inline/Klass.class -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index e3cde4f577a..b3ac0aae802 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -4,7 +4,7 @@ End of files Compiling files: End of files Cleaning output files: -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -16,7 +16,7 @@ Compiling files: src/A.kt End of files Cleaning output files: -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 22a85136d38..4ab778caaff 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -5,8 +5,8 @@ Compiling files: src/class.kt End of files Cleaning output files: -out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index 65aedde795b..bd1fda0f4ea 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 1e9444f5d38..24a112c76b4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ Expecting an expression Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class +out/production/module/Fun.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index a6026278652..b328af8e3a5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/_DefaultPackage$other$*.class +out/production/module/Other.class out/production/module/_DefaultPackage.class End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class End of files Compiling files: src/usage.kt @@ -13,7 +13,7 @@ Expecting an expression Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class +out/production/module/Fun.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index f9cd95a4773..ed7c4295733 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/_DefaultPackage$other$*.class -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Other.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -12,7 +12,19 @@ Expecting an expression Cleaning output files: -out/production/module/_DefaultPackage$fun$*.class +out/production/module/Fun.class +End of files +Compiling files: +src/fun.kt +src/other.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/Fun.class +out/production/module/Usage.class +out/production/module/_DefaultPackage.class +out/production/module/new/NewPackage.class +out/production/module/new/Other.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log new file mode 100644 index 00000000000..35b980c31f6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -0,0 +1,29 @@ +Cleaning output files: +out/production/module/B.class +out/production/module/Usage.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/other.kt +src/usage.kt +End of files +COMPILATION FAILED +Expecting an expression + + +Compiling files: +src/other.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/A.class +out/production/module/Usage.class +out/production/module/_DefaultPackage.class +out/production/module/new/LikePart.class +out/production/module/new/NewPackage.class +End of files +Compiling files: +src/fun.kt +src/likePart.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt new file mode 100644 index 00000000000..3788dbbcbc2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/fun.kt @@ -0,0 +1,4 @@ +class A { + fun f() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt new file mode 100644 index 00000000000..b6b9ec3ee76 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/likePart.kt @@ -0,0 +1,5 @@ +package new + +fun f() { + +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt new file mode 100644 index 00000000000..6633b42e5b8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt @@ -0,0 +1,5 @@ +class B { + fun f() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 new file mode 100644 index 00000000000..25a4443267c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/other.kt.new.1 @@ -0,0 +1,7 @@ +package new + +class B { + fun f() { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt new file mode 100644 index 00000000000..214714c7c0e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt @@ -0,0 +1,6 @@ +import new.* + +fun main(args: Array) { + A().f() + B().f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 new file mode 100644 index 00000000000..5379a61c3e8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.1 @@ -0,0 +1,6 @@ +import new.* + +fun main(args: Array) { + B().f( + A().f( +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 new file mode 100644 index 00000000000..0ccf0889261 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/usage.kt.new.2 @@ -0,0 +1,5 @@ +import new.* +fun main(args: Array) { + A().f() + B().f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index da0ddacad97..5613d7fe110 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun2$*.class +out/production/module/test/Fun2.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index 8cdfe7c6de1..659c2dbb504 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 9e65adcda6c..225764441db 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,7 +1,7 @@ Cleaning output files: +out/production/module/test/Const.class out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class -out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 74e194ec93c..9104d731416 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/_DefaultPackage$a$*.class +out/production/module/A.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 4e18829e5c5..0ad6529ee73 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index f7973c4cece..d65d2dd1b90 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index e7e60e954c6..d2714d00b68 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 288ef01ba57..a61ed9b58f5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/bar/BarPackage$c$*.class out/production/module/bar/BarPackage.class -out/production/module/foo/FooPackage$b$*.class +out/production/module/bar/C.class +out/production/module/foo/B.class out/production/module/foo/FooPackage.class End of files Compiling files: @@ -9,9 +9,14 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/foo/FooPackage$a$*.class +out/production/module/bar/B.class +out/production/module/bar/BarPackage.class +out/production/module/foo/A.class +out/production/module/foo/C.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt +src/b.kt +src/c.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 64909e968ed..397ce32b0a9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun2$*.class +out/production/module/test/Fun2.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 3e5f9e4f172..39f5f52c58e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 624837de297..8c8a8c204d6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class -out/production/module/test/TestPackage$b$*.class +out/production/module/test/A.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index 31233b36691..496646cc7ba 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index 38fe179639a..9b19bca18bb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*$foo$X.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A$foo$X.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index c7370bec287..10ae55fd3fc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/b/BPackage$b2$*.class +out/production/module/b/B2.class out/production/module/b/BPackage.class End of files Compiling files: src/a2.kt End of files Cleaning output files: -out/production/module/a/APackage$a1$*.class +out/production/module/a/A1.class out/production/module/a/APackage.class -out/production/module/b/BPackage$b1$*.class +out/production/module/b/B1.class out/production/module/b/BPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index 830fd9d2ae7..7d0f02c00a4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index 6d8c334b1ef..b66392a883c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -9,7 +9,7 @@ End of files Cleaning output files: out/production/module/klass/Klass.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index 7cb5f4c6a48..e43a40c534a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$const$*.class +out/production/module/test/Const.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 88792b62b39..1cae0774d42 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -2,7 +2,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index c6c913124c1..1d91a602d06 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,14 +1,17 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/newName/B.class +out/production/module/newName/NewNamePackage.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt +src/b.kt End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index df9c0c9e3f5..7b94d3dff7d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,13 +8,13 @@ End of files Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index e6ae4266a50..106bcb3840d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/other/OtherPackage$other$*.class +out/production/module/other/Other.class out/production/module/other/OtherPackage.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/other/OtherPackage$other$*.class +out/production/module/other/Other.class out/production/module/other/OtherPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index e9168f05540..3cb42f701db 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index edacd856bb9..4c1244a1678 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index 1d578c6afff..d12f6912c76 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/Inline.class out/production/module/inline/InlinePackage.class -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/Usage.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index edacd856bb9..4c1244a1678 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 510015c0156..e265035bf65 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index fc781a99d2d..0b5d2a4a551 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,17 +1,24 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files +Cleaning output files: +out/production/module/test2/A.class +out/production/module/test2/Test2Package.class +End of files +Compiling files: +src/a.kt +End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test2/Test2Package$a$*.class +out/production/module/test2/A.class out/production/module/test2/Test2Package.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 449c2b5fdd7..14a46382a5e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class End of files Compiling files: End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index b605f561a83..e96c01ed671 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$prop2$*.class +out/production/module/test/Prop2.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 4b0a58ace9a..55a4a60b263 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt End of files Cleaning output files: -out/production/module/test/TestPackage$usage$*.class out/production/module/test/TestPackage.class +out/production/module/test/Usage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 74244f566b2..4148bf5ec4f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,7 +1,14 @@ Cleaning output files: -out/production/module/foo/FooPackage$a$*.class +out/production/module/foo/A.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt End of files +Cleaning output files: +out/production/module/bar/A.class +out/production/module/bar/BarPackage.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index d6788707583..cd0fd87d4e0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/outer/nested/NestedPackage$nested$*$main$1.class -out/production/module/outer/nested/NestedPackage$nested$*.class +out/production/module/outer/nested/Nested$main$1.class +out/production/module/outer/nested/Nested.class out/production/module/outer/nested/NestedPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index 560795823cd..bee7dcaa35e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 4e18829e5c5..0ad6529ee73 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 314bb5ebad4..8fdaf9f5191 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -6,11 +6,11 @@ src/TheClass.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/_DefaultPackage$usage$*.class +out/production/module/UsageInKotlin.class out/production/module/_DefaultPackage.class End of files Compiling files: -src/usage.kt +src/usageInKotlin.kt End of files Compiling files: src/Usage.java diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usage.kt rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/usageInKotlin.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index 392e88adfbd..f0ef53e7b51 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -2,7 +2,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ src/Foo.kt src/usage.kt End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -22,7 +22,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 7d8a70153b1..83446a96350 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -8,11 +8,11 @@ src/TheClass.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/_DefaultPackage$usage$*.class +out/production/module/UsageInKotlin.class out/production/module/_DefaultPackage.class End of files Compiling files: -src/usage.kt +src/usageInKotlin.kt End of files Compiling files: src/Usage.java diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usage.kt rename to jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/usageInKotlin.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index 38e5605bee9..088504b2487 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -5,7 +5,7 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index 3a58b62b68c..dcda0f53cf0 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/JavaClass.class -out/production/module/_DefaultPackage$usage$*.class +out/production/module/Usage.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index ab1f7d8e3de..00ecbd8664a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -5,9 +5,9 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/_DefaultPackage$willBeResolvedToOther$*$willBeResolvedToOther$1.class -out/production/module/_DefaultPackage$willBeResolvedToOther$*.class -out/production/module/_DefaultPackage$willBeUnresolved$*.class +out/production/module/WillBeResolvedToOther$willBeResolvedToOther$1.class +out/production/module/WillBeResolvedToOther.class +out/production/module/WillBeUnresolved.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index d46aaad630c..a0a8e61a9e3 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -5,11 +5,11 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: +out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpression.class +out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteral.class out/production/module/_DefaultPackage$sam$SamInterface$*.class -out/production/module/_DefaultPackage$usageWithFunctionExpression$*$usageWithFunctionExpression$a$1.class -out/production/module/_DefaultPackage$usageWithFunctionExpression$*.class -out/production/module/_DefaultPackage$usageWithFunctionLiteral$*$usageWithFunctionLiteral$1.class -out/production/module/_DefaultPackage$usageWithFunctionLiteral$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index f708754c847..93ab0f079cd 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -5,11 +5,11 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: +out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpression.class +out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteral.class out/production/module/_DefaultPackage$sam$SamInterface$*.class -out/production/module/_DefaultPackage$usageWithFunctionExpression$*$usageWithFunctionExpression$a$1.class -out/production/module/_DefaultPackage$usageWithFunctionExpression$*.class -out/production/module/_DefaultPackage$usageWithFunctionLiteral$*$usageWithFunctionLiteral$1.class -out/production/module/_DefaultPackage$usageWithFunctionLiteral$*.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index 2a0d68e2bd0..f3d10e07203 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/fun.kt End of files Cleaning output files: out/production/module/JavaUsage.class -out/production/module/test/TestPackage$other$*.class +out/production/module/test/Other.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index 560795823cd..bee7dcaa35e 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 0433af7364a..1870e29e800 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 6c968a3fcb7..916d6b88043 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index 560795823cd..bee7dcaa35e 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$fun$*.class +out/production/module/test/Fun.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 69cdf6584ff..94afef94da4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$b$*.class +out/production/module/test/B.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/b.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 6fd8bf35799..2b2f8cd5369 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -9,7 +9,7 @@ src/Usage.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/TestPackage$a$*.class +out/production/module/test/A.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index d1da86a26ea..8e7f8310761 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/TestPackage$prop$*.class +out/production/module/test/Prop.class out/production/module/test/TestPackage.class End of files Compiling files: From c61115b2742b3f24db68212b94cfca497df444e2 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 27 Jul 2015 17:38:52 +0300 Subject: [PATCH 0412/1557] Update debug tests & incremental compilation tests depending on part class naming Original commit: 7af88f6797829aec7aa571418f7e0c15f4706193 --- .../incremental/custom/cacheVersionChanged/build.log | 4 ++-- .../cacheVersionChangedAndFileModified/build.log | 6 +++--- .../custom/cacheVersionChangedMultiModule/build.log | 4 ++-- .../circularDependencySamePackageUnchanged/build.log | 2 +- .../circularDependencyTopLevelFunctions/build.log | 4 ++-- .../multiModule/constantValueChanged/build.log | 2 +- .../multiModule/inlineFunctionChanged/build.log | 8 ++++---- .../multiModule/inlineFunctionInlined/build.log | 8 ++++---- .../multiModule/simpleDependency/build.log | 4 ++-- .../multiModule/simpleDependencyUnchanged/build.log | 2 +- .../multiModule/transitiveDependency/build.log | 4 ++-- .../multiModule/transitiveInlining/build.log | 10 +++++----- .../incremental/multiModule/twoDependants/build.log | 6 +++--- .../pureKotlin/accessPrivateMembers/build.log | 4 ++-- .../accessingFunctionsViaPackagePart/build.log | 6 +++--- .../pureKotlin/accessingPropertiesViaField/build.log | 6 +++--- .../incremental/pureKotlin/allConstants/build.log | 6 +++--- .../incremental/pureKotlin/annotations/build.log | 4 ++-- .../pureKotlin/anonymousObjectChanged/build.log | 4 ++-- .../pureKotlin/classInlineFunctionChanged/build.log | 4 ++-- .../incremental/pureKotlin/classRecreated/build.log | 4 ++-- .../pureKotlin/classSignatureChanged/build.log | 4 ++-- .../compilationErrorThenFixedOtherPackage/build.log | 2 +- .../compilationErrorThenFixedSamePackage/build.log | 4 ++-- .../build.log | 6 +++--- .../build.log | 12 ++++++------ .../build.log | 8 ++++---- .../conflictingPlatformDeclarations/build.log | 2 +- .../incremental/pureKotlin/constantRemoved/build.log | 4 ++-- .../pureKotlin/constantsUnchanged/build.log | 4 ++-- .../pureKotlin/defaultArguments/build.log | 4 ++-- .../pureKotlin/dependencyClassReferenced/build.log | 4 ++-- .../pureKotlin/fileWithConstantRemoved/build.log | 4 ++-- .../fileWithInlineFunctionRemoved/build.log | 4 ++-- .../pureKotlin/filesExchangePackages/build.log | 10 +++++----- .../pureKotlin/funRedeclaration/build.log | 2 +- .../pureKotlin/inlineFunctionRemoved/build.log | 4 ++-- .../inlineFunctionsCircularDependency/build.log | 8 ++++---- .../pureKotlin/inlineFunctionsUnchanged/build.log | 4 ++-- .../pureKotlin/localClassChanged/build.log | 4 ++-- .../pureKotlin/multiplePackagesModified/build.log | 6 +++--- .../pureKotlin/optionalParameter/build.log | 4 ++-- .../pureKotlin/ourClassReferenced/build.log | 6 +++--- .../pureKotlin/packageConstantChanged/build.log | 4 ++-- .../pureKotlin/packageFileAdded/build.log | 2 +- .../pureKotlin/packageFileChangedPackage/build.log | 8 ++++---- .../packageFileChangedThenOtherRemoved/build.log | 8 ++++---- .../pureKotlin/packageFileRemoved/build.log | 10 +++++----- .../pureKotlin/packageFilesChangedInTurn/build.log | 6 +++--- .../packageInlineFunctionAccessingField/build.log | 4 ++-- .../packageInlineFunctionChanged/build.log | 8 ++++---- .../packageInlineFunctionFromOurPackage/build.log | 4 ++-- .../pureKotlin/packageRecreated/build.log | 4 ++-- .../packageRecreatedAfterRenaming/build.log | 8 ++++---- .../incremental/pureKotlin/packageRemoved/build.log | 6 +++--- .../pureKotlin/propertyRedeclaration/build.log | 2 +- .../pureKotlin/returnTypeChanged/build.log | 6 +++--- .../pureKotlin/soleFileChangesPackage/build.log | 4 ++-- .../incremental/pureKotlin/subpackage/build.log | 6 +++--- .../topLevelFunctionSameSignature/build.log | 4 ++-- .../pureKotlin/topLevelMembersInTwoFiles/build.log | 4 ++-- .../javaToKotlin/build.log | 4 ++-- .../javaToKotlinAndBack/build.log | 6 +++--- .../kotlinToJava/build.log | 4 ++-- .../javaUsedInKotlin/changeSignature/build.log | 4 ++-- .../javaAndKotlinChangedSimultaneously/build.log | 4 ++-- .../javaUsedInKotlin/methodRenamed/build.log | 6 +++--- .../samConversions/methodAdded/build.log | 8 ++++---- .../samConversions/methodSignatureChanged/build.log | 10 +++++----- .../kotlinUsedInJava/addOptionalParameter/build.log | 4 ++-- .../changeNotUsedSignature/build.log | 4 ++-- .../kotlinUsedInJava/changeSignature/build.log | 4 ++-- .../withJava/kotlinUsedInJava/funRenamed/build.log | 2 +- .../kotlinUsedInJava/notChangeSignature/build.log | 4 ++-- .../onlyTopLevelFunctionInFileRemoved/build.log | 4 ++-- .../kotlinUsedInJava/packageFileAdded/build.log | 2 +- .../kotlinUsedInJava/propertyRenamed/build.log | 2 +- 77 files changed, 191 insertions(+), 191 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log index 4515d41dc9c..20769f534c9 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/A.class -out/production/module/test/B.class +out/production/module/test/AKt.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log index 6a64cdced63..5fe2ba1a018 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log index d171334035e..de5ea860df8 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index fdc98eb8730..5ce22b13f31 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/Module1_a.class +out/production/module1/test/Module1_aKt.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index ffac776c374..7f67ddc3c5c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt @@ -8,7 +8,7 @@ End of files Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 12e559d1298..6d8cb0dfa1b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module1/test/Module1_const.class +out/production/module1/test/Module1_constKt.class out/production/module1/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log index 3e4fd010efb..a1763492476 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class -out/production/module1/inline/Module1_other.class +out/production/module1/inline/Module1_inlineKt.class +out/production/module1/inline/Module1_otherKt.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/Module2_usage.class +out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index 3e4fd010efb..a1763492476 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class +out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inline.class -out/production/module1/inline/Module1_other.class +out/production/module1/inline/Module1_inlineKt.class +out/production/module1/inline/Module1_otherKt.class End of files Compiling files: module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: -out/production/module2/usage/Module2_usage.class +out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index d171334035e..de5ea860df8 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index dab8c472205..c1d19b434c2 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index d171334035e..de5ea860df8 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 6733bf955d1..0b175864d07 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,14 +1,14 @@ Cleaning output files: out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class -out/production/module1/a/Module1_other.class +out/production/module1/a/Module1_aKt.class +out/production/module1/a/Module1_otherKt.class End of files Compiling files: module1/src/module1_a.kt @@ -16,14 +16,14 @@ module1/src/module1_other.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt End of files Cleaning output files: out/production/module3/c/CPackage.class -out/production/module3/c/Module3_c.class +out/production/module3/c/Module3_cKt.class End of files Compiling files: module3/src/module3_c.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index c5045143b2a..a3ec0221636 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,21 +1,21 @@ Cleaning output files: out/production/module1/a/A.class out/production/module1/a/APackage.class -out/production/module1/a/Module1_a.class +out/production/module1/a/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module3/c/CPackage.class -out/production/module3/c/Module3_c.class +out/production/module3/c/Module3_cKt.class End of files Compiling files: module3/src/module3_c.kt End of files Cleaning output files: out/production/module2/b/BPackage.class -out/production/module2/b/Module2_b.class +out/production/module2/b/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log index 4b8f2ce15de..6780d784887 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Bar.class +out/production/module/test/BarKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/bar.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index 3231a7e0e4f..297cb32de76 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/b.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 3231a7e0e4f..297cb32de76 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/b.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 8b44b97716e..e43e3fd039d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -19,4 +19,4 @@ out/production/module/test/Usage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 7d0f02c00a4..0a7519d35c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index 0f0bb774f44..4e900cca87d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/a/A$foo$1.class -out/production/module/a/A.class +out/production/module/a/AKt$foo$1.class +out/production/module/a/AKt.class out/production/module/a/APackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index 5ea037dc95a..907d0503304 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,10 +6,10 @@ src/inline.kt End of files Cleaning output files: out/production/module/inline/Klass.class -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index b3ac0aae802..4272704a502 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -4,7 +4,7 @@ End of files Compiling files: End of files Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -16,7 +16,7 @@ Compiling files: src/A.kt End of files Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 4ab778caaff..d41dbd731a4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -6,8 +6,8 @@ src/class.kt End of files Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index bd1fda0f4ea..2a1d15653e6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 24a112c76b4..7ce32de16cc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index b328af8e3a5..56385078f3a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/Other.class +out/production/module/OtherKt.class out/production/module/_DefaultPackage.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class End of files Compiling files: src/usage.kt @@ -13,7 +13,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index ed7c4295733..30584bfe5d7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/Other.class -out/production/module/Usage.class +out/production/module/OtherKt.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -12,7 +12,7 @@ Expecting an expression Cleaning output files: -out/production/module/Fun.class +out/production/module/FunKt.class End of files Compiling files: src/fun.kt @@ -20,11 +20,11 @@ src/other.kt src/usage.kt End of files Cleaning output files: -out/production/module/Fun.class -out/production/module/Usage.class +out/production/module/FunKt.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class out/production/module/new/NewPackage.class -out/production/module/new/Other.class +out/production/module/new/OtherKt.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index 35b980c31f6..11dbb8afd85 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/B.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -17,13 +17,13 @@ src/usage.kt End of files Cleaning output files: out/production/module/A.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class -out/production/module/new/LikePart.class +out/production/module/new/LikePartKt.class out/production/module/new/NewPackage.class End of files Compiling files: src/fun.kt src/likePart.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 5613d7fe110..dbf64919d99 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun2.class +out/production/module/test/Fun2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index 659c2dbb504..b794167acd1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 225764441db..ac0a61f4a9c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 9104d731416..76c39d54d0e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/A.class +out/production/module/AKt.class out/production/module/_DefaultPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 0ad6529ee73..06ca3a83e53 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index d65d2dd1b90..dc047fca05f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index d2714d00b68..42768060bc9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index a61ed9b58f5..fc4e42b6812 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/bar/BarPackage.class -out/production/module/bar/C.class -out/production/module/foo/B.class +out/production/module/bar/CKt.class +out/production/module/foo/BKt.class out/production/module/foo/FooPackage.class End of files Compiling files: @@ -9,10 +9,10 @@ src/b.kt src/c.kt End of files Cleaning output files: -out/production/module/bar/B.class +out/production/module/bar/BKt.class out/production/module/bar/BarPackage.class -out/production/module/foo/A.class -out/production/module/foo/C.class +out/production/module/foo/AKt.class +out/production/module/foo/CKt.class out/production/module/foo/FooPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 397ce32b0a9..3f3c94dbdc7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun2.class +out/production/module/test/Fun2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 39f5f52c58e..bf3a483e16d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 8c8a8c204d6..e3b5d564721 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,16 +1,16 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test/A.class -out/production/module/test/B.class +out/production/module/test/AKt.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index 496646cc7ba..2181542318d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,8 +1,8 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files Compiling files: src/inline.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index 9b19bca18bb..1cf27b4c6cb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: -out/production/module/test/A$foo$X.class -out/production/module/test/A.class +out/production/module/test/AKt$foo$X.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 10ae55fd3fc..ebde80e9f8e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,14 +1,14 @@ Cleaning output files: -out/production/module/b/B2.class +out/production/module/b/B2Kt.class out/production/module/b/BPackage.class End of files Compiling files: src/a2.kt End of files Cleaning output files: -out/production/module/a/A1.class +out/production/module/a/A1Kt.class out/production/module/a/APackage.class -out/production/module/b/B1.class +out/production/module/b/B1Kt.class out/production/module/b/BPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index 7d0f02c00a4..0a7519d35c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index b66392a883c..8a474953e3a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -9,10 +9,10 @@ End of files Cleaning output files: out/production/module/klass/Klass.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/Klass.kt src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index e43a40c534a..0ecd5a944e3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Const.class +out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -10,4 +10,4 @@ out/production/module/test/Usage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 1cae0774d42..0cc5e507ad6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -2,7 +2,7 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 1d91a602d06..2f4733727ff 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,17 +1,17 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/newName/B.class +out/production/module/newName/BKt.class out/production/module/newName/NewNamePackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index 7b94d3dff7d..61712f9bd6d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,15 +8,15 @@ End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 106bcb3840d..28ab0a7b660 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,13 +1,13 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,9 +17,9 @@ End of files Cleaning output files: -out/production/module/other/Other.class +out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class End of files Compiling files: src/other.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 3cb42f701db..d857bf6ace4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,7 +8,7 @@ End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -17,7 +17,7 @@ End of files Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index 4c1244a1678..b680e49a2b5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index d12f6912c76..6df4bbf3181 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log @@ -1,17 +1,17 @@ Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/inline/Inline.class +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class -out/production/module/usage/Usage.class +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/inline.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index 4c1244a1678..b680e49a2b5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,7 +1,7 @@ Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index e265035bf65..8239640a50e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -8,4 +8,4 @@ End of files Compiling files: src/b.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index 0b5d2a4a551..eeeef4416c8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/test2/A.class +out/production/module/test2/AKt.class out/production/module/test2/Test2Package.class End of files Compiling files: @@ -18,9 +18,9 @@ Compiling files: src/b.kt End of files Cleaning output files: -out/production/module/test2/A.class +out/production/module/test2/AKt.class out/production/module/test2/Test2Package.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 14a46382a5e..80486282e0a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,9 +1,9 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class End of files Compiling files: -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index e96c01ed671..e8a35afbc11 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Prop2.class +out/production/module/test/Prop2Kt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 55a4a60b263..e64dd3eaa61 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,8 +7,8 @@ src/fun.kt End of files Cleaning output files: out/production/module/test/TestPackage.class -out/production/module/test/Usage.class +out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 4148bf5ec4f..40b306dd41e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/foo/A.class +out/production/module/foo/AKt.class out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt End of files Cleaning output files: -out/production/module/bar/A.class +out/production/module/bar/AKt.class out/production/module/bar/BarPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index cd0fd87d4e0..e8060b3d718 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -1,8 +1,8 @@ Cleaning output files: -out/production/module/outer/nested/Nested$main$1.class -out/production/module/outer/nested/Nested.class +out/production/module/outer/nested/NestedKt$main$1.class +out/production/module/outer/nested/NestedKt.class out/production/module/outer/nested/NestedPackage.class End of files Compiling files: src/nested.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 0ad6529ee73..06ca3a83e53 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 8fdaf9f5191..fa9d750b5e4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -6,7 +6,7 @@ src/TheClass.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/UsageInKotlin.class +out/production/module/UsageInKotlinKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -14,4 +14,4 @@ src/usageInKotlin.kt End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index f0ef53e7b51..1a055b6661b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -2,7 +2,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -10,7 +10,7 @@ src/Foo.kt src/usage.kt End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -22,7 +22,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 83446a96350..c3734eac50b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -8,7 +8,7 @@ src/TheClass.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/UsageInKotlin.class +out/production/module/UsageInKotlinKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -16,4 +16,4 @@ src/usageInKotlin.kt End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index 088504b2487..a6aeb64d131 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -5,9 +5,9 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index dcda0f53cf0..2e16f49a6e4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/JavaClass.class -out/production/module/Usage.class +out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files Compiling files: @@ -8,4 +8,4 @@ src/usage.kt End of files Compiling files: src/JavaClass.java -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index 00ecbd8664a..2f97d604bab 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -5,9 +5,9 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: -out/production/module/WillBeResolvedToOther$willBeResolvedToOther$1.class -out/production/module/WillBeResolvedToOther.class -out/production/module/WillBeUnresolved.class +out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class +out/production/module/WillBeResolvedToOtherKt.class +out/production/module/WillBeUnresolvedKt.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index a0a8e61a9e3..d272966842a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -5,10 +5,10 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: -out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class -out/production/module/UsageWithFunctionExpression.class -out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class -out/production/module/UsageWithFunctionLiteral.class +out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpressionKt.class +out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteralKt.class out/production/module/_DefaultPackage$sam$SamInterface$*.class out/production/module/_DefaultPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index 93ab0f079cd..671ce9953c7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -5,14 +5,14 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: -out/production/module/UsageWithFunctionExpression$usageWithFunctionExpression$a$1.class -out/production/module/UsageWithFunctionExpression.class -out/production/module/UsageWithFunctionLiteral$usageWithFunctionLiteral$1.class -out/production/module/UsageWithFunctionLiteral.class +out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class +out/production/module/UsageWithFunctionExpressionKt.class +out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class +out/production/module/UsageWithFunctionLiteralKt.class out/production/module/_DefaultPackage$sam$SamInterface$*.class out/production/module/_DefaultPackage.class End of files Compiling files: src/usageWithFunctionExpression.kt src/usageWithFunctionLiteral.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index f3d10e07203..41ca845b2db 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/fun.kt End of files Cleaning output files: out/production/module/JavaUsage.class -out/production/module/test/Other.class +out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 1870e29e800..174d9b3de64 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -10,4 +10,4 @@ out/production/module/Usage.class End of files Compiling files: src/Usage.java -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 916d6b88043..ad53551c271 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index bee7dcaa35e..a72de562da8 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -1,7 +1,7 @@ Cleaning output files: -out/production/module/test/Fun.class +out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 94afef94da4..9ccd8296e83 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/B.class +out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: @@ -7,7 +7,7 @@ src/b.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 2b2f8cd5369..21340e6e03a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -9,7 +9,7 @@ src/Usage.java End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/A.class +out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 8e7f8310761..66c2da28efa 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Prop.class +out/production/module/test/PropKt.class out/production/module/test/TestPackage.class End of files Compiling files: From a5093f7fd5d4b6323cbd253acab8c9dfea005cc7 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Tue, 18 Aug 2015 15:03:19 +0300 Subject: [PATCH 0413/1557] TODO: support mapping processing in incremental compilation Original commit: 0883781f8cacfd005d576594f6d84747c3d41e98 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 2951f654eb9..99f08de277d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -197,7 +197,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR recompilationDecision = DO_NOTHING } else { - val generatedClasses = generatedFiles as List + val generatedClasses = generatedFiles.filterIsInstance() recompilationDecision = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedClasses) updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) } From b686ef5e67cb8aac5ef67817f67ae8c6d9b8bd9a Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 25 Aug 2015 17:37:01 +0300 Subject: [PATCH 0414/1557] Generate ex-package parts as file facades. Support new facade kind in stub building and incremental compilation. Original commit: e050ff3271b35ed6261360d7788d2e85702cdad9 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index ed13a80f55b..98d10853da4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -35,6 +35,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.name.FqName @@ -169,6 +170,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen JvmAnnotationNames.KotlinClass.Kind.LOCAL_CLASS, JvmAnnotationNames.KotlinClass.Kind.ANONYMOUS_OBJECT -> DO_NOTHING } + header.isCompatibleFileFacadeKind() || header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } From 9373f7eab6b7de42a4d9f4e5744e0d01ed534685 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 19 Aug 2015 17:45:30 +0300 Subject: [PATCH 0415/1557] PackagePartClassUtils converted to Kotlin and refactored Original commit: 5fdfe8df3c00eadbbaf75b37d2bf956ed3f2cba0 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index e6ad036a5ed..709312d0fab 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -701,7 +701,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } } - val packagePartFqName = PackagePartClassUtils.getPackagePartFqName(FqName(packageClassFqName), fakeVirtualFile) + val packagePartFqName = PackagePartClassUtils.getDefaultPartFqName(FqName(packageClassFqName), fakeVirtualFile) return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName)) } From b950dd3d3e22f548f3366f84e090aaa645de279f Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 26 Aug 2015 13:28:34 +0300 Subject: [PATCH 0416/1557] Proper light classes generation in presence of the new file facades. Original commit: b1b845d44d18330b3d7e242cc791c04ffa93701a --- .../jps/build/classFilesComparison/classFilesComparison.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index 7334b17c2ca..4155f6742ca 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -36,6 +36,7 @@ import org.jetbrains.kotlin.serialization.DebugProtoBuf import java.util.Arrays import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind // Set this to true if you want to dump all bytecode (test will fail in this case) @@ -144,7 +145,8 @@ fun classFileToString(classFile: File): String { when { classHeader!!.isCompatiblePackageFacadeKind() -> out.write("\n------ package proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") - + classHeader.isCompatibleFileFacadeKind() -> + out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") classHeader.isCompatibleClassKind() -> out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") From ab611995997e36d04538f5a4a04c37b5984aa83c Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Mon, 31 Aug 2015 14:48:35 +0300 Subject: [PATCH 0417/1557] Generate calls through new minifacades Original commit: 47635c19a2f4c8f7039984ee7580abef4942fd24 --- .../incremental/custom/projectPathCaseChanged/build.log | 2 +- .../custom/projectPathCaseChangedMultiFile/build.log | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log index 7f88bf9c5a4..4ab0fbd82ee 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/Foo.class +out/production/module/FooKt.class out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log index 7f88bf9c5a4..4ab0fbd82ee 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/Foo.class +out/production/module/FooKt.class out/production/module/_DefaultPackage.class End of files Compiling files: From 77487d72b8cf230ad1dd378cc75cdab6f4aea178 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Mon, 31 Aug 2015 15:11:32 +0300 Subject: [PATCH 0418/1557] Jps test fix Original commit: 378740f4be8b3cb8b3a8b12eb11fb971fe46e0ec --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 709312d0fab..81d709444d9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -694,10 +694,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { private fun packagePartClass(moduleName: String, fileName: String, packageClassFqName: String): String { val path = FileUtilRt.toSystemIndependentName(File(workDir, fileName).getAbsolutePath()) - val fakeVirtualFile = object : LightVirtualFile(path) { + val fakeVirtualFile = object : LightVirtualFile(path.substringAfterLast('/')) { override fun getPath(): String { // strip extra "/" from the beginning - return super.getPath().substring(1) + return path.substring(1) } } From 5ed39e37242e3c90fcf23ee88b20414652bdfea1 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 4 Sep 2015 18:30:04 +0300 Subject: [PATCH 0419/1557] Fix incremental compilation for new package parts Original commit: ec62cccb1a379971eb7f55c1083bca611c926b7f --- .../kotlin/jps/build/KotlinBuilder.kt | 22 ++++++++-- .../jps/incremental/IncrementalCacheImpl.kt | 41 +++++++++++++------ 2 files changed, 47 insertions(+), 16 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 99f08de277d..e32d9645cb2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -57,6 +57,7 @@ import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDe import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK +import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache @@ -198,7 +199,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } else { val generatedClasses = generatedFiles.filterIsInstance() - recompilationDecision = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedClasses) + recompilationDecision = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles) updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) } @@ -410,7 +411,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun updateKotlinIncrementalCache( compilationErrors: Boolean, incrementalCaches: Map, - generatedClasses: List + generatedFiles: List ): IncrementalCacheImpl.RecompilationDecision { incrementalCaches.values().forEach { it.saveCacheFormatVersion() } @@ -419,8 +420,19 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } var recompilationDecision = DO_NOTHING - for (generatedClass in generatedClasses) { - val newDecision = incrementalCaches[generatedClass.target]!!.saveFileToCache(generatedClass.sourceFiles, generatedClass.outputClass) + for (generatedFile in generatedFiles) { + val ic = incrementalCaches[generatedFile.target]!! + val newDecision = + if (generatedFile is GeneratedJvmClass) { + ic.saveFileToCache(generatedFile.sourceFiles, generatedFile.outputClass) + } + else if (generatedFile.outputFile.isModuleMappingFile()) { + ic.saveModuleMappingToCache(generatedFile.outputFile) + } + else { + continue + } + recompilationDecision = recompilationDecision.merge(newDecision) } @@ -434,6 +446,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return recompilationDecision } + private fun File.isModuleMappingFile() = extension == ModuleMapping.MAPPING_FILE_EXT && parentFile.name == "META-INF" + // if null is returned, nothing was done private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 98d10853da4..eb0cc335fd1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -33,25 +33,22 @@ import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDe import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAnnotationNames -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils +import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf +import org.jetbrains.kotlin.serialization.deserialization.visibility import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil -import org.jetbrains.kotlin.serialization.deserialization.visibility import org.jetbrains.kotlin.utils.Printer import org.jetbrains.org.objectweb.asm.* import java.io.* import java.security.MessageDigest -import java.util.ArrayList -import java.util.Arrays -import java.util.HashMap +import java.util.* val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" @@ -105,6 +102,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val PACKAGE_PARTS = "package-parts.tab" val SOURCE_TO_CLASSES = "source-to-classes.tab" val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" + + private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) @@ -145,6 +144,12 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen cacheFormatVersion.saveIfNeeded() } + public fun saveModuleMappingToCache(file: File): RecompilationDecision { + protoMap.put(JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME), file.readBytes(), isPackage = false, checkChangesIsOpenPart = false) + dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME) + return DO_NOTHING + } + public fun saveFileToCache(sourceFiles: Collection, kotlinClass: LocalFileKotlinClass): RecompilationDecision { val fileBytes = kotlinClass.getFileContents() val className = JvmClassName.byClassId(kotlinClass.getClassId()) @@ -160,6 +165,15 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen constantsChanged = false, inlinesChanged = false ) + header.isCompatibleFileFacadeKind() -> { + assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } + packagePartMap.addPackagePart(className) + getRecompilationDecision( + protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = true), + constantsChanged = constantsMap.process(className, fileBytes), + inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + ) + } header.isCompatibleClassKind() -> when (header.classKind!!) { JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision( @@ -170,7 +184,6 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen JvmAnnotationNames.KotlinClass.Kind.LOCAL_CLASS, JvmAnnotationNames.KotlinClass.Kind.ANONYMOUS_OBJECT -> DO_NOTHING } - header.isCompatibleFileFacadeKind() || header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } @@ -217,15 +230,19 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return recompilationDecision } - public override fun getObsoletePackageParts(): Collection { + override fun getObsoletePackageParts(): Collection { val obsoletePackageParts = dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") return obsoletePackageParts } - public override fun getPackageData(fqName: String): ByteArray? { - return protoMap[JvmClassName.byFqNameWithoutInnerClasses(PackageClassUtils.getPackageClassFqName(FqName(fqName)))] + override fun getPackagePartData(fqName: String): ByteArray? { + return protoMap[JvmClassName.byInternalName(fqName)] + } + + override fun getModuleMappingData(): ByteArray? { + return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)] } override fun flush(memoryCachesOnly: Boolean) { @@ -306,7 +323,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen ByteArrayExternalizer ) - public fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean): Boolean { + public fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): Boolean { val key = className.getInternalName() val oldData = storage[key] if (Arrays.equals(data, oldData)) { @@ -314,7 +331,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } storage.put(key, data) - if (oldData != null && isOpenPartNotChanged(oldData, data, isPackage)) { + if (oldData != null && checkChangesIsOpenPart && isOpenPartNotChanged(oldData, data, isPackage)) { return false } From 6d76d4a9d07d9c08e69d61bf60d5746b88564aa9 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 3 Sep 2015 17:10:33 +0300 Subject: [PATCH 0420/1557] Save dependencies of kotlin_module in cache Original commit: 01f371021148318567868bb5f85ea3d60fac0f76 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e32d9645cb2..493d1dc8ee6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -427,7 +427,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ic.saveFileToCache(generatedFile.sourceFiles, generatedFile.outputClass) } else if (generatedFile.outputFile.isModuleMappingFile()) { - ic.saveModuleMappingToCache(generatedFile.outputFile) + ic.saveModuleMappingToCache(generatedFile.sourceFiles, generatedFile.outputFile) } else { continue diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index eb0cc335fd1..3e742727652 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -144,9 +144,11 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen cacheFormatVersion.saveIfNeeded() } - public fun saveModuleMappingToCache(file: File): RecompilationDecision { - protoMap.put(JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME), file.readBytes(), isPackage = false, checkChangesIsOpenPart = false) + public fun saveModuleMappingToCache(sourceFiles: Collection, file: File): RecompilationDecision { + val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME) + protoMap.put(jvmClassName, file.readBytes(), isPackage = false, checkChangesIsOpenPart = false) dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME) + sourceFiles.forEach { sourceToClassesMap.addSourceToClass(it, jvmClassName) } return DO_NOTHING } From 13bc63a62fbebf324a6551fbac9582658c24a10b Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 3 Sep 2015 22:51:13 +0300 Subject: [PATCH 0421/1557] Try to detect target for output items using outputDir when sourceFiles is empty Original commit: 879b1a8abb9177790c4a2397bc55ec4d5ca15f51 --- .../kotlin/jps/build/KotlinBuilder.kt | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 493d1dc8ee6..87ae8f8ce63 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -329,23 +329,18 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val representativeTarget = chunk.representativeTarget() for (outputItem in outputItemCollector.getOutputs()) { - var target: ModuleBuildTarget? = null - val sourceFiles = outputItem.getSourceFiles() - val outputFile = outputItem.getOutputFile() - - if (!sourceFiles.isEmpty()) { - target = sourceToTarget[sourceFiles.iterator().next()] - } - - if (target == null) { - target = representativeTarget - } + val sourceFiles = outputItem.sourceFiles + val outputFile = outputItem.outputFile + val target = + sourceFiles.firstOrNull()?.let { sourceToTarget[it] } ?: + chunk.targets.filter { it.outputDir?.let { outputFile.startsWith(it) } ?: false }.singleOrNull() ?: + representativeTarget if (outputFile.getName().endsWith(".class")) { - result.add(GeneratedJvmClass(target!!, sourceFiles, outputFile)) + result.add(GeneratedJvmClass(target, sourceFiles, outputFile)) } else { - result.add(GeneratedFile(target!!, sourceFiles, outputFile)) + result.add(GeneratedFile(target, sourceFiles, outputFile)) } } return result From 721dca2087194881e03513d0250a620c99368906 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 4 Sep 2015 20:54:43 +0300 Subject: [PATCH 0422/1557] Minor fixes in KotlinJpsBuildTest Original commit: 5193e6a1812f58d12d0944e0c84b629d02a16d2a --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 81d709444d9..af284a9b271 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -41,6 +41,7 @@ import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.codegen.AsmUtil +import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.MockLibraryUtil @@ -168,6 +169,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { return outputDirPrefix + classFqName.replace('.', '/') + ".class" } + private fun module(moduleName: String): String { + return "out/production/$moduleName/${JvmCodegenUtil.getMappingFileName(moduleName)}" + } + public fun mergeArrays(vararg stringArrays: Array): Array { val result = HashSet() for (array in stringArrays) { @@ -390,13 +395,13 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")) checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) - checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage"))) + checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage"), module("kotlinProject"))) checkWhen(del("src/main.kt"), arrayOf("src/Bar.kt", "src/boo.kt"), mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), packageClasses("kotlinProject", "src/Bar.kt", "foo.FooPackage"), packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), arrayOf(klass("kotlinProject", "foo.Bar")))) assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class") checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) - checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage"))) + checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage"), module("kotlinProject"))) } public fun testKotlinProjectTwoFilesInOnePackage() { @@ -405,7 +410,11 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")) checkWhen(touch("src/test2.kt"), null, packageClasses("kotlinProject", "src/test2.kt", "_DefaultPackage")) - checkWhen(arrayOf(del("src/test1.kt"), del("src/test2.kt")), NOTHING, arrayOf(packagePartClass("kotlinProject", "src/test1.kt", "_DefaultPackage"), packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"), klass("kotlinProject", "_DefaultPackage"))) + checkWhen(arrayOf(del("src/test1.kt"), del("src/test2.kt")), NOTHING, + arrayOf(packagePartClass("kotlinProject", "src/test1.kt", "_DefaultPackage"), + packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"), + klass("kotlinProject", "_DefaultPackage"), + module("kotlinProject"))) assertFilesNotExistInOutput(myProject.getModules().get(0), "_DefaultPackage.class") } @@ -689,7 +698,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } private fun packageClasses(moduleName: String, fileName: String, packageClassFqName: String): Array { - return arrayOf(klass(moduleName, packageClassFqName), packagePartClass(moduleName, fileName, packageClassFqName)) + return arrayOf(module(moduleName), klass(moduleName, packageClassFqName), packagePartClass(moduleName, fileName, packageClassFqName)) } private fun packagePartClass(moduleName: String, fileName: String, packageClassFqName: String): String { From d9b5b94a0ec98b3ee99a1a7db7aaeb2b7acd0082 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 4 Sep 2015 20:55:16 +0300 Subject: [PATCH 0423/1557] Minor: fix testdata files (build.log files for incremental compilation tests) Original commit: 2f9f5a3cd583a861be281c6028c7fbd719d25767 --- .../testData/incremental/custom/cacheVersionChanged/build.log | 1 + .../custom/cacheVersionChangedAndFileModified/build.log | 1 + .../custom/cacheVersionChangedMultiModule/build.log | 2 ++ .../incremental/custom/projectPathCaseChanged/build.log | 3 ++- .../custom/projectPathCaseChangedMultiFile/build.log | 3 ++- .../circularDependencySamePackageUnchanged/build.log | 1 + .../multiModule/circularDependencyTopLevelFunctions/build.log | 2 ++ .../incremental/multiModule/constantValueChanged/build.log | 1 + .../incremental/multiModule/inlineFunctionChanged/build.log | 3 +++ .../incremental/multiModule/inlineFunctionInlined/build.log | 3 +++ .../incremental/multiModule/simpleDependency/build.log | 2 ++ .../multiModule/simpleDependencyUnchanged/build.log | 1 + .../incremental/multiModule/transitiveDependency/build.log | 2 ++ .../incremental/multiModule/transitiveInlining/build.log | 4 ++++ .../testData/incremental/multiModule/twoDependants/build.log | 3 +++ .../incremental/pureKotlin/accessPrivateMembers/build.log | 1 + .../pureKotlin/accessingFunctionsViaPackagePart/build.log | 1 + .../pureKotlin/accessingPropertiesViaField/build.log | 1 + .../testData/incremental/pureKotlin/allConstants/build.log | 2 ++ .../testData/incremental/pureKotlin/annotations/build.log | 1 + .../incremental/pureKotlin/anonymousObjectChanged/build.log | 1 + .../pureKotlin/classInlineFunctionChanged/build.log | 1 + .../testData/incremental/pureKotlin/classRecreated/build.log | 2 ++ .../incremental/pureKotlin/classSignatureChanged/build.log | 1 + .../compilationErrorThenFixedOtherPackage/build.log | 1 + .../pureKotlin/compilationErrorThenFixedSamePackage/build.log | 1 + .../compilationErrorThenFixedWithPhantomPart/build.log | 1 + .../compilationErrorThenFixedWithPhantomPart2/build.log | 2 ++ .../compilationErrorThenFixedWithPhantomPart3/build.log | 2 ++ .../pureKotlin/conflictingPlatformDeclarations/build.log | 1 + .../testData/incremental/pureKotlin/constantRemoved/build.log | 1 + .../incremental/pureKotlin/constantsUnchanged/build.log | 1 + .../incremental/pureKotlin/defaultArguments/build.log | 1 + .../pureKotlin/dependencyClassReferenced/build.log | 1 + .../incremental/pureKotlin/fileWithConstantRemoved/build.log | 2 ++ .../pureKotlin/fileWithInlineFunctionRemoved/build.log | 2 ++ .../incremental/pureKotlin/filesExchangePackages/build.log | 2 ++ .../incremental/pureKotlin/funRedeclaration/build.log | 1 + .../incremental/pureKotlin/inlineFunctionRemoved/build.log | 2 ++ .../pureKotlin/inlineFunctionsCircularDependency/build.log | 2 ++ .../incremental/pureKotlin/inlineFunctionsUnchanged/build.log | 1 + .../incremental/pureKotlin/localClassChanged/build.log | 1 + .../incremental/pureKotlin/multiplePackagesModified/build.log | 2 ++ .../incremental/pureKotlin/optionalParameter/build.log | 1 + .../incremental/pureKotlin/ourClassReferenced/build.log | 2 ++ .../incremental/pureKotlin/packageConstantChanged/build.log | 1 + .../incremental/pureKotlin/packageFileAdded/build.log | 1 + .../pureKotlin/packageFileChangedPackage/build.log | 2 ++ .../pureKotlin/packageFileChangedThenOtherRemoved/build.log | 3 +++ .../incremental/pureKotlin/packageFileRemoved/build.log | 3 +++ .../pureKotlin/packageFilesChangedInTurn/build.log | 3 +++ .../pureKotlin/packageInlineFunctionAccessingField/build.log | 1 + .../pureKotlin/packageInlineFunctionChanged/build.log | 2 ++ .../pureKotlin/packageInlineFunctionFromOurPackage/build.log | 1 + .../incremental/pureKotlin/packageRecreated/build.log | 1 + .../pureKotlin/packageRecreatedAfterRenaming/build.log | 3 +++ .../testData/incremental/pureKotlin/packageRemoved/build.log | 1 + .../incremental/pureKotlin/propertyRedeclaration/build.log | 1 + .../incremental/pureKotlin/returnTypeChanged/build.log | 2 ++ .../incremental/pureKotlin/soleFileChangesPackage/build.log | 2 ++ .../testData/incremental/pureKotlin/subpackage/build.log | 1 + .../pureKotlin/topLevelFunctionSameSignature/build.log | 1 + .../pureKotlin/topLevelMembersInTwoFiles/build.log | 1 + .../convertBetweenJavaAndKotlin/javaToKotlin/build.log | 1 + .../convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log | 3 +++ .../convertBetweenJavaAndKotlin/kotlinToJava/build.log | 1 + .../withJava/javaUsedInKotlin/changeSignature/build.log | 1 + .../javaAndKotlinChangedSimultaneously/build.log | 1 + .../withJava/javaUsedInKotlin/methodRenamed/build.log | 1 + .../javaUsedInKotlin/samConversions/methodAdded/build.log | 1 + .../samConversions/methodSignatureChanged/build.log | 1 + .../withJava/kotlinUsedInJava/addOptionalParameter/build.log | 2 ++ .../kotlinUsedInJava/changeNotUsedSignature/build.log | 1 + .../withJava/kotlinUsedInJava/changeSignature/build.log | 1 + .../withJava/kotlinUsedInJava/funRenamed/build.log | 1 + .../withJava/kotlinUsedInJava/notChangeSignature/build.log | 1 + .../onlyTopLevelFunctionInFileRemoved/build.log | 2 ++ .../withJava/kotlinUsedInJava/packageFileAdded/build.log | 1 + .../withJava/kotlinUsedInJava/propertyRenamed/build.log | 1 + 79 files changed, 121 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log index 20769f534c9..133a92b78d7 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/BKt.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log index 5fe2ba1a018..b8a67cc5ad0 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log index de5ea860df8..e41875375b3 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class @@ -7,6 +8,7 @@ Compiling files: module1/src/module1_a.kt End of files Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log index 4ab0fbd82ee..c3579d28234 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log @@ -1,7 +1,8 @@ Cleaning output files: out/production/module/FooKt.class +out/production/module/META-INF/module.kotlin_module out/production/module/_DefaultPackage.class End of files Compiling files: src/foo.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log index 4ab0fbd82ee..c3579d28234 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log @@ -1,7 +1,8 @@ Cleaning output files: out/production/module/FooKt.class +out/production/module/META-INF/module.kotlin_module out/production/module/_DefaultPackage.class End of files Compiling files: src/foo.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index 5ce22b13f31..28e47e17c31 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/Module1_aKt.class out/production/module1/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index 7f67ddc3c5c..b7aa90ed99f 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files @@ -6,6 +7,7 @@ Compiling files: module2/src/module2_b.kt End of files Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 6d8cb0dfa1b..1b7e8ed2b89 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/Module1_constKt.class out/production/module1/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log index a1763492476..f03d1cfe3b9 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineKt.class End of files @@ -6,6 +7,7 @@ Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineKt.class out/production/module1/inline/Module1_otherKt.class @@ -15,6 +17,7 @@ module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index a1763492476..f03d1cfe3b9 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineKt.class End of files @@ -6,6 +7,7 @@ Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineKt.class out/production/module1/inline/Module1_otherKt.class @@ -15,6 +17,7 @@ module1/src/module1_inline.kt module1/src/module1_other.kt End of files Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index de5ea860df8..e41875375b3 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class @@ -7,6 +8,7 @@ Compiling files: module1/src/module1_a.kt End of files Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index c1d19b434c2..b50d1ef170e 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index de5ea860df8..e41875375b3 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class @@ -7,6 +8,7 @@ Compiling files: module1/src/module1_a.kt End of files Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 0b175864d07..2e4f60176ff 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files @@ -6,6 +7,7 @@ Compiling files: module1/src/module1_a.kt End of files Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class out/production/module1/a/Module1_otherKt.class @@ -15,6 +17,7 @@ module1/src/module1_a.kt module1/src/module1_other.kt End of files Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files @@ -22,6 +25,7 @@ Compiling files: module2/src/module2_b.kt End of files Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module out/production/module3/c/CPackage.class out/production/module3/c/Module3_cKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index a3ec0221636..17c93731c9a 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class @@ -7,6 +8,7 @@ Compiling files: module1/src/module1_a.kt End of files Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module out/production/module3/c/CPackage.class out/production/module3/c/Module3_cKt.class End of files @@ -14,6 +16,7 @@ Compiling files: module3/src/module3_c.kt End of files Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log index 6780d784887..33259938e4a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BarKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index 297cb32de76..f6d869802f6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 297cb32de76..f6d869802f6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index e43e3fd039d..95a68077542 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files @@ -8,6 +9,7 @@ End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 0a7519d35c5..1bcd74bbd73 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index 4e900cca87d..aea6b8eb09c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/a/AKt$foo$1.class out/production/module/a/AKt.class out/production/module/a/APackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index 907d0503304..ccd83f9121d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -5,6 +5,7 @@ Compiling files: src/inline.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/inline/Klass.class out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index 4272704a502..7bfb2824b7b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -4,6 +4,7 @@ End of files Compiling files: End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files @@ -16,6 +17,7 @@ Compiling files: src/A.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index d41dbd731a4..5b708acde85 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -5,6 +5,7 @@ Compiling files: src/class.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index 2a1d15653e6..608d27e154b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 7ce32de16cc..b86cc3d98f3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index 56385078f3a..e6135ea0ed4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/OtherKt.class out/production/module/_DefaultPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index 30584bfe5d7..568e98b633e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/OtherKt.class out/production/module/UsageKt.class out/production/module/_DefaultPackage.class @@ -21,6 +22,7 @@ src/usage.kt End of files Cleaning output files: out/production/module/FunKt.class +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class out/production/module/new/NewPackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index 11dbb8afd85..707e820c744 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -1,5 +1,6 @@ Cleaning output files: out/production/module/B.class +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files @@ -17,6 +18,7 @@ src/usage.kt End of files Cleaning output files: out/production/module/A.class +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class out/production/module/new/LikePartKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index dbf64919d99..cf4dad56113 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/Fun2Kt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index b794167acd1..d510d134860 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index ac0a61f4a9c..5dd5778c4da 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 76c39d54d0e..e5452954f7d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,5 +1,6 @@ Cleaning output files: out/production/module/AKt.class +out/production/module/META-INF/module.kotlin_module out/production/module/_DefaultPackage.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 06ca3a83e53..83f507ec501 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index dc047fca05f..0c625ec403a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,10 +1,12 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index 42768060bc9..733faeb31b6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,10 +1,12 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index fc4e42b6812..4607a5f8ce2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/bar/BarPackage.class out/production/module/bar/CKt.class out/production/module/foo/BKt.class @@ -9,6 +10,7 @@ src/b.kt src/c.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/bar/BKt.class out/production/module/bar/BarPackage.class out/production/module/foo/AKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 3f3c94dbdc7..c0a3c02fc3e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/Fun2Kt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index bf3a483e16d..119e029fc18 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/inline.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index e3b5d564721..8c256b559ec 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/a.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/BKt.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index 2181542318d..a54e1398ea7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index 1cf27b4c6cb..a1d5fac9789 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt$foo$X.class out/production/module/test/AKt.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index ebde80e9f8e..3f1c854ccdd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/b/B2Kt.class out/production/module/b/BPackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/a2.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/a/A1Kt.class out/production/module/a/APackage.class out/production/module/b/B1Kt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index 0a7519d35c5..1bcd74bbd73 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index 8a474953e3a..6330ba2d73d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files @@ -8,6 +9,7 @@ End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/klass/Klass.class out/production/module/test/AKt.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index 0ecd5a944e3..ff943c45dd4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 0cc5e507ad6..e72ed20e75d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -2,6 +2,7 @@ Compiling files: src/b.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 2f4733727ff..9256b8b2c7b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/b.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/newName/BKt.class out/production/module/newName/NewNamePackage.class out/production/module/test/AKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index 61712f9bd6d..c3202a992c2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files @@ -8,12 +9,14 @@ End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 28ab0a7b660..3dba902abd0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,10 +1,12 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class out/production/module/test/AKt.class @@ -17,6 +19,7 @@ End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class out/production/module/other/OtherPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index d857bf6ace4..756a5208a1e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files @@ -8,6 +9,7 @@ End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files @@ -17,6 +19,7 @@ End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index b680e49a2b5..64f2485efca 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log index 6df4bbf3181..232ca78ca70 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/inline.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class out/production/module/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index b680e49a2b5..64f2485efca 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 8239640a50e..447eefc6d66 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index eeeef4416c8..e9ec0e2d294 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/a.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test2/AKt.class out/production/module/test2/Test2Package.class End of files @@ -18,6 +20,7 @@ Compiling files: src/b.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test2/AKt.class out/production/module/test2/Test2Package.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 80486282e0a..031eab48aa7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index e8a35afbc11..57f8be71b1c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/Prop2Kt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index e64dd3eaa61..608f0f77e0d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/fun.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 40b306dd41e..6472fc74235 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/foo/AKt.class out/production/module/foo/FooPackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/a.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/bar/AKt.class out/production/module/bar/BarPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index e8060b3d718..7da9e935797 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/outer/nested/NestedKt$main$1.class out/production/module/outer/nested/NestedKt.class out/production/module/outer/nested/NestedPackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index a72de562da8..29261260d2e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 06ca3a83e53..83f507ec501 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index fa9d750b5e4..feb87ecf426 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -5,6 +5,7 @@ Compiling files: src/TheClass.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class out/production/module/UsageInKotlinKt.class out/production/module/_DefaultPackage.class diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index 1a055b6661b..9470b88ba7f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -2,6 +2,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files @@ -10,6 +11,7 @@ src/Foo.kt src/usage.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files @@ -22,6 +24,7 @@ Cleaning output files: out/production/module/Foo.class End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index c3734eac50b..f522c2a2bec 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -7,6 +7,7 @@ Compiling files: src/TheClass.java End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class out/production/module/UsageInKotlinKt.class out/production/module/_DefaultPackage.class diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index a6aeb64d131..877c6f84715 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -5,6 +5,7 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index 2e16f49a6e4..56ac4ce0b6a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -1,5 +1,6 @@ Cleaning output files: out/production/module/JavaClass.class +out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class out/production/module/_DefaultPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index 2f97d604bab..fe3532de44b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -5,6 +5,7 @@ Compiling files: src/JavaClass.java End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class out/production/module/WillBeResolvedToOtherKt.class out/production/module/WillBeUnresolvedKt.class diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index d272966842a..5f216e1066a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -5,6 +5,7 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class out/production/module/UsageWithFunctionExpressionKt.class out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index 671ce9953c7..23dd90da9ab 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -5,6 +5,7 @@ Compiling files: src/SamInterface.java End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class out/production/module/UsageWithFunctionExpressionKt.class out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index 41ca845b2db..9e3013e637b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files @@ -7,6 +8,7 @@ src/fun.kt End of files Cleaning output files: out/production/module/JavaUsage.class +out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index a72de562da8..29261260d2e 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 174d9b3de64..9781fe64b23 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index ad53551c271..0f156cfb7d7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index a72de562da8..29261260d2e 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class out/production/module/test/TestPackage.class End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 9ccd8296e83..60d621e6d83 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files @@ -6,6 +7,7 @@ Compiling files: src/b.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class out/production/module/test/AKt.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 21340e6e03a..ed15d46e2c7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -8,6 +8,7 @@ Compiling files: src/Usage.java End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class out/production/module/test/AKt.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 66c2da28efa..75f34f18a29 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -1,4 +1,5 @@ Cleaning output files: +out/production/module/META-INF/module.kotlin_module out/production/module/test/PropKt.class out/production/module/test/TestPackage.class End of files From c6606281623db4ce56bb3ddfe2d07a7e0f950417 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 7 Jul 2015 22:04:25 +0300 Subject: [PATCH 0424/1557] Add simple inline incremental compilation test cases Original commit: 32c041d4db1278316f5deddbce43ea0bbca56922 --- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../pureKotlin/inlineFunction/build.log | 14 ++++++++++++++ .../pureKotlin/inlineFunction/inline.kt | 5 +++++ .../pureKotlin/inlineFunction/inline.kt.new | 6 ++++++ .../pureKotlin/inlineFunction/notUsesInline.kt | 5 +++++ .../pureKotlin/inlineFunction/usesInline.kt | 5 +++++ .../inlineTwoFunctionsOneChanged/build.log | 14 ++++++++++++++ .../inlineTwoFunctionsOneChanged/inline.kt | 9 +++++++++ .../inlineTwoFunctionsOneChanged/inline.kt.new | 9 +++++++++ .../inlineTwoFunctionsOneChanged/usesF.kt | 5 +++++ .../inlineTwoFunctionsOneChanged/usesG.kt | 5 +++++ 11 files changed, 89 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 92823c69b89..ba638ed4bbd 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -281,6 +281,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineFunction") + public void testInlineFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunction/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); @@ -299,6 +305,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineTwoFunctionsOneChanged") + public void testInlineTwoFunctionsOneChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); + doTest(fileName); + } + @TestMetadata("localClassChanged") public void testLocalClassChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log new file mode 100644 index 00000000000..1fa543e2cc6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$usesInline$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usesInline.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt new file mode 100644 index 00000000000..c0f66d312a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(body: () -> Unit) { + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new new file mode 100644 index 00000000000..80d71e901a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new @@ -0,0 +1,6 @@ +package inline + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt new file mode 100644 index 00000000000..1de875e529a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + test() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt new file mode 100644 index 00000000000..5e87e229853 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt @@ -0,0 +1,5 @@ +package usage + +fun test() { + inline.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log new file mode 100644 index 00000000000..793ddfbc22e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$usesG$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usesG.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt new file mode 100644 index 00000000000..a07b33dfcec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt @@ -0,0 +1,9 @@ +package inline + +inline fun f() { + println("inline.f") +} + +inline fun g() { + println("inline.g") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new new file mode 100644 index 00000000000..7240b129efe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/inline.kt.new @@ -0,0 +1,9 @@ +package inline + +inline fun f() { + println("inline.f") +} + +inline fun g() { + println("inline.g changed") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt new file mode 100644 index 00000000000..12833a24b04 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesF.kt @@ -0,0 +1,5 @@ +package usage + +fun testF() { + inline.f() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt new file mode 100644 index 00000000000..a24221d378a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/usesG.kt @@ -0,0 +1,5 @@ +package usage + +fun testG() { + inline.g() +} From ed234ae7b5f6d5478beacfe8d5c5342d065eb064 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 1 Sep 2015 21:18:07 +0300 Subject: [PATCH 0425/1557] Save info about inlined calls to incremental caches Original commit: 64cc75c1babbdd680a13b47f5e9332565dd1d05e --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 3e742727652..42d082f9a76 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -22,6 +22,7 @@ import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.jps.incremental.storage.BuildDataManager +import org.jetbrains.jps.incremental.storage.OneToManyPathsMapping import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation @@ -38,6 +39,7 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf @@ -102,6 +104,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val PACKAGE_PARTS = "package-parts.tab" val SOURCE_TO_CLASSES = "source-to-classes.tab" val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" + val HAS_INLINE_TO = "has-inline-to.tab" private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } @@ -113,11 +116,20 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private val packagePartMap = PackagePartMap() private val sourceToClassesMap = SourceToClassesMap() private val dirtyOutputClassesMap = DirtyOutputClassesMap() + private val hasInlineTo = OneToManyPathsMapping(File(baseDir, HAS_INLINE_TO)) private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap, sourceToClassesMap, dirtyOutputClassesMap) private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) + private val inlineRegistering = object : InlineRegistering { + override fun registerInline(fromPath: String, toPath: String) { + hasInlineTo.appendData(fromPath, toPath) + } + } + + override fun getInlineRegistering(): InlineRegistering = inlineRegistering + TestOnly public fun dump(): String { return maps.map { it.dump() }.join("\n\n") From c150468dc1ee263e51d90c75e6da7e0a6c7ec518 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 22 Jul 2015 16:24:26 +0300 Subject: [PATCH 0426/1557] Recompile files dependent on inline relationship Right now, it's always recompiles dependent files, even if inline function has not been changed. Original commit: 52a8fe018b372d9e0bf953493a5b06c574ed31dd --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 15 +++++++++++++++ .../jps/incremental/IncrementalCacheImpl.kt | 6 ++++-- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 87ae8f8ce63..a2c4db818c7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -212,6 +212,21 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (IncrementalCompilation.ENABLED) { + val inlines = THashSet(FileUtil.PATH_HASHING_STRATEGY) + + for ((target, files) in filesToCompile.entrySet()) { + val cacheImpl = incrementalCaches[target] + files.forEach { + cacheImpl?.getInlineDependencies(it)?.let { + inlines.addAll(it) + } + } + } + + inlines.forEach { + FSOperations.markDirty(context, CompilationRound.NEXT, File(it)) + } + when (recompilationDecision) { RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS -> { allCompiledFiles.clear() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 42d082f9a76..4f6d9df889a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -29,7 +29,6 @@ import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK import org.jetbrains.kotlin.load.java.JvmAbi @@ -144,9 +143,12 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } + public fun getInlineDependencies(sourceFile: File): Collection { + return hasInlineTo.getState(sourceFile.getCanonicalPath()) ?: emptyList() + } + private fun getRecompilationDecision(protoChanged: Boolean, constantsChanged: Boolean, inlinesChanged: Boolean) = when { - inlinesChanged -> RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS constantsChanged -> RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS protoChanged -> RECOMPILE_OTHER_KOTLIN_IN_CHUNK else -> DO_NOTHING From d6fd20e429c9bc0b4f728d8a1104ac9cb8e3dd4f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 23 Jul 2015 22:24:44 +0300 Subject: [PATCH 0427/1557] Add ClassToSourceMap to incremental caches Original commit: 2842b74dd8614e025f18d1c7201df13ab419254f --- .../jps/incremental/IncrementalCacheImpl.kt | 60 ++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 4f6d9df889a..7c19e33b7cc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -16,7 +16,9 @@ package org.jetbrains.kotlin.jps.incremental +import com.intellij.openapi.util.io.FileUtil import com.intellij.util.io.* +import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths @@ -102,6 +104,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val INLINE_FUNCTIONS = "inline-functions.tab" val PACKAGE_PARTS = "package-parts.tab" val SOURCE_TO_CLASSES = "source-to-classes.tab" + val CLASS_TO_SOURCES = "class-to-sources.tab" val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" val HAS_INLINE_TO = "has-inline-to.tab" @@ -114,6 +117,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private val inlineFunctionsMap = InlineFunctionsMap() private val packagePartMap = PackagePartMap() private val sourceToClassesMap = SourceToClassesMap() + private val classToSourcesMap = ClassToSourcesMap() private val dirtyOutputClassesMap = DirtyOutputClassesMap() private val hasInlineTo = OneToManyPathsMapping(File(baseDir, HAS_INLINE_TO)) @@ -137,7 +141,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen public fun markOutputClassesDirty(removedAndCompiledSources: List) { for (sourceFile in removedAndCompiledSources) { val classes = sourceToClassesMap[sourceFile] - classes.forEach { dirtyOutputClassesMap.markDirty(it.getInternalName()) } + classes.forEach { + dirtyOutputClassesMap.markDirty(it.internalName) + classToSourcesMap.remove(it) + } sourceToClassesMap.clearOutputsForSource(sourceFile) } @@ -172,7 +179,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val header = kotlinClass.getClassHeader() dirtyOutputClassesMap.notDirty(className.getInternalName()) - sourceFiles.forEach { sourceToClassesMap.addSourceToClass(it, className) } + sourceFiles.forEach { + sourceToClassesMap.addSourceToClass(it, className) + classToSourcesMap.add(className, it) + } val decision = when { header.isCompatiblePackageFacadeKind() -> @@ -679,6 +689,30 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: List) = value.toString() } + private inner class ClassToSourcesMap : BasicMap>() { + override fun createMap(): PersistentHashMap> = PersistentHashMap( + File(baseDir, CLASS_TO_SOURCES), + EnumeratorStringDescriptor(), + PathCollectionExternalizer + ) + + public fun get(className: JvmClassName): Collection? = + storage[className.internalName]?.let { it.map { path -> File(path) } } + + public fun add(className: JvmClassName, sourceFile: File) { + storage.appendData(className.internalName) { out -> + IOUtil.writeUTF(out, FileUtil.normalize(sourceFile.normalizedPath)) + } + } + + public fun remove(className: JvmClassName) { + storage.remove(className.internalName) + } + + override fun dumpValue(value: Collection): String = + value.join(", ") + } + private inner class DirtyOutputClassesMap : BasicMap() { override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, DIRTY_OUTPUT_CLASSES), @@ -767,3 +801,25 @@ private object StringListExternalizer : DataExternalizer> { return result } } + +private object PathCollectionExternalizer : DataExternalizer> { + override fun save(out: DataOutput, value: Collection) { + for (str in value) { + IOUtil.writeUTF(out, str) + } + } + + override fun read(`in`: DataInput): Collection { + val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) + val stream = `in` as DataInputStream + while (stream.available() > 0) { + val str = IOUtil.readUTF(stream) + result.add(str) + } + return result + } +} + +private val File.normalizedPath: String + get() = FileUtil.toSystemIndependentName(canonicalPath) + From b35e7c1f5bfb9c64939d98f4f569030deb9e4ee0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 23 Jul 2015 22:29:05 +0300 Subject: [PATCH 0428/1557] Minor: rename SourceToClassesMap#addSourceToClass->add addSourceToClass is confusing, because in fact this function is appending to SourceToClassesMap Original commit: 701585c0b68bb52132d6773ddc2fb300700f89d1 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7c19e33b7cc..8d199357bc3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -180,7 +180,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen dirtyOutputClassesMap.notDirty(className.getInternalName()) sourceFiles.forEach { - sourceToClassesMap.addSourceToClass(it, className) + sourceToClassesMap.add(it, className) classToSourcesMap.add(className, it) } @@ -678,7 +678,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen storage.remove(sourceFile.getAbsolutePath()) } - public fun addSourceToClass(sourceFile: File, className: JvmClassName) { + public fun add(sourceFile: File, className: JvmClassName) { storage.appendData(sourceFile.getAbsolutePath(), { out -> IOUtil.writeUTF(out, className.getInternalName()) }) } From 7fc81ca605e1ead48a87665a48a4b0d01393f611 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 23 Jul 2015 22:48:11 +0300 Subject: [PATCH 0429/1557] Minor: removed clear method from DirtyOutputClassesMap It's already has clean method from BasicMap Original commit: f2295676bf42700b7a5cabf92c97f10d82f5abeb --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 8d199357bc3..c048b0bad76 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -252,7 +252,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen constantsMap.remove(className) inlineFunctionsMap.remove(className) } - dirtyOutputClassesMap.clear() + dirtyOutputClassesMap.clean() return recompilationDecision } @@ -732,10 +732,6 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen return storage.getAllKeysWithExistingMapping() } - public fun clear() { - storage.getAllKeysWithExistingMapping().forEach { storage.remove(it) } - } - override fun dumpValue(value: Boolean) = "" } From 8b99bd70023a795675c67d6d43143b2573349b98 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 24 Jul 2015 15:34:02 +0300 Subject: [PATCH 0430/1557] Save changed functions to incremental cache Original commit: f0d7ee4cdfc11e4ff202f8805e081b0073c27214 --- .../jps/incremental/IncrementalCacheImpl.kt | 61 +++++++++++++++---- 1 file changed, 48 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index c048b0bad76..832f427cc05 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -42,6 +42,7 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.visibility @@ -106,6 +107,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val SOURCE_TO_CLASSES = "source-to-classes.tab" val CLASS_TO_SOURCES = "class-to-sources.tab" val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" + val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions.tab" val HAS_INLINE_TO = "has-inline-to.tab" private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT @@ -119,6 +121,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private val sourceToClassesMap = SourceToClassesMap() private val classToSourcesMap = ClassToSourcesMap() private val dirtyOutputClassesMap = DirtyOutputClassesMap() + private val dirtyInlineFunctionsMap = DirtyInlineFunctionsMap() private val hasInlineTo = OneToManyPathsMapping(File(baseDir, HAS_INLINE_TO)) private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap, sourceToClassesMap, dirtyOutputClassesMap) @@ -253,6 +256,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen inlineFunctionsMap.remove(className) } dirtyOutputClassesMap.clean() + dirtyInlineFunctionsMap.clean() return recompilationDecision } @@ -550,7 +554,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen InlineFunctionsMapExternalizer ) - private fun getInlineFunctionsMap(bytes: ByteArray): Map? { + private fun getInlineFunctionsMap(bytes: ByteArray): Map { val result = HashMap() ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { @@ -579,31 +583,44 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen }, 0) - return if (result.isEmpty()) null else result + return result } public fun process(className: JvmClassName, bytes: ByteArray): Boolean { return put(className, getInlineFunctionsMap(bytes)) } - private fun put(className: JvmClassName, inlineFunctionsMap: Map?): Boolean { - val key = className.getInternalName() + private fun put(className: JvmClassName, newMap: Map): Boolean { + val internalName = className.internalName + val oldMap = storage[internalName] ?: emptyMap() - val oldMap = storage[key] - if (oldMap == inlineFunctionsMap) { - return false + val changed = hashSetOf() + val allFunctions = oldMap.keySet() + newMap.keySet() + + for (fn in allFunctions) { + val oldHash = oldMap[fn] + val newHash = newMap[fn] + + if (oldHash != newHash) { + changed.add(fn) + } } - if (inlineFunctionsMap != null) { - storage.put(key, inlineFunctionsMap) + + when { + newMap.isNotEmpty() -> storage.put(internalName, newMap) + else -> storage.remove(internalName) } - else { - storage.remove(key) + + if (changed.isNotEmpty()) { + dirtyInlineFunctionsMap.put(className, changed.toList()) + return true } - return true + + return false } public fun remove(className: JvmClassName) { - put(className, null) + storage.remove(className.internalName) } override fun dumpValue(value: Map): String { @@ -735,6 +752,24 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: Boolean) = "" } + private inner class DirtyInlineFunctionsMap : BasicMap>() { + override fun createMap(): PersistentHashMap> = PersistentHashMap( + File(baseDir, DIRTY_INLINE_FUNCTIONS), + EnumeratorStringDescriptor(), + StringListExternalizer + ) + + public fun getEntries(): Map> = + storage.allKeysWithExistingMapping + .toMap(JvmClassName::byInternalName) { storage[it] } + + public fun put(className: JvmClassName, changedFunctions: List) { + storage.put(className.internalName, changedFunctions) + } + + override fun dumpValue(value: List) = value.toString() + } + enum class RecompilationDecision { DO_NOTHING, RECOMPILE_OTHER_KOTLIN_IN_CHUNK, From 6a7f1bc7febcea6e88fa672e7d9d7b92db6bef0d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 24 Jul 2015 16:14:41 +0300 Subject: [PATCH 0431/1557] Generalize InlineFunctionsMapExternalizer Original commit: dfa5a420e6a6ac9177a90ff958d72923ebe63085 --- .../jps/incremental/IncrementalCacheImpl.kt | 62 +++++++++++-------- 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 832f427cc05..21c13627434 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -551,7 +551,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun createMap(): PersistentHashMap> = PersistentHashMap( File(baseDir, INLINE_FUNCTIONS), EnumeratorStringDescriptor(), - InlineFunctionsMapExternalizer + StringToLongMapExternalizer ) private fun getInlineFunctionsMap(bytes: ByteArray): Map { @@ -637,31 +637,6 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - private object InlineFunctionsMapExternalizer : DataExternalizer> { - override fun save(out: DataOutput, map: Map?) { - out.writeInt(map!!.size()) - for (name in map.keySet()) { - IOUtil.writeString(name, out) - out.writeLong(map[name]!!) - } - } - - override fun read(`in`: DataInput): Map? { - val size = `in`.readInt() - val map = HashMap(size) - - repeat(size) { - val name = IOUtil.readString(`in`)!! - val value = `in`.readLong() - - map[name] = value - } - - return map - } - - } - private inner class PackagePartMap : BasicMap() { override fun createMap(): PersistentHashMap = PersistentHashMap( File(baseDir, PACKAGE_PARTS), @@ -819,6 +794,41 @@ private object ByteArrayExternalizer : DataExternalizer { } } +private abstract class StringMapExternalizer : DataExternalizer> { + override fun save(out: DataOutput, map: Map?) { + out.writeInt(map!!.size()) + + for ((key, value) in map.entrySet()) { + IOUtil.writeString(key, out) + writeValue(out, value) + } + } + + override fun read(`in`: DataInput): Map? { + val size = `in`.readInt() + val map = HashMap(size) + + repeat(size) { + val name = IOUtil.readString(`in`)!! + map[name] = readValue(`in`) + } + + return map + } + + protected abstract fun writeValue(output: DataOutput, value: T) + protected abstract fun readValue(input: DataInput): T +} + +private object StringToLongMapExternalizer : StringMapExternalizer() { + override fun readValue(input: DataInput): Long = + input.readLong() + + override fun writeValue(output: DataOutput, value: Long) { + output.writeLong(value) + } +} + private object StringListExternalizer : DataExternalizer> { override fun save(out: DataOutput, value: List) { value.forEach { IOUtil.writeUTF(out, it) } From eb10544231c5b0f5eef1a03a3eafa861e93c62b6 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 24 Jul 2015 23:37:34 +0300 Subject: [PATCH 0432/1557] Recompile only files that call changed inline functions Original commit: e0419f956e5f440b934c0db5fc0b9305be524f47 --- .../kotlin/jps/build/KotlinBuilder.kt | 17 +-- .../jps/incremental/IncrementalCacheImpl.kt | 133 ++++++++++++++++-- 2 files changed, 126 insertions(+), 24 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a2c4db818c7..e97fd22dc98 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -212,21 +212,16 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (IncrementalCompilation.ENABLED) { - val inlines = THashSet(FileUtil.PATH_HASHING_STRATEGY) + val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } - for ((target, files) in filesToCompile.entrySet()) { - val cacheImpl = incrementalCaches[target] - files.forEach { - cacheImpl?.getInlineDependencies(it)?.let { - inlines.addAll(it) - } + for (cache in caches) { + val filesToReinline = cache.getFilesToReinline() + + filesToReinline.forEach { + FSOperations.markDirty(context, CompilationRound.NEXT, it) } } - inlines.forEach { - FSOperations.markDirty(context, CompilationRound.NEXT, File(it)) - } - when (recompilationDecision) { RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS -> { allCompiledFiles.clear() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 21c13627434..e6379540b79 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -18,13 +18,13 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.openapi.util.io.FileUtil import com.intellij.util.io.* +import gnu.trove.THashMap import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.jps.incremental.storage.BuildDataManager -import org.jetbrains.jps.incremental.storage.OneToManyPathsMapping import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation @@ -122,15 +122,21 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen private val classToSourcesMap = ClassToSourcesMap() private val dirtyOutputClassesMap = DirtyOutputClassesMap() private val dirtyInlineFunctionsMap = DirtyInlineFunctionsMap() - private val hasInlineTo = OneToManyPathsMapping(File(baseDir, HAS_INLINE_TO)) + private val hasInlineTo = InlineFunctionsFilesMap() - private val maps = listOf(protoMap, constantsMap, inlineFunctionsMap, packagePartMap, sourceToClassesMap, dirtyOutputClassesMap) + private val maps = listOf(protoMap, + constantsMap, + inlineFunctionsMap, + packagePartMap, + sourceToClassesMap, + dirtyOutputClassesMap, + hasInlineTo) private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val inlineRegistering = object : InlineRegistering { - override fun registerInline(fromPath: String, toPath: String) { - hasInlineTo.appendData(fromPath, toPath) + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { + hasInlineTo.add(fromPath, jvmSignature, toPath) } } @@ -153,8 +159,20 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - public fun getInlineDependencies(sourceFile: File): Collection { - return hasInlineTo.getState(sourceFile.getCanonicalPath()) ?: emptyList() + public fun getFilesToReinline(): Collection { + val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) + + for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { + val sourceFiles = classToSourcesMap[className] + + for (sourceFile in sourceFiles) { + val targetFiles = functions.flatMap { hasInlineTo[sourceFile, it] } + result.addAll(targetFiles) + } + } + + dirtyInlineFunctionsMap.clean() + return result.map { File(it) } } private fun getRecompilationDecision(protoChanged: Boolean, constantsChanged: Boolean, inlinesChanged: Boolean) = @@ -256,7 +274,6 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen inlineFunctionsMap.remove(className) } dirtyOutputClassesMap.clean() - dirtyInlineFunctionsMap.clean() return recompilationDecision } @@ -295,7 +312,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen public fun contains(key: String): Boolean = storage.containsMapping(key) - public fun clean() { + public open fun clean() { try { storage.close() } @@ -310,7 +327,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - public fun flush(memoryCachesOnly: Boolean) { + public open fun flush(memoryCachesOnly: Boolean) { if (memoryCachesOnly) { if (storage.isDirty()) { storage.dropMemoryCaches() @@ -688,12 +705,12 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen PathCollectionExternalizer ) - public fun get(className: JvmClassName): Collection? = - storage[className.internalName]?.let { it.map { path -> File(path) } } + public fun get(className: JvmClassName): Collection = + storage[className.internalName] ?: emptySet() public fun add(className: JvmClassName, sourceFile: File) { storage.appendData(className.internalName) { out -> - IOUtil.writeUTF(out, FileUtil.normalize(sourceFile.normalizedPath)) + IOUtil.writeUTF(out, sourceFile.normalizedPath) } } @@ -745,6 +762,72 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: List) = value.toString() } + /** + * Mapping: sourceFile->{inlineFunction->...targetFiles} + * + * Where: + * * sourceFile - path to some kotlin source + * * inlineFunction - jvmSignature of some inline function in source file + * * target files - collection of files inlineFunction has been inlined to + */ + private inner class InlineFunctionsFilesMap : BasicMap>>() { + + private val cache = THashMap>>(FileUtil.PATH_HASHING_STRATEGY) + + override fun createMap(): PersistentHashMap>> = PersistentHashMap( + File(baseDir, HAS_INLINE_TO), + PathStringDescriptor(), + StringToPathsMapExternalizer + ) + + public fun add(sourcePath: String, jvmSignature: String, targetPath: String) { + val mapping = getMappingFromCache(sourcePath.normalizedPath) + val paths = mapping.getOrPut(jvmSignature) { THashSet(FileUtil.PATH_HASHING_STRATEGY) } + paths.add(targetPath.normalizedPath) + } + + public fun get(sourceFile: String, jvmSignature: String): Collection { + val normalizedPath = sourceFile.normalizedPath + if (normalizedPath !in cache && !storage.containsMapping(normalizedPath)) return emptySet() + + val mapping = getMappingFromCache(normalizedPath) + return mapping[jvmSignature] ?: emptySet() + } + + override fun clean() { + cache.clear() + super.clean() + } + + override fun flush(memoryCachesOnly: Boolean) { + for ((k, v) in cache) { + storage.put(k, v) + } + + super.flush(memoryCachesOnly) + } + + // TODO: fix + override fun dumpValue(value: Map>) = + value.toString() + + private fun getMappingFromCache(sourcePath: String): MutableMap> { + val cachedValue = cache[sourcePath] + if (cachedValue != null) return cachedValue + + val mapping = storage[sourcePath] ?: emptyMap() + val mutableMapping = hashMapOf>() + + for ((k, v) in mapping) { + val paths = THashSet(v, FileUtil.PATH_HASHING_STRATEGY) + mutableMapping[k] = paths + } + + cache[sourcePath] = mutableMapping + return mutableMapping + } + } + enum class RecompilationDecision { DO_NOTHING, RECOMPILE_OTHER_KOTLIN_IN_CHUNK, @@ -829,6 +912,27 @@ private object StringToLongMapExternalizer : StringMapExternalizer() { } } +private object StringToPathsMapExternalizer : StringMapExternalizer>() { + override fun readValue(input: DataInput): Collection { + val size = input.readInt() + val paths = THashSet(size, FileUtil.PATH_HASHING_STRATEGY) + + repeat(size) { + paths.add(IOUtil.readUTF(input)) + } + + return paths + } + + override fun writeValue(output: DataOutput, value: Collection) { + output.writeInt(value.size()) + + for (path in value) { + IOUtil.writeUTF(output, path) + } + } +} + private object StringListExternalizer : DataExternalizer> { override fun save(out: DataOutput, value: List) { value.forEach { IOUtil.writeUTF(out, it) } @@ -864,3 +968,6 @@ private object PathCollectionExternalizer : DataExternalizer> private val File.normalizedPath: String get() = FileUtil.toSystemIndependentName(canonicalPath) +private val String.normalizedPath: String + get() = FileUtil.toSystemIndependentName(this) + From ec0ebd9a2e07a9708f5ad609aa8969f932eab5ed Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 27 Jul 2015 16:19:57 +0300 Subject: [PATCH 0433/1557] Fix value dump for incremental caches Original commit: cf35be90aab388f98cea5917e566893569e38c20 --- .../jps/incremental/IncrementalCacheImpl.kt | 54 +++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index e6379540b79..941d864db0b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -492,18 +492,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen put(className, null) } - override fun dumpValue(value: Map): String { - return StringBuilder { - append("{") - for (key in value.keySet().sort()) { - if (length() != 1) { - append(", ") - } - append("$key -> ${value[key]}") - } - append("}") - }.toString() - } + override fun dumpValue(value: Map): String = + value.dumpMap(Any::toString) } private object ConstantsMapExternalizer : DataExternalizer> { @@ -640,18 +630,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen storage.remove(className.internalName) } - override fun dumpValue(value: Map): String { - return StringBuilder { - append("{") - for (key in value.keySet().sort()) { - if (length() != 1) { - append(", ") - } - append("$key -> ${java.lang.Long.toHexString(value[key]!!)}") - } - append("}") - }.toString() - } + override fun dumpValue(value: Map): String = + value.dumpMap { java.lang.Long.toHexString(it) } } private inner class PackagePartMap : BasicMap() { @@ -719,7 +699,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } override fun dumpValue(value: Collection): String = - value.join(", ") + value.dumpCollection() } private inner class DirtyOutputClassesMap : BasicMap() { @@ -759,7 +739,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen storage.put(className.internalName, changedFunctions) } - override fun dumpValue(value: List) = value.toString() + override fun dumpValue(value: List) = + value.dumpCollection() } /** @@ -807,9 +788,8 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen super.flush(memoryCachesOnly) } - // TODO: fix override fun dumpValue(value: Map>) = - value.toString() + value.dumpMap { it.dumpCollection() } private fun getMappingFromCache(sourcePath: String): MutableMap> { val cachedValue = cache[sourcePath] @@ -971,3 +951,21 @@ private val File.normalizedPath: String private val String.normalizedPath: String get() = FileUtil.toSystemIndependentName(this) +TestOnly +private fun , V> Map.dumpMap(dumpValue: (V)->String): String = + StringBuilder { + append("{") + for (key in keySet().sort()) { + if (length() != 1) { + append(", ") + } + + val value = get(key)?.let(dumpValue) ?: "null" + append("$key -> $value") + } + append("}") + }.toString() + +TestOnly +public fun > Collection.dumpCollection(): String = + "[${sort().map(Any::toString).join(", ")}]" From 1308ff2a3b284e76c6ac89faa81f670434b351a7 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 27 Jul 2015 20:04:34 +0300 Subject: [PATCH 0434/1557] Move persistent map parameters to constructor Original commit: 80094605eb71857f6db2a82b3f43c850c33bdded --- .../jps/incremental/IncrementalCacheImpl.kt | 87 +++++-------------- 1 file changed, 23 insertions(+), 64 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 941d864db0b..4a60aaa597a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -305,10 +305,14 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen maps.forEach { it.close () } } - private abstract class BasicMap { - protected var storage: PersistentHashMap = createMap() + private inner abstract class BasicMap( + private val storageName: String, + private val valueExternalizer: DataExternalizer + ) { + protected open val keyDescriptor: KeyDescriptor + get() = EnumeratorStringDescriptor() - protected abstract fun createMap(): PersistentHashMap + protected var storage: PersistentHashMap = createMap() public fun contains(key: String): Boolean = storage.containsMapping(key) @@ -361,14 +365,12 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } protected abstract fun dumpValue(value: V): String + + private fun createMap(): PersistentHashMap = + PersistentHashMap(File(baseDir, storageName), keyDescriptor, valueExternalizer) } - private inner class ProtoMap : BasicMap() { - override fun createMap(): PersistentHashMap = PersistentHashMap( - File(baseDir, PROTO_MAP), - EnumeratorStringDescriptor(), - ByteArrayExternalizer - ) + private inner class ProtoMap : BasicMap(PROTO_MAP, ByteArrayExternalizer) { public fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): Boolean { val key = className.getInternalName() @@ -445,13 +447,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - private inner class ConstantsMap : BasicMap>() { - override fun createMap(): PersistentHashMap> = PersistentHashMap( - File(baseDir, CONSTANTS_MAP), - EnumeratorStringDescriptor(), - ConstantsMapExternalizer - ) - + private inner class ConstantsMap : BasicMap>(CONSTANTS_MAP, ConstantsMapExternalizer) { private fun getConstantsMap(bytes: ByteArray): Map? { val result = HashMap() @@ -554,13 +550,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - private inner class InlineFunctionsMap : BasicMap>() { - override fun createMap(): PersistentHashMap> = PersistentHashMap( - File(baseDir, INLINE_FUNCTIONS), - EnumeratorStringDescriptor(), - StringToLongMapExternalizer - ) - + private inner class InlineFunctionsMap : BasicMap>(INLINE_FUNCTIONS, StringToLongMapExternalizer) { private fun getInlineFunctionsMap(bytes: ByteArray): Map { val result = HashMap() @@ -634,13 +624,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen value.dumpMap { java.lang.Long.toHexString(it) } } - private inner class PackagePartMap : BasicMap() { - override fun createMap(): PersistentHashMap = PersistentHashMap( - File(baseDir, PACKAGE_PARTS), - EnumeratorStringDescriptor(), - BooleanDataDescriptor.INSTANCE - ) - + private inner class PackagePartMap : BasicMap(PACKAGE_PARTS, BooleanDataDescriptor.INSTANCE) { public fun addPackagePart(className: JvmClassName) { storage.put(className.getInternalName(), true) } @@ -656,12 +640,9 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: Boolean) = "" } - private inner class SourceToClassesMap : BasicMap>() { - override fun createMap(): PersistentHashMap> = PersistentHashMap( - File(baseDir, SOURCE_TO_CLASSES), - PathStringDescriptor.INSTANCE, - StringListExternalizer - ) + private inner class SourceToClassesMap : BasicMap>(SOURCE_TO_CLASSES, StringListExternalizer) { + override val keyDescriptor: KeyDescriptor + get() = PathStringDescriptor.INSTANCE public fun clearOutputsForSource(sourceFile: File) { storage.remove(sourceFile.getAbsolutePath()) @@ -678,13 +659,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: List) = value.toString() } - private inner class ClassToSourcesMap : BasicMap>() { - override fun createMap(): PersistentHashMap> = PersistentHashMap( - File(baseDir, CLASS_TO_SOURCES), - EnumeratorStringDescriptor(), - PathCollectionExternalizer - ) - + private inner class ClassToSourcesMap : BasicMap>(CLASS_TO_SOURCES, PathCollectionExternalizer) { public fun get(className: JvmClassName): Collection = storage[className.internalName] ?: emptySet() @@ -702,13 +677,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen value.dumpCollection() } - private inner class DirtyOutputClassesMap : BasicMap() { - override fun createMap(): PersistentHashMap = PersistentHashMap( - File(baseDir, DIRTY_OUTPUT_CLASSES), - EnumeratorStringDescriptor(), - BooleanDataDescriptor.INSTANCE - ) - + private inner class DirtyOutputClassesMap : BasicMap(DIRTY_OUTPUT_CLASSES, BooleanDataDescriptor.INSTANCE) { public fun markDirty(className: String) { storage.put(className, true) } @@ -724,13 +693,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: Boolean) = "" } - private inner class DirtyInlineFunctionsMap : BasicMap>() { - override fun createMap(): PersistentHashMap> = PersistentHashMap( - File(baseDir, DIRTY_INLINE_FUNCTIONS), - EnumeratorStringDescriptor(), - StringListExternalizer - ) - + private inner class DirtyInlineFunctionsMap : BasicMap>(DIRTY_INLINE_FUNCTIONS, StringListExternalizer) { public fun getEntries(): Map> = storage.allKeysWithExistingMapping .toMap(JvmClassName::byInternalName) { storage[it] } @@ -751,16 +714,12 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen * * inlineFunction - jvmSignature of some inline function in source file * * target files - collection of files inlineFunction has been inlined to */ - private inner class InlineFunctionsFilesMap : BasicMap>>() { + private inner class InlineFunctionsFilesMap : BasicMap>>(HAS_INLINE_TO, StringToPathsMapExternalizer) { + override val keyDescriptor: KeyDescriptor + get() = PathStringDescriptor() private val cache = THashMap>>(FileUtil.PATH_HASHING_STRATEGY) - override fun createMap(): PersistentHashMap>> = PersistentHashMap( - File(baseDir, HAS_INLINE_TO), - PathStringDescriptor(), - StringToPathsMapExternalizer - ) - public fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val mapping = getMappingFromCache(sourcePath.normalizedPath) val paths = mapping.getOrPut(jvmSignature) { THashSet(FileUtil.PATH_HASHING_STRATEGY) } From 20db45c3cf15606dc57acd21baf581ca9d9d7b41 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 28 Jul 2015 15:28:48 +0300 Subject: [PATCH 0435/1557] Pass BasicMap storageFile using constructor It makes possible to extract BasicMap outside of IncrementalCacheImpl and use it for some maps, that share between build targets Original commit: 47019dd51f9814b0d42c1f93712689cccf6cc824 --- .../jps/incremental/IncrementalCacheImpl.kt | 44 ++++++++++--------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 4a60aaa597a..a397ff69908 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -114,15 +114,19 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) - private val protoMap = ProtoMap() - private val constantsMap = ConstantsMap() - private val inlineFunctionsMap = InlineFunctionsMap() - private val packagePartMap = PackagePartMap() - private val sourceToClassesMap = SourceToClassesMap() - private val classToSourcesMap = ClassToSourcesMap() - private val dirtyOutputClassesMap = DirtyOutputClassesMap() - private val dirtyInlineFunctionsMap = DirtyInlineFunctionsMap() - private val hasInlineTo = InlineFunctionsFilesMap() + + private val String.storageFile: File + get() = File(baseDir, this) + + private val protoMap = ProtoMap(PROTO_MAP.storageFile) + private val constantsMap = ConstantsMap(CONSTANTS_MAP.storageFile) + private val inlineFunctionsMap = InlineFunctionsMap(INLINE_FUNCTIONS.storageFile) + private val packagePartMap = PackagePartMap(PACKAGE_PARTS.storageFile) + private val sourceToClassesMap = SourceToClassesMap(SOURCE_TO_CLASSES.storageFile) + private val classToSourcesMap = ClassToSourcesMap(CLASS_TO_SOURCES.storageFile) + private val dirtyOutputClassesMap = DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile) + private val dirtyInlineFunctionsMap = DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile) + private val hasInlineTo = InlineFunctionsFilesMap(HAS_INLINE_TO.storageFile) private val maps = listOf(protoMap, constantsMap, @@ -306,7 +310,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } private inner abstract class BasicMap( - private val storageName: String, + private val storageFile: File, private val valueExternalizer: DataExternalizer ) { protected open val keyDescriptor: KeyDescriptor @@ -367,10 +371,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen protected abstract fun dumpValue(value: V): String private fun createMap(): PersistentHashMap = - PersistentHashMap(File(baseDir, storageName), keyDescriptor, valueExternalizer) + PersistentHashMap(storageFile, keyDescriptor, valueExternalizer) } - private inner class ProtoMap : BasicMap(PROTO_MAP, ByteArrayExternalizer) { + private inner class ProtoMap(storageFile: File) : BasicMap(storageFile, ByteArrayExternalizer) { public fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): Boolean { val key = className.getInternalName() @@ -447,7 +451,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - private inner class ConstantsMap : BasicMap>(CONSTANTS_MAP, ConstantsMapExternalizer) { + private inner class ConstantsMap(storageFile: File) : BasicMap>(storageFile, ConstantsMapExternalizer) { private fun getConstantsMap(bytes: ByteArray): Map? { val result = HashMap() @@ -550,7 +554,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } - private inner class InlineFunctionsMap : BasicMap>(INLINE_FUNCTIONS, StringToLongMapExternalizer) { + private inner class InlineFunctionsMap(storageFile: File) : BasicMap>(storageFile, StringToLongMapExternalizer) { private fun getInlineFunctionsMap(bytes: ByteArray): Map { val result = HashMap() @@ -624,7 +628,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen value.dumpMap { java.lang.Long.toHexString(it) } } - private inner class PackagePartMap : BasicMap(PACKAGE_PARTS, BooleanDataDescriptor.INSTANCE) { + private inner class PackagePartMap(storageFile: File) : BasicMap(storageFile, BooleanDataDescriptor.INSTANCE) { public fun addPackagePart(className: JvmClassName) { storage.put(className.getInternalName(), true) } @@ -640,7 +644,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: Boolean) = "" } - private inner class SourceToClassesMap : BasicMap>(SOURCE_TO_CLASSES, StringListExternalizer) { + private inner class SourceToClassesMap(storageFile: File) : BasicMap>(storageFile, StringListExternalizer) { override val keyDescriptor: KeyDescriptor get() = PathStringDescriptor.INSTANCE @@ -659,7 +663,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: List) = value.toString() } - private inner class ClassToSourcesMap : BasicMap>(CLASS_TO_SOURCES, PathCollectionExternalizer) { + private inner class ClassToSourcesMap(storageFile: File) : BasicMap>(storageFile, PathCollectionExternalizer) { public fun get(className: JvmClassName): Collection = storage[className.internalName] ?: emptySet() @@ -677,7 +681,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen value.dumpCollection() } - private inner class DirtyOutputClassesMap : BasicMap(DIRTY_OUTPUT_CLASSES, BooleanDataDescriptor.INSTANCE) { + private inner class DirtyOutputClassesMap(storageFile: File) : BasicMap(storageFile, BooleanDataDescriptor.INSTANCE) { public fun markDirty(className: String) { storage.put(className, true) } @@ -693,7 +697,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun dumpValue(value: Boolean) = "" } - private inner class DirtyInlineFunctionsMap : BasicMap>(DIRTY_INLINE_FUNCTIONS, StringListExternalizer) { + private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicMap>(storageFile, StringListExternalizer) { public fun getEntries(): Map> = storage.allKeysWithExistingMapping .toMap(JvmClassName::byInternalName) { storage[it] } @@ -714,7 +718,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen * * inlineFunction - jvmSignature of some inline function in source file * * target files - collection of files inlineFunction has been inlined to */ - private inner class InlineFunctionsFilesMap : BasicMap>>(HAS_INLINE_TO, StringToPathsMapExternalizer) { + private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>>(storageFile, StringToPathsMapExternalizer) { override val keyDescriptor: KeyDescriptor get() = PathStringDescriptor() From a7cf6bbf9a7da26cf9ecc017c37f48855b19f094 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 28 Jul 2015 15:32:49 +0300 Subject: [PATCH 0436/1557] Extract BasicMap from IncrementalCacheImpl Original commit: bde78c2df29788235c6619838ceee1cafda68f42 --- .../jps/incremental/IncrementalCacheImpl.kt | 77 ++-------------- .../jps/incremental/storage/BasicMap.kt | 91 +++++++++++++++++++ 2 files changed, 100 insertions(+), 68 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index a397ff69908..baca0cc86b0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -17,7 +17,10 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.openapi.util.io.FileUtil -import com.intellij.util.io.* +import com.intellij.util.io.BooleanDataDescriptor +import com.intellij.util.io.DataExternalizer +import com.intellij.util.io.IOUtil +import com.intellij.util.io.KeyDescriptor import gnu.trove.THashMap import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly @@ -33,6 +36,7 @@ import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK +import org.jetbrains.kotlin.jps.incremental.storage.BasicMap import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.kotlin.ModuleMapping @@ -48,9 +52,11 @@ import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.visibility import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil -import org.jetbrains.kotlin.utils.Printer import org.jetbrains.org.objectweb.asm.* -import java.io.* +import java.io.DataInput +import java.io.DataInputStream +import java.io.DataOutput +import java.io.File import java.security.MessageDigest import java.util.* @@ -309,71 +315,6 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen maps.forEach { it.close () } } - private inner abstract class BasicMap( - private val storageFile: File, - private val valueExternalizer: DataExternalizer - ) { - protected open val keyDescriptor: KeyDescriptor - get() = EnumeratorStringDescriptor() - - protected var storage: PersistentHashMap = createMap() - - public fun contains(key: String): Boolean = storage.containsMapping(key) - - public open fun clean() { - try { - storage.close() - } - catch (ignored: IOException) { - } - - PersistentHashMap.deleteFilesStartingWith(storage.getBaseFile()!!) - try { - storage = createMap() - } - catch (ignored: IOException) { - } - } - - public open fun flush(memoryCachesOnly: Boolean) { - if (memoryCachesOnly) { - if (storage.isDirty()) { - storage.dropMemoryCaches() - } - } - else { - storage.force() - } - } - - public fun close() { - storage.close() - } - - TestOnly - public fun dump(): String { - return with(StringBuilder()) { - with(Printer(this)) { - println(this@BasicMap.javaClass.getSimpleName()) - pushIndent() - - for (key in storage.getAllKeysWithExistingMapping().sort()) { - println("$key -> ${dumpValue(storage[key])}") - } - - popIndent() - } - - this - }.toString() - } - - protected abstract fun dumpValue(value: V): String - - private fun createMap(): PersistentHashMap = - PersistentHashMap(storageFile, keyDescriptor, valueExternalizer) - } - private inner class ProtoMap(storageFile: File) : BasicMap(storageFile, ByteArrayExternalizer) { public fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): Boolean { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt new file mode 100644 index 00000000000..995a47303e9 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -0,0 +1,91 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import com.intellij.util.io.DataExternalizer +import com.intellij.util.io.EnumeratorStringDescriptor +import com.intellij.util.io.KeyDescriptor +import com.intellij.util.io.PersistentHashMap +import org.jetbrains.annotations.TestOnly +import org.jetbrains.kotlin.utils.Printer +import java.io.File +import java.io.IOException + +public abstract class BasicMap( + private val storageFile: File, + private val valueExternalizer: DataExternalizer +) { + protected open val keyDescriptor: KeyDescriptor + get() = EnumeratorStringDescriptor() + + protected var storage: PersistentHashMap = createMap() + + public fun contains(key: String): Boolean = storage.containsMapping(key) + + public open fun clean() { + try { + storage.close() + } + catch (ignored: IOException) { + } + + PersistentHashMap.deleteFilesStartingWith(storage.getBaseFile()!!) + try { + storage = createMap() + } + catch (ignored: IOException) { + } + } + + public open fun flush(memoryCachesOnly: Boolean) { + if (memoryCachesOnly) { + if (storage.isDirty()) { + storage.dropMemoryCaches() + } + } + else { + storage.force() + } + } + + public fun close() { + storage.close() + } + + TestOnly + public fun dump(): String { + return with(StringBuilder()) { + with(Printer(this)) { + println(this@BasicMap.javaClass.getSimpleName()) + pushIndent() + + for (key in storage.getAllKeysWithExistingMapping().sort()) { + println("$key -> ${dumpValue(storage[key])}") + } + + popIndent() + } + + this + }.toString() + } + + protected abstract fun dumpValue(value: V): String + + private fun createMap(): PersistentHashMap = + PersistentHashMap(storageFile, keyDescriptor, valueExternalizer) +} \ No newline at end of file From dad3f8f144adf576a9ab2fde95eb8f9619084b01 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Sep 2015 15:31:14 +0300 Subject: [PATCH 0437/1557] Flush incremental caches after each test run Original commit: a3145bc798c5d466f90c7a76b0142eb61e88a388 --- .../org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index ac2a13f6547..c7cef336e29 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -139,6 +139,7 @@ public abstract class AbstractIncrementalJpsTest( return MakeResult(logger.log, false, createMappingsDump(descriptor)) } } finally { + descriptor.dataManager.flush(false) descriptor.release() } } From bb14bb8d09b12bb1096dce65bd7e5cee415f9ec5 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Sep 2015 15:31:59 +0300 Subject: [PATCH 0438/1557] Pass incrementalCaches as a doBuild parameter Original commit: 2afaa82b5795ef761fd3e76442692fa328381676 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e97fd22dc98..2ca8ef7c585 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -32,6 +32,7 @@ import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage +import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.JpsSimpleElement import org.jetbrains.jps.model.ex.JpsElementChildRoleBase @@ -101,8 +102,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { val messageCollector = MessageCollectorAdapter(context) + val dataManager = context.projectDescriptor.dataManager + val targets = chunk.targets + val incrementalCaches = targets.keysToMap { dataManager.getKotlinCache(it) } + try { - return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) + return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, incrementalCaches) } catch (e: StopBuildException) { throw e @@ -121,7 +126,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR chunk: ModuleChunk, context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, - messageCollector: MessageCollectorAdapter, outputConsumer: ModuleLevelBuilder.OutputConsumer + messageCollector: MessageCollectorAdapter, outputConsumer: ModuleLevelBuilder.OutputConsumer, + incrementalCaches: Map ): ModuleLevelBuilder.ExitCode { // Workaround for Android Studio if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget()) && !JavaBuilder.IS_ENABLED[context, true]) { @@ -135,7 +141,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (chunk.getTargets().any { dataManager.getDataPaths().getKotlinCacheVersion(it).isIncompatible() }) { LOG.info("Clearing caches for " + chunk.getTargets().map { it.getPresentableName() }.join()) - chunk.getTargets().forEach { dataManager.getKotlinCache(it).clean() } + incrementalCaches.values().forEach(StorageOwner::clean) return CHUNK_REBUILD_REQUIRED } @@ -146,8 +152,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION) - val incrementalCaches = chunk.getTargets().keysToMap { dataManager.getKotlinCache(it) } - val project = projectDescriptor.project val lookupTracker = From 89098a9ff8ace2702427b6a76beab5a48886c0d0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 4 Aug 2015 08:37:16 +0300 Subject: [PATCH 0439/1557] Recompile files depending on changed inline function between modules Original commit: 10a330f67a921b437a720936b74b7c503607c9d8 --- .../kotlin/jps/build/KotlinBuilder.kt | 45 +++++++++++++++++-- .../jps/incremental/IncrementalCacheImpl.kt | 36 +++++++++++---- .../jps/build/AbstractIncrementalJpsTest.kt | 9 ++-- 3 files changed, 76 insertions(+), 14 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 2ca8ef7c585..84706d4e7da 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -22,7 +22,10 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.util.containers.MultiMap import gnu.trove.THashSet import org.jetbrains.jps.ModuleChunk +import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.DirtyFilesHolder +import org.jetbrains.jps.builders.impl.BuildTargetRegistryImpl +import org.jetbrains.jps.builders.impl.TargetOutputIndexImpl import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor import org.jetbrains.jps.builders.java.dependencyView.Mappings @@ -102,9 +105,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { val messageCollector = MessageCollectorAdapter(context) - val dataManager = context.projectDescriptor.dataManager - val targets = chunk.targets - val incrementalCaches = targets.keysToMap { dataManager.getKotlinCache(it) } + val incrementalCaches = getIncrementalCaches(chunk, context) try { return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, incrementalCaches) @@ -609,6 +610,44 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } +private val Iterable>.moduleTargets: Iterable + get() = filterIsInstance(javaClass()) + +private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map { + val dataManager = context.projectDescriptor.dataManager + val targets = chunk.targets + + val buildRegistry = BuildTargetRegistryImpl(context.projectDescriptor.model) + val outputIndex = TargetOutputIndexImpl(targets, context) + + val allTargets = buildRegistry.allTargets.moduleTargets + val allDependencies = allTargets.keysToMap { target -> + target.computeDependencies(buildRegistry, outputIndex).moduleTargets + } + + val dependents = targets.keysToMap { hashSetOf() } + val targetsWithDependents = HashSet(targets) + + for ((target, dependencies) in allDependencies) { + for (dependency in dependencies) { + if (dependency !in targets) continue + + dependents[dependency]!!.add(target) + targetsWithDependents.add(target) + } + } + + val caches = targetsWithDependents.keysToMap { dataManager.getKotlinCache(it) } + + for ((target, cache) in caches) { + dependents[target]?.forEach { + cache.addDependentCache(caches[it]!!) + } + } + + return caches +} + private val ALL_COMPILED_FILES_KEY = Key.create>("_all_kotlin_compiled_files_") private fun getAllCompiledFilesContainer(context: CompileContext): MutableSet { var allCompiledFiles = ALL_COMPILED_FILES_KEY.get(context) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index baca0cc86b0..bea3d270cca 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -27,6 +27,7 @@ import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.builders.storage.StorageProvider +import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.jps.incremental.storage.StorageOwner @@ -104,7 +105,10 @@ class CacheFormatVersion(targetDataRoot: File) { } } -public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, IncrementalCache { +public class IncrementalCacheImpl( + targetDataRoot: File, + private val target: ModuleBuildTarget +) : StorageOwner, IncrementalCache { companion object { val PROTO_MAP = "proto.tab" val CONSTANTS_MAP = "constants.tab" @@ -143,6 +147,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen hasInlineTo) private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) + private val dependents = arrayListOf() private val inlineRegistering = object : InlineRegistering { override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { @@ -152,6 +157,10 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen override fun getInlineRegistering(): InlineRegistering = inlineRegistering + public fun addDependentCache(cache: IncrementalCacheImpl) { + dependents.add(cache) + } + TestOnly public fun dump(): String { return maps.map { it.dump() }.join("\n\n") @@ -171,6 +180,7 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen public fun getFilesToReinline(): Collection { val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) + val outPath = target?.outputDir!! for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { val sourceFiles = classToSourcesMap[className] @@ -179,6 +189,14 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen val targetFiles = functions.flatMap { hasInlineTo[sourceFile, it] } result.addAll(targetFiles) } + + val classFile = File(outPath, "${className.internalName}.class") + val classFileName = classFile.normalizedPath + + for (dependent in dependents) { + val targetFiles = functions.flatMap { dependent.hasInlineTo[classFileName, it] } + result.addAll(targetFiles) + } } dirtyInlineFunctionsMap.clean() @@ -724,15 +742,17 @@ public class IncrementalCacheImpl(targetDataRoot: File) : StorageOwner, Incremen } } -private val storageProvider = object : StorageProvider() { - override fun createStorage(targetDataDir: File): IncrementalCacheImpl { - return IncrementalCacheImpl(targetDataDir) - } -} - public fun BuildDataPaths.getKotlinCacheVersion(target: BuildTarget<*>): CacheFormatVersion = CacheFormatVersion(getTargetDataRoot(target)) -public fun BuildDataManager.getKotlinCache(target: BuildTarget<*>): IncrementalCacheImpl = getStorage(target, storageProvider) +private data class KotlinIncrementalStorageProvider( + private val target: ModuleBuildTarget +) : StorageProvider() { + override fun createStorage(targetDataDir: File): IncrementalCacheImpl = + IncrementalCacheImpl(targetDataDir, target) +} + +public fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): IncrementalCacheImpl = + getStorage(target, KotlinIncrementalStorageProvider(target)) private fun ByteArray.md5(): Long { val d = MessageDigest.getInstance("MD5").digest(this)!! diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index c7cef336e29..2ee2e68ebd0 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -37,6 +37,7 @@ import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.cmdline.ProjectDescriptor import org.jetbrains.jps.incremental.BuilderRegistry import org.jetbrains.jps.incremental.IncProjectBuilder +import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.model.JpsElementFactory import org.jetbrains.jps.model.JpsModuleRootModificationUtil @@ -51,8 +52,7 @@ import org.jetbrains.kotlin.utils.keysToMap import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream -import java.util.ArrayList -import java.util.HashMap +import java.util.* import kotlin.properties.Delegates import kotlin.test.assertEquals import kotlin.test.assertFalse @@ -290,7 +290,10 @@ public abstract class AbstractIncrementalJpsTest( private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { return StringBuilder { - for (target in project.buildTargetIndex.allTargets.sortBy { it.presentableName }) { + val allTargets = project.buildTargetIndex.allTargets + val moduleTargets = allTargets.filterIsInstance(ModuleBuildTarget::class.java) + + for (target in moduleTargets.sortedBy { it.presentableName }) { append("\n") append(project.dataManager.getKotlinCache(target).dump()) append("\n\n\n") From 84944e862ff58d6c0f1703e88686499624499d11 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 5 Aug 2015 15:48:00 +0300 Subject: [PATCH 0440/1557] Remove unused parameter Original commit: 9a29750d0ec5e4217ae2a8129639ef3359331536 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index bea3d270cca..7596cb0c72e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -203,7 +203,7 @@ public class IncrementalCacheImpl( return result.map { File(it) } } - private fun getRecompilationDecision(protoChanged: Boolean, constantsChanged: Boolean, inlinesChanged: Boolean) = + private fun getRecompilationDecision(protoChanged: Boolean, constantsChanged: Boolean) = when { constantsChanged -> RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS protoChanged -> RECOMPILE_OTHER_KOTLIN_IN_CHUNK @@ -237,8 +237,7 @@ public class IncrementalCacheImpl( header.isCompatiblePackageFacadeKind() -> getRecompilationDecision( protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = true), - constantsChanged = false, - inlinesChanged = false + constantsChanged = false ) header.isCompatibleFileFacadeKind() -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } @@ -253,8 +252,7 @@ public class IncrementalCacheImpl( when (header.classKind!!) { JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision( protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = false), - constantsChanged = constantsMap.process(className, fileBytes), - inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + constantsChanged = constantsMap.process(className, fileBytes) ) JvmAnnotationNames.KotlinClass.Kind.LOCAL_CLASS, JvmAnnotationNames.KotlinClass.Kind.ANONYMOUS_OBJECT -> DO_NOTHING @@ -266,8 +264,7 @@ public class IncrementalCacheImpl( getRecompilationDecision( protoChanged = false, - constantsChanged = constantsMap.process(className, fileBytes), - inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + constantsChanged = constantsMap.process(className, fileBytes) ) } else -> { @@ -287,8 +284,7 @@ public class IncrementalCacheImpl( val newDecision = getRecompilationDecision( protoChanged = internalClassName in protoMap, - constantsChanged = internalClassName in constantsMap, - inlinesChanged = internalClassName in inlineFunctionsMap + constantsChanged = internalClassName in constantsMap ) if (newDecision != DO_NOTHING) { KotlinBuilder.LOG.debug("$newDecision because $internalClassName is removed") From 9c71be670bc1241c18597a9df549fe49339583ca Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 5 Aug 2015 15:51:10 +0300 Subject: [PATCH 0441/1557] Use package facade internal name when processing changed inline functions Original commit: 46d3afaeba0a37b4ae82d1343d6aa154c5b20e94 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7596cb0c72e..b1dde50fcfb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -41,6 +41,7 @@ import org.jetbrains.kotlin.jps.incremental.storage.BasicMap import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.kotlin.ModuleMapping +import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind @@ -218,7 +219,7 @@ public class IncrementalCacheImpl( val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME) protoMap.put(jvmClassName, file.readBytes(), isPackage = false, checkChangesIsOpenPart = false) dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME) - sourceFiles.forEach { sourceToClassesMap.addSourceToClass(it, jvmClassName) } + sourceFiles.forEach { sourceToClassesMap.add(it, jvmClassName) } return DO_NOTHING } @@ -242,13 +243,13 @@ public class IncrementalCacheImpl( header.isCompatibleFileFacadeKind() -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) + inlineFunctionsMap.process(className, fileBytes) getRecompilationDecision( protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = true), - constantsChanged = constantsMap.process(className, fileBytes), - inlinesChanged = inlineFunctionsMap.process(className, fileBytes) + constantsChanged = constantsMap.process(className, fileBytes) ) } - header.isCompatibleClassKind() -> + header.isCompatibleClassKind() -> { when (header.classKind!!) { JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision( protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = false), @@ -257,7 +258,10 @@ public class IncrementalCacheImpl( JvmAnnotationNames.KotlinClass.Kind.LOCAL_CLASS, JvmAnnotationNames.KotlinClass.Kind.ANONYMOUS_OBJECT -> DO_NOTHING } + } header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART -> { + val facadeClassName = PackageClassUtils.getPackageClassInternalName(kotlinClass.classId.packageFqName) + inlineFunctionsMap.process(JvmClassName.byInternalName(facadeClassName), fileBytes) assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) From c6dc98555f345561517d2f8cf4c0ff2e29450aa5 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 5 Aug 2015 15:55:34 +0300 Subject: [PATCH 0442/1557] Add file without inline call to multi module test Original commit: 12ebe4426cca75130b447475303f72eea61dbd49 --- .../multiModule/inlineFunctionChanged/module2_other.kt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt new file mode 100644 index 00000000000..b6f3ec9668d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt @@ -0,0 +1,4 @@ +package usage + +fun other() { +} \ No newline at end of file From 2a2315756a4e8434663e78c47fe42c3c5616c478 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 5 Aug 2015 16:09:19 +0300 Subject: [PATCH 0443/1557] Add another package part with inline to multi-module inline test Original commit: 44e13dd697455f5404c393389e9903b9a26a0493 --- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++------ .../inlineFunctionChanged/module2_other.kt | 4 ---- .../build.log | 0 .../dependencies.txt | 0 .../module1_inlineF.kt} | 0 .../module1_inlineF.kt.new} | 0 .../inlineFunctionTwoPackageParts/module1_inlineG.kt | 6 ++++++ .../module1_inlineG.kt.new | 6 ++++++ .../module1_other.kt | 0 .../inlineFunctionTwoPackageParts/module2_other.kt | 6 ++++++ .../module2_usageF.kt} | 2 +- .../inlineFunctionTwoPackageParts/module2_usageG.kt | 5 +++++ 12 files changed, 30 insertions(+), 11 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt rename jps/jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged => inlineFunctionTwoPackageParts}/build.log (100%) rename jps/jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged => inlineFunctionTwoPackageParts}/dependencies.txt (100%) rename jps/jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged/module1_inline.kt => inlineFunctionTwoPackageParts/module1_inlineF.kt} (100%) rename jps/jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged/module1_inline.kt.new => inlineFunctionTwoPackageParts/module1_inlineF.kt.new} (100%) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new rename jps/jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged => inlineFunctionTwoPackageParts}/module1_other.kt (100%) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt rename jps/jps-plugin/testData/incremental/multiModule/{inlineFunctionChanged/module2_usage.kt => inlineFunctionTwoPackageParts/module2_usageF.kt} (64%) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index ba638ed4bbd..662a2a15cd6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -61,18 +61,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("inlineFunctionChanged") - public void testInlineFunctionChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/"); - doTest(fileName); - } - @TestMetadata("inlineFunctionInlined") public void testInlineFunctionInlined() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); doTest(fileName); } + @TestMetadata("inlineFunctionTwoPackageParts") + public void testInlineFunctionTwoPackageParts() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/"); + doTest(fileName); + } + @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt deleted file mode 100644 index b6f3ec9668d..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_other.kt +++ /dev/null @@ -1,4 +0,0 @@ -package usage - -fun other() { -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/build.log rename to jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/dependencies.txt similarity index 100% rename from jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/dependencies.txt rename to jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/dependencies.txt diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt rename to jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt.new b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_inline.kt.new rename to jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt new file mode 100644 index 00000000000..ba93f50fb4f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt @@ -0,0 +1,6 @@ +package inline + +inline fun g(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new new file mode 100644 index 00000000000..1aa58fd92fd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new @@ -0,0 +1,6 @@ +package inline + +inline fun g(body: () -> Unit) { + body() + println("i'm inline function") +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_other.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_other.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module1_other.kt rename to jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_other.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt new file mode 100644 index 00000000000..f8c6a2b9721 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_other.kt @@ -0,0 +1,6 @@ +package usage + +fun main(args: Array) { + useF() + useG() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageF.kt similarity index 64% rename from jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt rename to jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageF.kt index 3f8161245b6..a8b25a5582c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionChanged/module2_usage.kt +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageF.kt @@ -1,5 +1,5 @@ package usage -fun main(args: Array) { +fun useF() { inline.f { println("to be inlined") } } diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt new file mode 100644 index 00000000000..3ea53b7ef59 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module2_usageG.kt @@ -0,0 +1,5 @@ +package usage + +fun useG() { + inline.g { println("to be inlined") } +} From 2f7aadeceaea834c37b0b8730c5587b17b5c7e39 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 5 Aug 2015 16:22:48 +0300 Subject: [PATCH 0444/1557] Use package facade name to search in dependent modules Original commit: b36c841b6e122294af881c10c471f00953baa1cb --- .../jps/incremental/IncrementalCacheImpl.kt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index b1dde50fcfb..9b0735d149b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -191,7 +191,15 @@ public class IncrementalCacheImpl( result.addAll(targetFiles) } - val classFile = File(outPath, "${className.internalName}.class") + var internalName = className.internalName + + if (packagePartMap.isPackagePart(className)) { + val packageInternalName = PackageClassUtils.getPackageClassInternalName(className.packageFqName) + val packageJvmName = JvmClassName.byInternalName(packageInternalName) + internalName = packageJvmName.internalName + } + + val classFile = File(outPath, "$internalName.class") val classFileName = classFile.normalizedPath for (dependent in dependents) { @@ -234,6 +242,8 @@ public class IncrementalCacheImpl( classToSourcesMap.add(className, it) } + inlineFunctionsMap.process(className, fileBytes) + val decision = when { header.isCompatiblePackageFacadeKind() -> getRecompilationDecision( @@ -243,13 +253,12 @@ public class IncrementalCacheImpl( header.isCompatibleFileFacadeKind() -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) - inlineFunctionsMap.process(className, fileBytes) getRecompilationDecision( protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = true), constantsChanged = constantsMap.process(className, fileBytes) ) } - header.isCompatibleClassKind() -> { + header.isCompatibleClassKind() -> when (header.classKind!!) { JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision( protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = false), @@ -258,10 +267,7 @@ public class IncrementalCacheImpl( JvmAnnotationNames.KotlinClass.Kind.LOCAL_CLASS, JvmAnnotationNames.KotlinClass.Kind.ANONYMOUS_OBJECT -> DO_NOTHING } - } header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART -> { - val facadeClassName = PackageClassUtils.getPackageClassInternalName(kotlinClass.classId.packageFqName) - inlineFunctionsMap.process(JvmClassName.byInternalName(facadeClassName), fileBytes) assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) From 3b877e479761b87916f67f3116372f763b8d1dd6 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 7 Aug 2015 16:13:14 +0300 Subject: [PATCH 0445/1557] Save target type in Kotlin Builder Original commit: e90ecc48c58d69e67f0928daa0115387dc165437 --- .../jps/build/KotlinBuilderModuleScriptGenerator.java | 6 +++++- .../jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java | 6 ++++-- .../jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt | 3 ++- .../kotlin/modules/KotlinModuleXmlGeneratorTest.java | 9 +++++---- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index b4913701685..f650f7042bf 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -26,6 +26,8 @@ import kotlin.io.IoPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.ModuleChunk; +import org.jetbrains.jps.builders.BuildTargetType; +import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; import org.jetbrains.jps.incremental.CompileContext; @@ -82,6 +84,8 @@ public class KotlinBuilderModuleScriptGenerator { } } + BuildTargetType targetType = target.getTargetType(); + assert targetType instanceof JavaModuleBuildTargetType; builder.addModule( target.getId(), outputDir.getAbsolutePath(), @@ -89,7 +93,7 @@ public class KotlinBuilderModuleScriptGenerator { findSourceRoots(context, target), findClassPathRoots(target), findAnnotationRoots(target), - target.isTests(), + (JavaModuleBuildTargetType) targetType, // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs ); diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java index 67844e5ebb9..e9b2cda097e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.modules; import org.jetbrains.annotations.NotNull; +import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; import org.jetbrains.kotlin.config.IncrementalCompilation; import org.jetbrains.kotlin.utils.Printer; @@ -45,12 +46,12 @@ public class KotlinModuleXmlBuilder { List javaSourceRoots, Collection classpathRoots, List annotationRoots, - boolean tests, + JavaModuleBuildTargetType targetType, Set directoriesToFilterOut ) { assert !done : "Already done"; - if (tests) { + if (targetType.isTests()) { p.println(""); } else { @@ -59,6 +60,7 @@ public class KotlinModuleXmlBuilder { p.println("<", MODULE, " ", NAME, "=\"", escapeXml(moduleName), "\" ", + TYPE, "=\"", escapeXml(targetType.getTypeId()), "\" ", OUTPUT_DIR, "=\"", getEscapedPath(new File(outputDir)), "\">" ); p.pushIndent(); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 538b0ce2236..0a22bde715a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jvm.compiler +import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil @@ -45,7 +46,7 @@ public class ClasspathOrderTest : TestCaseWithTmpdir() { listOf(sourceDir), listOf(PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()), listOf(), - false, + JavaModuleBuildTargetType.PRODUCTION, setOf() ).asText().toString() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index 61bba84e200..0e40545b642 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.modules; import junit.framework.TestCase; +import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; import org.jetbrains.kotlin.test.JetTestUtils; import java.io.File; @@ -32,7 +33,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.singletonList(new File("java")), Arrays.asList(new File("cp1"), new File("cp2")), Arrays.asList(new File("a1/f1"), new File("a2")), - false, + JavaModuleBuildTargetType.PRODUCTION, Collections.emptySet() ).asText().toString(); JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/basic.xml"), actual); @@ -46,7 +47,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), Arrays.asList(new File("a1/f1"), new File("a2")), - false, + JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) ).asText().toString(); JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/filtered.xml"), actual); @@ -61,7 +62,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), Arrays.asList(new File("a1/f1"), new File("a2")), - false, + JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) ); builder.addModule( @@ -71,7 +72,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.emptyList(), Arrays.asList(new File("cp12"), new File("cp22")), Arrays.asList(new File("a12/f12"), new File("a22")), - true, + JavaModuleBuildTargetType.TEST, Collections.singleton(new File("cp12")) ); String actual = builder.asText().toString(); From 162f42c442a92cf7fe3844fbf7380559c3aea35e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 11 Aug 2015 16:25:54 +0300 Subject: [PATCH 0446/1557] Use both target name and target type to get incremental cache from backend Original commit: 0988b21e9cba9478071cc493315a85c68499220f --- .../kotlin/jps/build/KotlinBuilder.kt | 1 + .../IncrementalCompilationComponentsImpl.kt | 32 +++++++++++++++++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 84706d4e7da..3aad308f5f2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -321,6 +321,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR || className.startsWith("org.apache.log4j.") // For logging from compiler || className == "org.jetbrains.kotlin.progress.CompilationCanceledStatus" || className == "org.jetbrains.kotlin.progress.CompilationCanceledException" + || className == "org.jetbrains.kotlin.modules.Module" }, compilerServices ) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt index 9e423f5a262..e4ff9a9da86 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt @@ -20,14 +20,42 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents +import org.jetbrains.kotlin.modules.Module public class IncrementalCompilationComponentsImpl( caches: Map, private val lookupTracker: LookupTracker ): IncrementalCompilationComponents { - private val idToCache = caches.mapKeys { it.key.id!! } + private val caches = caches.mapKeys { ModuleToModuleBuildTargetAdapter(it.key) } - override fun getIncrementalCache(moduleId: String): IncrementalCache = idToCache[moduleId]!! + override fun getIncrementalCache(target: Module): IncrementalCache = + caches[target]!! override fun getLookupTracker(): LookupTracker = lookupTracker } + +private class ModuleToModuleBuildTargetAdapter( + private val moduleBuildTarget: ModuleBuildTarget +) : Module { + + override fun getModuleName(): String = + moduleBuildTarget.id + + override fun getModuleType(): String = + moduleBuildTarget.targetType.typeId + + override fun getAnnotationsRoots(): List = + throw UnsupportedOperationException() + + override fun getClasspathRoots(): List = + throw UnsupportedOperationException() + + override fun getJavaSourceRoots(): List = + throw UnsupportedOperationException() + + override fun getOutputDirectory(): String = + throw UnsupportedOperationException() + + override fun getSourceFiles(): List = + throw UnsupportedOperationException() +} From 46233cb721d88f74a9c3e0556990a56a942ad039 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Sep 2015 14:17:17 +0300 Subject: [PATCH 0447/1557] Fix modules tests Original commit: b25dfabbcc20849d2560bb52b104921a58b4413e --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index af284a9b271..6a6a749a614 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -31,7 +31,6 @@ import org.jetbrains.jps.builders.BuildResult import org.jetbrains.jps.builders.CompileScopeTestBuilder import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.builders.TestProjectBuilderLogger -import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.incremental.BuilderRegistry import org.jetbrains.jps.incremental.IncProjectBuilder @@ -52,10 +51,7 @@ import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes import org.junit.Assert import java.io.* -import java.util.Arrays -import java.util.Collections -import java.util.HashSet -import java.util.TreeSet +import java.util.* import java.util.regex.Pattern import java.util.zip.ZipOutputStream import kotlin.test.* @@ -539,15 +535,6 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { makeAll().assertSuccessful() } - public fun testDoNotCreateUselessKotlinIncrementalCaches() { - initProject() - makeAll().assertSuccessful() - - val storageRoot = BuildDataPathsImpl(myDataStorageRoot).getDataStorageRoot() - assertTrue(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) - assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) - } - public fun testCancelLongKotlinCompilation() { generateLongKotlinFile("Foo.kt", "foo", "Foo") initProject() From 34fe09dac1a271e68fb7864531292c6fcdfc0d06 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 12 Aug 2015 16:41:33 +0300 Subject: [PATCH 0448/1557] Fix incremental packages Original commit: f9fe01047d4a2cc543d10bd02b629d8206a107ed --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 9b0735d149b..a2718bf2b42 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -149,6 +149,7 @@ public class IncrementalCacheImpl( private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val dependents = arrayListOf() + private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } private val inlineRegistering = object : InlineRegistering { override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { @@ -181,7 +182,6 @@ public class IncrementalCacheImpl( public fun getFilesToReinline(): Collection { val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) - val outPath = target?.outputDir!! for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { val sourceFiles = classToSourcesMap[className] @@ -199,11 +199,10 @@ public class IncrementalCacheImpl( internalName = packageJvmName.internalName } - val classFile = File(outPath, "$internalName.class") - val classFileName = classFile.normalizedPath + val classFilePath = getClassFilePath(internalName) for (dependent in dependents) { - val targetFiles = functions.flatMap { dependent.hasInlineTo[classFileName, it] } + val targetFiles = functions.flatMap { dependent.hasInlineTo[classFilePath, it] } result.addAll(targetFiles) } } @@ -212,6 +211,10 @@ public class IncrementalCacheImpl( return result.map { File(it) } } + override fun getClassFilePath(internalClassName: String): String { + return File(outputDir, "$internalClassName.class").canonicalPath + } + private fun getRecompilationDecision(protoChanged: Boolean, constantsChanged: Boolean) = when { constantsChanged -> RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS From 53ed47ade229164e22377968d737e5f82e25f055 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 13 Aug 2015 16:30:46 +0300 Subject: [PATCH 0449/1557] Always use class file as inline fun source Original commit: 8cc2e0f68d60f5619564f80c8d9e8488834bf60f --- .../jps/incremental/IncrementalCacheImpl.kt | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index a2718bf2b42..d6cfe82cb32 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -184,27 +184,25 @@ public class IncrementalCacheImpl( val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { - val sourceFiles = classToSourcesMap[className] - - for (sourceFile in sourceFiles) { - val targetFiles = functions.flatMap { hasInlineTo[sourceFile, it] } - result.addAll(targetFiles) - } - - var internalName = className.internalName - - if (packagePartMap.isPackagePart(className)) { - val packageInternalName = PackageClassUtils.getPackageClassInternalName(className.packageFqName) - val packageJvmName = JvmClassName.byInternalName(packageInternalName) - internalName = packageJvmName.internalName - } + val internalName = + if (packagePartMap.isPackagePart(className)) { + val packageInternalName = PackageClassUtils.getPackageClassInternalName(className.packageFqName) + val packageJvmName = JvmClassName.byInternalName(packageInternalName) + packageJvmName.internalName + } + else { + className.internalName + } val classFilePath = getClassFilePath(internalName) - for (dependent in dependents) { - val targetFiles = functions.flatMap { dependent.hasInlineTo[classFilePath, it] } + fun addFilesAffectedByChangedInlineFuns(cache: IncrementalCacheImpl) { + val targetFiles = functions.flatMap { cache.hasInlineTo[classFilePath, it] } result.addAll(targetFiles) } + + addFilesAffectedByChangedInlineFuns(this) + dependents.forEach(::addFilesAffectedByChangedInlineFuns) } dirtyInlineFunctionsMap.clean() From f36574dd0a4596464b8adefc773baa0448f85ce1 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 14 Aug 2015 23:13:22 +0300 Subject: [PATCH 0450/1557] Get rid of RecompilationDecision enum Original commit: 43bcc4a6a63f23b4e50f6d0b3759eae9c6de63c4 --- .../kotlin/jps/build/KotlinBuilder.kt | 121 ++++++----- .../jps/incremental/IncrementalCacheImpl.kt | 191 +++++++++--------- .../jps/incremental/LocalFileKotlinClass.kt | 3 + 3 files changed, 165 insertions(+), 150 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 3aad308f5f2..4d4f6baf794 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -57,10 +57,6 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind @@ -198,27 +194,55 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR context.checkCanceled() - val recompilationDecision: IncrementalCacheImpl.RecompilationDecision - if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { - recompilationDecision = DO_NOTHING - } - else { - val generatedClasses = generatedFiles.filterIsInstance() - recompilationDecision = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles) - updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) + val isJsModule = JpsUtils.isJsKotlinModule(chunk.representativeTarget()) + val changesInfo: ChangesInfo = when { + isJsModule -> ChangesInfo.NO_CHANGES + else -> { + val generatedClasses = generatedFiles.filterIsInstance() + val info = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles) + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) + info + } } if (compilationErrors) { return ABORT } - if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { + if (isJsModule) { copyJsLibraryFilesIfNeeded(chunk, project) } - if (IncrementalCompilation.ENABLED) { - val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } + if (!IncrementalCompilation.ENABLED) return OK + val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } + val marker = ChangesProcessor(context, chunk, allCompiledFiles, caches) + marker.processChanges(changesInfo) + return ADDITIONAL_PASS_REQUIRED + } + + class ChangesProcessor( + val context: CompileContext, + val chunk: ModuleChunk, + val allCompiledFiles: MutableSet, + val caches: List + ) { + fun processChanges(changesInfo: ChangesInfo) { + changesInfo.doProcessChanges() + } + + private fun ChangesInfo.doProcessChanges() { + when { + constantsChanged -> recompileOtherAndDependents() + protoChanged -> recompileOtherKotlinInChunk() + } + + if (inlineChanged) { + recompileInlined() + } + } + + private fun recompileInlined() { for (cache in caches) { val filesToReinline = cache.getFilesToReinline() @@ -226,34 +250,29 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR FSOperations.markDirty(context, CompilationRound.NEXT, it) } } - - when (recompilationDecision) { - RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS -> { - allCompiledFiles.clear() - FSOperations.markDirtyRecursively(context, chunk) - } - RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS -> { - // Workaround for IDEA 14.0-14.0.2: extended version of markDirtyRecursively is not available - try { - Class.forName("org.jetbrains.jps.incremental.fs.CompilationRound") - - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, { file -> file !in allCompiledFiles }) - } - catch (e: ClassNotFoundException) { - allCompiledFiles.clear() - FSOperations.markDirtyRecursively(context, chunk) - } - } - RECOMPILE_OTHER_KOTLIN_IN_CHUNK -> { - FSOperations.markDirty(context, chunk, { file -> - KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles - }) - } - } - return ADDITIONAL_PASS_REQUIRED } - return OK + private fun recompileEverything() { + allCompiledFiles.clear() + FSOperations.markDirtyRecursively(context, chunk) + } + + private fun recompileOtherAndDependents() { + // Workaround for IDEA 14.0-14.0.2: extended version of markDirtyRecursively is not available + try { + Class.forName("org.jetbrains.jps.incremental.fs.CompilationRound") + + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, { file -> file !in allCompiledFiles }) + } catch (e: ClassNotFoundException) { + recompileEverything() + } + } + + private fun recompileOtherKotlinInChunk() { + FSOperations.markDirty(context, chunk, { file -> + KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles + }) + } } private fun doCompileModuleChunk( @@ -423,19 +442,19 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR compilationErrors: Boolean, incrementalCaches: Map, generatedFiles: List - ): IncrementalCacheImpl.RecompilationDecision { + ): ChangesInfo { incrementalCaches.values().forEach { it.saveCacheFormatVersion() } if (!IncrementalCompilation.ENABLED) { - return DO_NOTHING + return ChangesInfo.NO_CHANGES } - var recompilationDecision = DO_NOTHING + var changesInfo = ChangesInfo.NO_CHANGES for (generatedFile in generatedFiles) { val ic = incrementalCaches[generatedFile.target]!! - val newDecision = + val newChangesInfo = if (generatedFile is GeneratedJvmClass) { - ic.saveFileToCache(generatedFile.sourceFiles, generatedFile.outputClass) + ic.saveFileToCache(generatedFile) } else if (generatedFile.outputFile.isModuleMappingFile()) { ic.saveModuleMappingToCache(generatedFile.sourceFiles, generatedFile.outputFile) @@ -444,17 +463,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR continue } - recompilationDecision = recompilationDecision.merge(newDecision) + changesInfo += newChangesInfo } if (!compilationErrors) { incrementalCaches.values().forEach { - val newDecision = it.clearCacheForRemovedClasses() - recompilationDecision = recompilationDecision.merge(newDecision) + val newChangesInfo = it.clearCacheForRemovedClasses() + changesInfo += newChangesInfo } } - return recompilationDecision + return changesInfo } private fun File.isModuleMappingFile() = extension == ModuleMapping.MAPPING_FILE_EXT && parentFile.name == "META-INF" @@ -686,7 +705,7 @@ private open class GeneratedFile( val outputFile: File ) -private class GeneratedJvmClass( +class GeneratedJvmClass ( target: ModuleBuildTarget, sourceFiles: Collection, outputFile: File diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index d6cfe82cb32..f955082b1c9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -33,10 +33,8 @@ import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.DO_NOTHING -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl.RecompilationDecision.RECOMPILE_OTHER_KOTLIN_IN_CHUNK import org.jetbrains.kotlin.jps.incremental.storage.BasicMap import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAnnotationNames @@ -213,103 +211,86 @@ public class IncrementalCacheImpl( return File(outputDir, "$internalClassName.class").canonicalPath } - private fun getRecompilationDecision(protoChanged: Boolean, constantsChanged: Boolean) = - when { - constantsChanged -> RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS - protoChanged -> RECOMPILE_OTHER_KOTLIN_IN_CHUNK - else -> DO_NOTHING - } - public fun saveCacheFormatVersion() { cacheFormatVersion.saveIfNeeded() } - public fun saveModuleMappingToCache(sourceFiles: Collection, file: File): RecompilationDecision { + public fun saveModuleMappingToCache(sourceFiles: Collection, file: File): ChangesInfo { val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME) - protoMap.put(jvmClassName, file.readBytes(), isPackage = false, checkChangesIsOpenPart = false) + protoMap.process(jvmClassName, file.readBytes(), isPackage = false, checkChangesIsOpenPart = false) dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME) sourceFiles.forEach { sourceToClassesMap.add(it, jvmClassName) } - return DO_NOTHING + return ChangesInfo.NO_CHANGES } - public fun saveFileToCache(sourceFiles: Collection, kotlinClass: LocalFileKotlinClass): RecompilationDecision { - val fileBytes = kotlinClass.getFileContents() - val className = JvmClassName.byClassId(kotlinClass.getClassId()) - val header = kotlinClass.getClassHeader() + public fun saveFileToCache(generatedClass: GeneratedJvmClass): ChangesInfo { + val sourceFiles: Collection = generatedClass.sourceFiles + val kotlinClass: LocalFileKotlinClass = generatedClass.outputClass + val className = JvmClassName.byClassId(kotlinClass.classId) - dirtyOutputClassesMap.notDirty(className.getInternalName()) + dirtyOutputClassesMap.notDirty(className.internalName) sourceFiles.forEach { sourceToClassesMap.add(it, className) classToSourcesMap.add(className, it) } - inlineFunctionsMap.process(className, fileBytes) - - val decision = when { + val header = kotlinClass.classHeader + val changesInfo = when { header.isCompatiblePackageFacadeKind() -> - getRecompilationDecision( - protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = true), - constantsChanged = false - ) + protoMap.process(kotlinClass, isPackage = true) header.isCompatibleFileFacadeKind() -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) - getRecompilationDecision( - protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = true), - constantsChanged = constantsMap.process(className, fileBytes) - ) - } - header.isCompatibleClassKind() -> - when (header.classKind!!) { - JvmAnnotationNames.KotlinClass.Kind.CLASS -> getRecompilationDecision( - protoChanged = protoMap.put(className, BitEncoding.decodeBytes(header.annotationData!!), isPackage = false), - constantsChanged = constantsMap.process(className, fileBytes) - ) - JvmAnnotationNames.KotlinClass.Kind.LOCAL_CLASS, JvmAnnotationNames.KotlinClass.Kind.ANONYMOUS_OBJECT -> DO_NOTHING - } + protoMap.process(kotlinClass, isPackage = true) + + constantsMap.process(kotlinClass) + } + header.isCompatibleClassKind() && JvmAnnotationNames.KotlinClass.Kind.CLASS == header.classKind -> + protoMap.process(kotlinClass, isPackage = false) + + constantsMap.process(kotlinClass) + + inlineFunctionsMap.process(kotlinClass) header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } - packagePartMap.addPackagePart(className) - getRecompilationDecision( - protoChanged = false, - constantsChanged = constantsMap.process(className, fileBytes) - ) - } - else -> { - DO_NOTHING + constantsMap.process(kotlinClass) + + inlineFunctionsMap.process(kotlinClass) } + else -> ChangesInfo.NO_CHANGES } - if (decision != DO_NOTHING) { - KotlinBuilder.LOG.debug("$decision because $className is changed") - } - return decision + + changesInfo.logIfSomethingChanged(className) + return changesInfo } - public fun clearCacheForRemovedClasses(): RecompilationDecision { - var recompilationDecision = DO_NOTHING - for (internalClassName in dirtyOutputClassesMap.getDirtyOutputClasses()) { - val className = JvmClassName.byInternalName(internalClassName) + private fun ChangesInfo.logIfSomethingChanged(className: JvmClassName) { + if (this == ChangesInfo.NO_CHANGES) return - val newDecision = getRecompilationDecision( - protoChanged = internalClassName in protoMap, - constantsChanged = internalClassName in constantsMap - ) - if (newDecision != DO_NOTHING) { - KotlinBuilder.LOG.debug("$newDecision because $internalClassName is removed") - } + KotlinBuilder.LOG.debug("$className is changed: $this") + } - recompilationDecision = recompilationDecision.merge(newDecision) + public fun clearCacheForRemovedClasses(): ChangesInfo { + val dirtyClasses = dirtyOutputClassesMap + .getDirtyOutputClasses() + .map(JvmClassName::byInternalName) + .toList() - protoMap.remove(className) - packagePartMap.remove(className) - constantsMap.remove(className) - inlineFunctionsMap.remove(className) + val changesInfo = dirtyClasses.fold(ChangesInfo.NO_CHANGES) { info, className -> + val internalName = className.internalName + val newInfo = ChangesInfo(protoChanged = internalName in protoMap, + constantsChanged = internalName in constantsMap) + newInfo.logIfSomethingChanged(className) + info + newInfo + } + + dirtyClasses.forEach { + protoMap.remove(it) + packagePartMap.remove(it) + constantsMap.remove(it) + inlineFunctionsMap.remove(it) } dirtyOutputClassesMap.clean() - return recompilationDecision + return changesInfo } override fun getObsoletePackageParts(): Collection { @@ -342,19 +323,27 @@ public class IncrementalCacheImpl( private inner class ProtoMap(storageFile: File) : BasicMap(storageFile, ByteArrayExternalizer) { - public fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): Boolean { - val key = className.getInternalName() + public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): ChangesInfo { + val header = kotlinClass.classHeader + val bytes = BitEncoding.decodeBytes(header.annotationData!!) + return put(kotlinClass.className, bytes, isPackage, checkChangesIsOpenPart) + } + + public fun process(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { + return put(className, data, isPackage, checkChangesIsOpenPart) + } + + private fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { + val key = className.internalName val oldData = storage[key] - if (Arrays.equals(data, oldData)) { - return false - } - storage.put(key, data) - if (oldData != null && checkChangesIsOpenPart && isOpenPartNotChanged(oldData, data, isPackage)) { - return false + if (!Arrays.equals(data, oldData)) { + storage.put(key, data) } - return true + return ChangesInfo(protoChanged = oldData == null || + !checkChangesIsOpenPart || + !isOpenPartNotChanged(oldData, data, isPackage)) } public fun get(className: JvmClassName): ByteArray? { @@ -434,24 +423,24 @@ public class IncrementalCacheImpl( return if (result.isEmpty()) null else result } - public fun process(className: JvmClassName, bytes: ByteArray): Boolean { - return put(className, getConstantsMap(bytes)) + public fun process(kotlinClass: LocalFileKotlinClass): ChangesInfo { + return put(kotlinClass.className, getConstantsMap(kotlinClass.fileContents)) } - private fun put(className: JvmClassName, constantsMap: Map?): Boolean { + private fun put(className: JvmClassName, constantsMap: Map?): ChangesInfo { val key = className.getInternalName() val oldMap = storage[key] - if (oldMap == constantsMap) { - return false - } + if (oldMap == constantsMap) return ChangesInfo.NO_CHANGES + if (constantsMap != null) { storage.put(key, constantsMap) } else { storage.remove(key) } - return true + + return ChangesInfo(constantsChanged = true) } public fun remove(className: JvmClassName) { @@ -553,11 +542,11 @@ public class IncrementalCacheImpl( return result } - public fun process(className: JvmClassName, bytes: ByteArray): Boolean { - return put(className, getInlineFunctionsMap(bytes)) + public fun process(kotlinClass: LocalFileKotlinClass): ChangesInfo { + return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents)) } - private fun put(className: JvmClassName, newMap: Map): Boolean { + private fun put(className: JvmClassName, newMap: Map): ChangesInfo { val internalName = className.internalName val oldMap = storage[internalName] ?: emptyMap() @@ -580,10 +569,9 @@ public class IncrementalCacheImpl( if (changed.isNotEmpty()) { dirtyInlineFunctionsMap.put(className, changed.toList()) - return true } - return false + return ChangesInfo(inlineChanged = changed.isNotEmpty()) } public fun remove(className: JvmClassName) { @@ -736,19 +724,24 @@ public class IncrementalCacheImpl( return mutableMapping } } - - enum class RecompilationDecision { - DO_NOTHING, - RECOMPILE_OTHER_KOTLIN_IN_CHUNK, - RECOMPILE_OTHER_IN_CHUNK_AND_DEPENDANTS, - RECOMPILE_ALL_IN_CHUNK_AND_DEPENDANTS; - - fun merge(other: RecompilationDecision): RecompilationDecision { - return if (other.ordinal() > this.ordinal()) other else this - } - } } +data class ChangesInfo( + public val protoChanged: Boolean = false, + public val constantsChanged: Boolean = false, + public val inlineChanged: Boolean = false +) { + companion object { + public val NO_CHANGES: ChangesInfo = ChangesInfo() + } + + public fun plus(other: ChangesInfo): ChangesInfo = + ChangesInfo(protoChanged || other.protoChanged, + constantsChanged || other.constantsChanged, + inlineChanged || other.inlineChanged) +} + + public fun BuildDataPaths.getKotlinCacheVersion(target: BuildTarget<*>): CacheFormatVersion = CacheFormatVersion(getTargetDataRoot(target)) private data class KotlinIncrementalStorageProvider( diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 038d44dce2b..86e24b1c7e5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.name.ClassId +import org.jetbrains.kotlin.resolve.jvm.JvmClassName import java.io.File class LocalFileKotlinClass private constructor( @@ -39,6 +40,8 @@ class LocalFileKotlinClass private constructor( } } + public val className: JvmClassName by lazy { JvmClassName.byClassId(classId) } + override fun getLocation() = file.getAbsolutePath() public override fun getFileContents(): ByteArray = fileContents From 12bb9092c3da60b6c326bf9b7f8927074609155f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 17 Aug 2015 18:11:33 +0300 Subject: [PATCH 0451/1557] Recompile everything if new function is added Original commit: f25c10c4a187c62a058a43705fca5d6a8ec49798 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++++ .../jps/incremental/IncrementalCacheImpl.kt | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 4d4f6baf794..3d2f6fa6b84 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -233,6 +233,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun ChangesInfo.doProcessChanges() { when { + inlineAdded -> { + recompileEverything() + return + } constantsChanged -> recompileOtherAndDependents() protoChanged -> recompileOtherKotlinInChunk() } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index f955082b1c9..752155826a1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -550,6 +550,7 @@ public class IncrementalCacheImpl( val internalName = className.internalName val oldMap = storage[internalName] ?: emptyMap() + val added = hashSetOf() val changed = hashSetOf() val allFunctions = oldMap.keySet() + newMap.keySet() @@ -557,8 +558,9 @@ public class IncrementalCacheImpl( val oldHash = oldMap[fn] val newHash = newMap[fn] - if (oldHash != newHash) { - changed.add(fn) + when { + oldHash == null -> added.add(fn) + oldHash != newHash -> changed.add(fn) } } @@ -571,7 +573,8 @@ public class IncrementalCacheImpl( dirtyInlineFunctionsMap.put(className, changed.toList()) } - return ChangesInfo(inlineChanged = changed.isNotEmpty()) + return ChangesInfo(inlineChanged = changed.isNotEmpty(), + inlineAdded = added.isNotEmpty()) } public fun remove(className: JvmClassName) { @@ -729,7 +732,8 @@ public class IncrementalCacheImpl( data class ChangesInfo( public val protoChanged: Boolean = false, public val constantsChanged: Boolean = false, - public val inlineChanged: Boolean = false + public val inlineChanged: Boolean = false, + public val inlineAdded: Boolean = false ) { companion object { public val NO_CHANGES: ChangesInfo = ChangesInfo() @@ -738,7 +742,8 @@ data class ChangesInfo( public fun plus(other: ChangesInfo): ChangesInfo = ChangesInfo(protoChanged || other.protoChanged, constantsChanged || other.constantsChanged, - inlineChanged || other.inlineChanged) + inlineChanged || other.inlineChanged, + inlineAdded || other.inlineAdded) } From 75fbd4977e0cd497993c9e2a775b0511835a1f1f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 2 Sep 2015 14:43:33 +0300 Subject: [PATCH 0452/1557] Update inline incremental compilation for compile daemon Original commit: 06bfc5a16bf9b271c83ce543c0e4eac165d361f2 --- .../kotlin/compilerRunner/KotlinCompilerRunner.java | 9 +++++---- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 +++++--- .../incremental/IncrementalCompilationComponentsImpl.kt | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 3f62f14e35b..3a6d6c023e2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -31,6 +31,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; +import org.jetbrains.kotlin.modules.Module; import org.jetbrains.kotlin.rmi.*; import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; import org.jetbrains.kotlin.utils.UtilsPackage; @@ -58,7 +59,7 @@ public class KotlinCompilerRunner { CompilerSettings compilerSettings, MessageCollector messageCollector, CompilerEnvironment environment, - Map incrementalCaches, + Map incrementalCaches, File moduleFile, OutputItemsCollector collector ) { @@ -75,7 +76,7 @@ public class KotlinCompilerRunner { @NotNull CompilerSettings compilerSettings, @NotNull MessageCollector messageCollector, @NotNull CompilerEnvironment environment, - Map incrementalCaches, + Map incrementalCaches, @NotNull OutputItemsCollector collector, @NotNull Collection sourceFiles, @NotNull List libraryFiles, @@ -95,7 +96,7 @@ public class KotlinCompilerRunner { MessageCollector messageCollector, OutputItemsCollector collector, CompilerEnvironment environment, - Map incrementalCaches + Map incrementalCaches ) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); PrintStream out = new PrintStream(stream); @@ -116,7 +117,7 @@ public class KotlinCompilerRunner { CommonCompilerArguments arguments, String additionalArguments, CompilerEnvironment environment, - Map incrementalCaches, + Map incrementalCaches, PrintStream out, MessageCollector messageCollector ) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 3d2f6fa6b84..81ba0203fd5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -62,6 +62,7 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents +import org.jetbrains.kotlin.modules.Module import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.resolve.jvm.JvmClassName @@ -319,7 +320,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, - incrementalCaches.mapKeysTo(HashMap(incrementalCaches.size()), { it.getKey().id }), + incrementalCaches.mapKeysTo(HashMap(incrementalCaches.size()), + { ModuleToModuleBuildTargetAdapter(it.getKey()) }), filesToCompile, messageCollector) } @@ -486,7 +488,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, environment: CompilerEnvironment, - incrementalCaches: MutableMap?, + incrementalCaches: MutableMap?, messageCollector: MessageCollectorAdapter, project: JpsProject ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() @@ -541,7 +543,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, environment: CompilerEnvironment, - incrementalCaches: MutableMap?, + incrementalCaches: MutableMap?, filesToCompile: MultiMap, messageCollector: MessageCollectorAdapter ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt index e4ff9a9da86..850d9646f41 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt @@ -34,7 +34,7 @@ public class IncrementalCompilationComponentsImpl( override fun getLookupTracker(): LookupTracker = lookupTracker } -private class ModuleToModuleBuildTargetAdapter( +public class ModuleToModuleBuildTargetAdapter( private val moduleBuildTarget: ModuleBuildTarget ) : Module { From ccda1d2fbc0668272dd040edb38ca0f05e54e4ae Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Sep 2015 19:19:32 +0300 Subject: [PATCH 0453/1557] Rename hasInlineTo->inlinedTo Original commit: 21b6b41112ef4a0b88c8408afd7e3a905e31472b --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 752155826a1..37fbb257bf9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -117,7 +117,7 @@ public class IncrementalCacheImpl( val CLASS_TO_SOURCES = "class-to-sources.tab" val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions.tab" - val HAS_INLINE_TO = "has-inline-to.tab" + val INLINED_TO = "inlined-to.tab" private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } @@ -135,7 +135,7 @@ public class IncrementalCacheImpl( private val classToSourcesMap = ClassToSourcesMap(CLASS_TO_SOURCES.storageFile) private val dirtyOutputClassesMap = DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile) private val dirtyInlineFunctionsMap = DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile) - private val hasInlineTo = InlineFunctionsFilesMap(HAS_INLINE_TO.storageFile) + private val inlinedTo = InlineFunctionsFilesMap(INLINED_TO.storageFile) private val maps = listOf(protoMap, constantsMap, @@ -143,7 +143,7 @@ public class IncrementalCacheImpl( packagePartMap, sourceToClassesMap, dirtyOutputClassesMap, - hasInlineTo) + inlinedTo) private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val dependents = arrayListOf() @@ -151,7 +151,7 @@ public class IncrementalCacheImpl( private val inlineRegistering = object : InlineRegistering { override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - hasInlineTo.add(fromPath, jvmSignature, toPath) + inlinedTo.add(fromPath, jvmSignature, toPath) } } @@ -195,7 +195,7 @@ public class IncrementalCacheImpl( val classFilePath = getClassFilePath(internalName) fun addFilesAffectedByChangedInlineFuns(cache: IncrementalCacheImpl) { - val targetFiles = functions.flatMap { cache.hasInlineTo[classFilePath, it] } + val targetFiles = functions.flatMap { cache.inlinedTo[classFilePath, it] } result.addAll(targetFiles) } From 6e67d3edaf6f7af4062e0cbf086a3d5ae673e205 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Sep 2015 21:01:21 +0300 Subject: [PATCH 0454/1557] Simplify InlineFunctionsFilesMap Original commit: 3d9d6d356b098d983e045846af5dd8a1cb14fd09 --- .../jps/incremental/IncrementalCacheImpl.kt | 148 ++++++++---------- .../jps/incremental/storage/BasicMap.kt | 24 ++- 2 files changed, 86 insertions(+), 86 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 37fbb257bf9..2925f03dadc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -21,7 +21,6 @@ import com.intellij.util.io.BooleanDataDescriptor import com.intellij.util.io.DataExternalizer import com.intellij.util.io.IOUtil import com.intellij.util.io.KeyDescriptor -import gnu.trove.THashMap import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.BuildTarget @@ -36,6 +35,7 @@ import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.BasicMap +import org.jetbrains.kotlin.jps.incremental.storage.BasicStringMap import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.kotlin.ModuleMapping @@ -321,7 +321,7 @@ public class IncrementalCacheImpl( maps.forEach { it.close () } } - private inner class ProtoMap(storageFile: File) : BasicMap(storageFile, ByteArrayExternalizer) { + private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ByteArrayExternalizer) { public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): ChangesInfo { val header = kotlinClass.classHeader @@ -406,7 +406,7 @@ public class IncrementalCacheImpl( } } - private inner class ConstantsMap(storageFile: File) : BasicMap>(storageFile, ConstantsMapExternalizer) { + private inner class ConstantsMap(storageFile: File) : BasicStringMap>(storageFile, ConstantsMapExternalizer) { private fun getConstantsMap(bytes: ByteArray): Map? { val result = HashMap() @@ -509,7 +509,7 @@ public class IncrementalCacheImpl( } } - private inner class InlineFunctionsMap(storageFile: File) : BasicMap>(storageFile, StringToLongMapExternalizer) { + private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringToLongMapExternalizer) { private fun getInlineFunctionsMap(bytes: ByteArray): Map { val result = HashMap() @@ -585,7 +585,7 @@ public class IncrementalCacheImpl( value.dumpMap { java.lang.Long.toHexString(it) } } - private inner class PackagePartMap(storageFile: File) : BasicMap(storageFile, BooleanDataDescriptor.INSTANCE) { + private inner class PackagePartMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { public fun addPackagePart(className: JvmClassName) { storage.put(className.getInternalName(), true) } @@ -601,7 +601,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class SourceToClassesMap(storageFile: File) : BasicMap>(storageFile, StringListExternalizer) { + private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { override val keyDescriptor: KeyDescriptor get() = PathStringDescriptor.INSTANCE @@ -620,7 +620,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: List) = value.toString() } - private inner class ClassToSourcesMap(storageFile: File) : BasicMap>(storageFile, PathCollectionExternalizer) { + private inner class ClassToSourcesMap(storageFile: File) : BasicStringMap>(storageFile, PathCollectionExternalizer) { public fun get(className: JvmClassName): Collection = storage[className.internalName] ?: emptySet() @@ -638,7 +638,7 @@ public class IncrementalCacheImpl( value.dumpCollection() } - private inner class DirtyOutputClassesMap(storageFile: File) : BasicMap(storageFile, BooleanDataDescriptor.INSTANCE) { + private inner class DirtyOutputClassesMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { public fun markDirty(className: String) { storage.put(className, true) } @@ -654,7 +654,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicMap>(storageFile, StringListExternalizer) { + private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { public fun getEntries(): Map> = storage.allKeysWithExistingMapping .toMap(JvmClassName::byInternalName) { storage[it] } @@ -667,65 +667,36 @@ public class IncrementalCacheImpl( value.dumpCollection() } + /** - * Mapping: sourceFile->{inlineFunction->...targetFiles} + * Mapping: (sourceFile+inlineFunction)->(targetFiles) * * Where: * * sourceFile - path to some kotlin source * * inlineFunction - jvmSignature of some inline function in source file * * target files - collection of files inlineFunction has been inlined to */ - private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>>(storageFile, StringToPathsMapExternalizer) { - override val keyDescriptor: KeyDescriptor - get() = PathStringDescriptor() - - private val cache = THashMap>>(FileUtil.PATH_HASHING_STRATEGY) + private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathCollectionExternalizer) { + override val keyDescriptor: KeyDescriptor + get() = PathFunctionPairKeyDescriptor public fun add(sourcePath: String, jvmSignature: String, targetPath: String) { - val mapping = getMappingFromCache(sourcePath.normalizedPath) - val paths = mapping.getOrPut(jvmSignature) { THashSet(FileUtil.PATH_HASHING_STRATEGY) } - paths.add(targetPath.normalizedPath) - } - - public fun get(sourceFile: String, jvmSignature: String): Collection { - val normalizedPath = sourceFile.normalizedPath - if (normalizedPath !in cache && !storage.containsMapping(normalizedPath)) return emptySet() - - val mapping = getMappingFromCache(normalizedPath) - return mapping[jvmSignature] ?: emptySet() - } - - override fun clean() { - cache.clear() - super.clean() - } - - override fun flush(memoryCachesOnly: Boolean) { - for ((k, v) in cache) { - storage.put(k, v) + val key = PathFunctionPair(sourcePath, jvmSignature) + storage.appendData(key) { out -> + IOUtil.writeUTF(out, targetPath) } - - super.flush(memoryCachesOnly) } - override fun dumpValue(value: Map>) = - value.dumpMap { it.dumpCollection() } - - private fun getMappingFromCache(sourcePath: String): MutableMap> { - val cachedValue = cache[sourcePath] - if (cachedValue != null) return cachedValue - - val mapping = storage[sourcePath] ?: emptyMap() - val mutableMapping = hashMapOf>() - - for ((k, v) in mapping) { - val paths = THashSet(v, FileUtil.PATH_HASHING_STRATEGY) - mutableMapping[k] = paths - } - - cache[sourcePath] = mutableMapping - return mutableMapping + public fun get(sourcePath: String, jvmSignature: String): Collection { + val key = PathFunctionPair(sourcePath, jvmSignature) + return storage[key] ?: emptySet() } + + override fun dumpKey(key: PathFunctionPair): String = + "(${key.path}, ${key.function})" + + override fun dumpValue(value: Collection) = + value.dumpCollection() } } @@ -821,27 +792,6 @@ private object StringToLongMapExternalizer : StringMapExternalizer() { } } -private object StringToPathsMapExternalizer : StringMapExternalizer>() { - override fun readValue(input: DataInput): Collection { - val size = input.readInt() - val paths = THashSet(size, FileUtil.PATH_HASHING_STRATEGY) - - repeat(size) { - paths.add(IOUtil.readUTF(input)) - } - - return paths - } - - override fun writeValue(output: DataOutput, value: Collection) { - output.writeInt(value.size()) - - for (path in value) { - IOUtil.writeUTF(output, path) - } - } -} - private object StringListExternalizer : DataExternalizer> { override fun save(out: DataOutput, value: List) { value.forEach { IOUtil.writeUTF(out, it) } @@ -877,9 +827,6 @@ private object PathCollectionExternalizer : DataExternalizer> private val File.normalizedPath: String get() = FileUtil.toSystemIndependentName(canonicalPath) -private val String.normalizedPath: String - get() = FileUtil.toSystemIndependentName(this) - TestOnly private fun , V> Map.dumpMap(dumpValue: (V)->String): String = StringBuilder { @@ -898,3 +845,46 @@ private fun , V> Map.dumpMap(dumpValue: (V)->String): St TestOnly public fun > Collection.dumpCollection(): String = "[${sort().map(Any::toString).join(", ")}]" + +private class PathFunctionPair( + public val path: String, + public val function: String +): Comparable { + override fun compareTo(other: PathFunctionPair): Int { + val pathComp = FileUtil.comparePaths(path, other.path) + + if (pathComp != 0) return pathComp + + return function.compareTo(other.function) + } + + override fun equals(other: Any?): Boolean = + when (other) { + is PathFunctionPair -> + FileUtil.pathsEqual(path, other.path) && function == other.function + else -> + false + } + + override fun hashCode(): Int = 31 * FileUtil.pathHashCode(path) + function.hashCode() +} + +private object PathFunctionPairKeyDescriptor : KeyDescriptor { + override fun getHashCode(value: PathFunctionPair): Int = + value.hashCode() + + override fun isEqual(val1: PathFunctionPair, val2: PathFunctionPair): Boolean = + val1 == val2 + + override fun read(`in`: DataInput): PathFunctionPair { + val path = IOUtil.readUTF(`in`) + val function = IOUtil.readUTF(`in`) + return PathFunctionPair(path, function) + } + + override fun save(out: DataOutput, value: PathFunctionPair) { + IOUtil.writeUTF(out, value.path) + IOUtil.writeUTF(out, value.function) + } + +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 995a47303e9..064748680df 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -25,16 +25,15 @@ import org.jetbrains.kotlin.utils.Printer import java.io.File import java.io.IOException -public abstract class BasicMap( +public abstract class BasicMap, V>( private val storageFile: File, private val valueExternalizer: DataExternalizer ) { - protected open val keyDescriptor: KeyDescriptor - get() = EnumeratorStringDescriptor() + protected abstract val keyDescriptor: KeyDescriptor - protected var storage: PersistentHashMap = createMap() + protected var storage: PersistentHashMap = createMap() - public fun contains(key: String): Boolean = storage.containsMapping(key) + public fun contains(key: K): Boolean = storage.containsMapping(key) public open fun clean() { try { @@ -74,7 +73,7 @@ public abstract class BasicMap( pushIndent() for (key in storage.getAllKeysWithExistingMapping().sort()) { - println("$key -> ${dumpValue(storage[key])}") + println("${dumpKey(key)} -> ${dumpValue(storage[key])}") } popIndent() @@ -84,8 +83,19 @@ public abstract class BasicMap( }.toString() } + protected abstract fun dumpKey(key: K): String protected abstract fun dumpValue(value: V): String - private fun createMap(): PersistentHashMap = + private fun createMap(): PersistentHashMap = PersistentHashMap(storageFile, keyDescriptor, valueExternalizer) +} + +public abstract class BasicStringMap( + private val storageFile: File, + private val valueExternalizer: DataExternalizer +) : BasicMap(storageFile, valueExternalizer) { + override val keyDescriptor: KeyDescriptor + get() = EnumeratorStringDescriptor() + + override fun dumpKey(key: String): String = key } \ No newline at end of file From 4e09fc18e81e0f45dd0249397f43c68023282f92 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Sep 2015 11:33:36 +0300 Subject: [PATCH 0455/1557] Update INCREMENTAL_CACHE_OWN_VERSION Original commit: 08a11b627c11f599df5237b4242632ffaea7570d --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 2925f03dadc..542163392a0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -68,7 +68,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin" class CacheFormatVersion(targetDataRoot: File) { companion object { // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 3 + private val INCREMENTAL_CACHE_OWN_VERSION = 4 private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION private val NON_INCREMENTAL_MODE_PSEUDO_VERSION = Int.MAX_VALUE From bee0ec76d6512ab9a85d5eeb9786047555283bd5 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Sep 2015 14:52:14 +0300 Subject: [PATCH 0456/1557] Minor: remove unnecessary 'open' modifiers Original commit: 06774423e0c5e9af0b50fd4e5aad691e6a664f07 --- .../org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 064748680df..29bf3ae2ec2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -35,7 +35,7 @@ public abstract class BasicMap, V>( public fun contains(key: K): Boolean = storage.containsMapping(key) - public open fun clean() { + public fun clean() { try { storage.close() } @@ -50,7 +50,7 @@ public abstract class BasicMap, V>( } } - public open fun flush(memoryCachesOnly: Boolean) { + public fun flush(memoryCachesOnly: Boolean) { if (memoryCachesOnly) { if (storage.isDirty()) { storage.dropMemoryCaches() From 55ca868be3c503ba2af58a2e7dd23e37b46515dd Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Sep 2015 15:55:56 +0300 Subject: [PATCH 0457/1557] Minor: make BasicStringMap properties parameters Original commit: af144883dc66503b01de82a6da1d9f1ae58302ac --- .../org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 29bf3ae2ec2..db5e3f503d2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -91,8 +91,8 @@ public abstract class BasicMap, V>( } public abstract class BasicStringMap( - private val storageFile: File, - private val valueExternalizer: DataExternalizer + storageFile: File, + valueExternalizer: DataExternalizer ) : BasicMap(storageFile, valueExternalizer) { override val keyDescriptor: KeyDescriptor get() = EnumeratorStringDescriptor() From 3e9b92bf7ff0407466b5d860233723c3fe8feb4f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Sep 2015 15:57:58 +0300 Subject: [PATCH 0458/1557] Pass keyDescriptor to BasicMap using constructor Original commit: a6605627432be9c259445dc0cb1086c8cf90e5d2 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 10 ++-------- .../kotlin/jps/incremental/storage/BasicMap.kt | 12 +++++++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 542163392a0..d92d0d119e3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -601,10 +601,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { - override val keyDescriptor: KeyDescriptor - get() = PathStringDescriptor.INSTANCE - + private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringListExternalizer) { public fun clearOutputsForSource(sourceFile: File) { storage.remove(sourceFile.getAbsolutePath()) } @@ -676,10 +673,7 @@ public class IncrementalCacheImpl( * * inlineFunction - jvmSignature of some inline function in source file * * target files - collection of files inlineFunction has been inlined to */ - private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathCollectionExternalizer) { - override val keyDescriptor: KeyDescriptor - get() = PathFunctionPairKeyDescriptor - + private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { public fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val key = PathFunctionPair(sourcePath, jvmSignature) storage.appendData(key) { out -> diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index db5e3f503d2..c89fb8bc5ce 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -27,10 +27,9 @@ import java.io.IOException public abstract class BasicMap, V>( private val storageFile: File, + private val keyDescriptor: KeyDescriptor, private val valueExternalizer: DataExternalizer ) { - protected abstract val keyDescriptor: KeyDescriptor - protected var storage: PersistentHashMap = createMap() public fun contains(key: K): Boolean = storage.containsMapping(key) @@ -92,10 +91,13 @@ public abstract class BasicMap, V>( public abstract class BasicStringMap( storageFile: File, + keyDescriptor: KeyDescriptor, valueExternalizer: DataExternalizer -) : BasicMap(storageFile, valueExternalizer) { - override val keyDescriptor: KeyDescriptor - get() = EnumeratorStringDescriptor() +) : BasicMap(storageFile, keyDescriptor, valueExternalizer) { + public constructor( + storageFile: File, + valueExternalizer: DataExternalizer + ) : this(storageFile, EnumeratorStringDescriptor.INSTANCE, valueExternalizer) override fun dumpKey(key: String): String = key } \ No newline at end of file From 1e20f25119e1fc64f9284a99b29413ac7896b8c2 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Sep 2015 22:11:27 +0300 Subject: [PATCH 0459/1557] Fix incremental compilation of inline call assigned to val Original commit: 61423a19f0248dba8ea6c158aa37f08e28e846c3 --- .../jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../pureKotlin/inlineToTopLevelVal/build.log | 14 ++++++++++++++ .../pureKotlin/inlineToTopLevelVal/inline.kt | 5 +++++ .../pureKotlin/inlineToTopLevelVal/inline.kt.new | 5 +++++ .../pureKotlin/inlineToTopLevelVal/other.kt | 3 +++ .../pureKotlin/inlineToTopLevelVal/usage.kt | 3 +++ 6 files changed, 36 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 662a2a15cd6..956059104c1 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -305,6 +305,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineToTopLevelVal") + public void testInlineToTopLevelVal() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log new file mode 100644 index 00000000000..5720130d7a4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$usage$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/usage.kt new file mode 100644 index 00000000000..956c97c4cd4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.f() \ No newline at end of file From 82dc6843098e92876e5217ab19a20b53fbe9b5ca Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 15:25:39 +0300 Subject: [PATCH 0460/1557] Add incremental compilation inline call site tests Original commit: 8d1480e877a596866128a29945ada23e55de2cf2 --- .../build/IncrementalJpsTestGenerated.java | 94 +++++++++++++++++-- .../inlineFunCallSite/classProperty/Usage.kt | 5 + .../inlineFunCallSite/classProperty/build.log | 14 +++ .../classProperty}/inline.kt | 0 .../classProperty}/inline.kt.new | 0 .../classProperty}/other.kt | 0 .../companionObjectProperty/Usage.kt | 7 ++ .../companionObjectProperty/build.log | 15 +++ .../companionObjectProperty/inline.kt | 5 + .../companionObjectProperty/inline.kt.new | 5 + .../companionObjectProperty/other.kt | 3 + .../function}/build.log | 8 +- .../inlineFunCallSite/function/inline.kt | 5 + .../inlineFunCallSite/function/inline.kt.new | 5 + .../inlineFunCallSite/function/other.kt | 3 + .../inlineFunCallSite/function/usage.kt | 5 + .../inlineFunCallSite/getter/Usage.kt | 6 ++ .../inlineFunCallSite/getter/build.log | 18 ++++ .../inlineFunCallSite/getter/inline.kt | 5 + .../inlineFunCallSite/getter/inline.kt.new | 5 + .../inlineFunCallSite/getter/other.kt | 3 + .../inlineFunCallSite/getter/topLevelUsage.kt | 4 + .../inlineFunCallSite/lambda/build.log | 17 ++++ .../inlineFunCallSite/lambda/inline.kt | 5 + .../inlineFunCallSite/lambda/inline.kt.new | 5 + .../inlineFunCallSite/lambda/other.kt | 3 + .../inlineFunCallSite/lambda/usage.kt | 6 ++ .../inlineFunCallSite/localFun/build.log | 17 ++++ .../inlineFunCallSite/localFun/inline.kt | 5 + .../inlineFunCallSite/localFun/inline.kt.new | 5 + .../inlineFunCallSite/localFun/other.kt | 3 + .../inlineFunCallSite/localFun/usage.kt | 9 ++ .../inlineFunCallSite/method/Usage.kt | 7 ++ .../inlineFunCallSite/method/build.log | 14 +++ .../inlineFunCallSite/method/inline.kt | 5 + .../inlineFunCallSite/method/inline.kt.new | 5 + .../inlineFunCallSite/method/other.kt | 3 + .../parameterDefaultValue/build.log | 16 ++++ .../parameterDefaultValue/inline.kt | 5 + .../parameterDefaultValue/inline.kt.new | 5 + .../parameterDefaultValue/other.kt | 3 + .../parameterDefaultValue/usage.kt | 3 + .../Usage.kt | 3 + .../build.log | 14 +++ .../inline.kt | 5 + .../inline.kt.new | 5 + .../other.kt | 3 + .../inlineFunCallSite/superCall/Usage.kt | 3 + .../inlineFunCallSite/superCall/UsageBase.kt | 3 + .../inlineFunCallSite/superCall/build.log | 14 +++ .../inlineFunCallSite/superCall/inline.kt | 5 + .../inlineFunCallSite/superCall/inline.kt.new | 5 + .../inlineFunCallSite/superCall/other.kt | 3 + .../inlineFunCallSite/thisCall/Usage.kt | 5 + .../inlineFunCallSite/thisCall/build.log | 14 +++ .../inlineFunCallSite/thisCall/inline.kt | 5 + .../inlineFunCallSite/thisCall/inline.kt.new | 5 + .../inlineFunCallSite/thisCall/other.kt | 3 + .../topLevelObjectProperty/Usage.kt | 5 + .../topLevelObjectProperty/build.log | 14 +++ .../topLevelObjectProperty/inline.kt | 5 + .../topLevelObjectProperty/inline.kt.new | 5 + .../topLevelObjectProperty/other.kt | 3 + .../topLevelProperty/build.log | 16 ++++ .../topLevelProperty/inline.kt | 5 + .../topLevelProperty/inline.kt.new | 5 + .../topLevelProperty/other.kt | 3 + .../topLevelProperty}/usage.kt | 0 68 files changed, 503 insertions(+), 9 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log rename jps/jps-plugin/testData/incremental/{pureKotlin/inlineToTopLevelVal => inlineFunCallSite/classProperty}/inline.kt (100%) rename jps/jps-plugin/testData/incremental/{pureKotlin/inlineToTopLevelVal => inlineFunCallSite/classProperty}/inline.kt.new (100%) rename jps/jps-plugin/testData/incremental/{pureKotlin/inlineToTopLevelVal => inlineFunCallSite/classProperty}/other.kt (100%) create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt rename jps/jps-plugin/testData/incremental/{pureKotlin/inlineToTopLevelVal => inlineFunCallSite/function}/build.log (54%) create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt rename jps/jps-plugin/testData/incremental/{pureKotlin/inlineToTopLevelVal => inlineFunCallSite/topLevelProperty}/usage.kt (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 956059104c1..53dcf07793c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -305,12 +305,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("inlineToTopLevelVal") - public void testInlineToTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/"); - doTest(fileName); - } - @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); @@ -750,4 +744,92 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } } + + @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InlineFunCallSite extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInInlineFunCallSite() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("classProperty") + public void testClassProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty/"); + doTest(fileName); + } + + @TestMetadata("companionObjectProperty") + public void testCompanionObjectProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/"); + doTest(fileName); + } + + @TestMetadata("function") + public void testFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); + doTest(fileName); + } + + @TestMetadata("getter") + public void testGetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter/"); + doTest(fileName); + } + + @TestMetadata("lambda") + public void testLambda() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda/"); + doTest(fileName); + } + + @TestMetadata("localFun") + public void testLocalFun() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun/"); + doTest(fileName); + } + + @TestMetadata("method") + public void testMethod() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method/"); + doTest(fileName); + } + + @TestMetadata("parameterDefaultValue") + public void testParameterDefaultValue() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/"); + doTest(fileName); + } + + @TestMetadata("primaryConstructorParameterDefaultValue") + public void testPrimaryConstructorParameterDefaultValue() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/"); + doTest(fileName); + } + + @TestMetadata("superCall") + public void testSuperCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall/"); + doTest(fileName); + } + + @TestMetadata("thisCall") + public void testThisCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall/"); + doTest(fileName); + } + + @TestMetadata("topLevelObjectProperty") + public void testTopLevelObjectProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/"); + doTest(fileName); + } + + @TestMetadata("topLevelProperty") + public void testTopLevelProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); + doTest(fileName); + } + + } } diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt new file mode 100644 index 00000000000..0e9fabbe7c9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt @@ -0,0 +1,5 @@ +package usage + +class Usage { + val x = inline.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt.new rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/other.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/other.kt rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/other.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt new file mode 100644 index 00000000000..f628d09621e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt @@ -0,0 +1,7 @@ +package usage + +class Usage { + companion object { + val x = inline.f() + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log new file mode 100644 index 00000000000..9c606a33ab8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage$Companion.class +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log similarity index 54% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log index 5720130d7a4..c898540bf6a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log @@ -1,14 +1,16 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt new file mode 100644 index 00000000000..67356ea2553 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun usage() { + val x = inline.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt new file mode 100644 index 00000000000..9ea5cdf8614 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt @@ -0,0 +1,6 @@ +package usage + +class Usage { + val x: Int + get() = inline.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log new file mode 100644 index 00000000000..2f1bb65b15e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/TopLevelUsageKt.class +out/production/module/usage/Usage.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/Usage.kt +src/topLevelUsage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt new file mode 100644 index 00000000000..9d20c670526 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt @@ -0,0 +1,4 @@ +package usage + +val y: Int + get() = inline.f() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log new file mode 100644 index 00000000000..73c24d79a1d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt$usage$use$1.class +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt new file mode 100644 index 00000000000..4a90efe14ec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt @@ -0,0 +1,6 @@ +package usage + +fun usage() { + val use = { inline.f() } + use() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log new file mode 100644 index 00000000000..e03d85b028e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt$usage$1.class +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt new file mode 100644 index 00000000000..fd3041c6fb8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt @@ -0,0 +1,9 @@ +package usage + +fun usage() { + fun use() { + inline.f() + } + + use() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt new file mode 100644 index 00000000000..56dcd914697 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt @@ -0,0 +1,7 @@ +package usage + +class Usage { + fun use() { + val x = inline.f() + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log new file mode 100644 index 00000000000..c898540bf6a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt new file mode 100644 index 00000000000..d321c08ca16 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt @@ -0,0 +1,3 @@ +package usage + +fun usage(x: Int = inline.f()) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt new file mode 100644 index 00000000000..cd3d8b3b67a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt @@ -0,0 +1,3 @@ +package usage + +class Usage(val x: Int = inline.f()) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt new file mode 100644 index 00000000000..104a3571973 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt @@ -0,0 +1,3 @@ +package usage + +class Usage : UsageBase(inline.f()) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt new file mode 100644 index 00000000000..0febecdaee8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt @@ -0,0 +1,3 @@ +package usage + +abstract class UsageBase(val x: Int) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt new file mode 100644 index 00000000000..97ca7c60ca7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt @@ -0,0 +1,5 @@ +package usage + +class Usage(val x: Int) { + constructor() : this(inline.f()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt new file mode 100644 index 00000000000..5d0fdd64d4d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt @@ -0,0 +1,5 @@ +package usage + +object Usage { + val x = inline.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log new file mode 100644 index 00000000000..c898540bf6a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/usage.kt rename to jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt From 010b3487127fc9eab74621a894c18fd1000f9469 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 15:41:03 +0300 Subject: [PATCH 0461/1557] Add test for inline function lines changed only Original commit: 5d305a7286aceafae7b532b70a8e3ecbc569ae6c --- .../jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../pureKotlin/inlineLinesChanged/build.log | 14 ++++++++++++++ .../pureKotlin/inlineLinesChanged/inline.kt | 7 +++++++ .../pureKotlin/inlineLinesChanged/inline.kt.new | 9 +++++++++ .../pureKotlin/inlineLinesChanged/useF.kt | 5 +++++ .../pureKotlin/inlineLinesChanged/useG.kt | 5 +++++ 6 files changed, 46 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 53dcf07793c..9743f18bf6a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -305,6 +305,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineLinesChanged") + public void testInlineLinesChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log new file mode 100644 index 00000000000..ad663d5522d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/inline/InlinePackage$inline$*.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsagePackage$useG$*.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/useG.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt new file mode 100644 index 00000000000..74f00003d47 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt @@ -0,0 +1,7 @@ +package inline + +inline fun f(): String = + "inline.f()" + +inline fun g(): String = + "inline.g()" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new new file mode 100644 index 00000000000..14c3753b9d9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/inline.kt.new @@ -0,0 +1,9 @@ +package inline + +inline fun f(): String = + "inline.f()" + + + +inline fun g(): String = + "inline.g()" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt new file mode 100644 index 00000000000..d2155ae631b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useF.kt @@ -0,0 +1,5 @@ +package usage + +fun useF() { + inline.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt new file mode 100644 index 00000000000..24cf31b012b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/useG.kt @@ -0,0 +1,5 @@ +package usage + +fun useG() { + inline.g() +} \ No newline at end of file From 5f59e245238371498e04f09e6f799e0d0fdd1074 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 15:45:55 +0300 Subject: [PATCH 0462/1557] Remove duplicating simple test case Original commit: d9e9f110289d2d2eccc59c306781eb7f22bef383 --- .../build/IncrementalJpsTestGenerated.java | 12 ------------ .../pureKotlin/inlineFunction/build.log | 14 -------------- .../pureKotlin/inlineFunction/inline.kt | 5 ----- .../pureKotlin/inlineFunction/inline.kt.new | 6 ------ .../inlineFunction/notUsesInline.kt | 5 ----- .../pureKotlin/inlineFunction/usesInline.kt | 5 ----- .../packageInlineFunctionChanged/build.log | 19 ------------------- .../packageInlineFunctionChanged/inline.kt | 6 ------ .../inline.kt.new | 6 ------ .../packageInlineFunctionChanged/usage.kt | 5 ----- 10 files changed, 83 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 9743f18bf6a..66233909bcc 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -281,12 +281,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("inlineFunction") - public void testInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunction/"); - doTest(fileName); - } - @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); @@ -395,12 +389,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("packageInlineFunctionChanged") - public void testPackageInlineFunctionChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/"); - doTest(fileName); - } - @TestMetadata("packageInlineFunctionFromOurPackage") public void testPackageInlineFunctionFromOurPackage() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log deleted file mode 100644 index 1fa543e2cc6..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/build.log +++ /dev/null @@ -1,14 +0,0 @@ -Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class -out/production/module/inline/InlinePackage.class -End of files -Compiling files: -src/inline.kt -End of files -Cleaning output files: -out/production/module/usage/UsagePackage$usesInline$*.class -out/production/module/usage/UsagePackage.class -End of files -Compiling files: -src/usesInline.kt -End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt deleted file mode 100644 index c0f66d312a5..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt +++ /dev/null @@ -1,5 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - body() -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new deleted file mode 100644 index 80d71e901a3..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/inline.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - println("i'm inline function") - body() -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt deleted file mode 100644 index 1de875e529a..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/notUsesInline.kt +++ /dev/null @@ -1,5 +0,0 @@ -package usage - -fun main(args: Array) { - test() -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt deleted file mode 100644 index 5e87e229853..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunction/usesInline.kt +++ /dev/null @@ -1,5 +0,0 @@ -package usage - -fun test() { - inline.f { println("to be inlined") } -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log deleted file mode 100644 index 232ca78ca70..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/build.log +++ /dev/null @@ -1,19 +0,0 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class -End of files -Compiling files: -src/inline.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class -out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class -End of files -Compiling files: -src/inline.kt -src/usage.kt -End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt deleted file mode 100644 index 80d71e901a3..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt +++ /dev/null @@ -1,6 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - println("i'm inline function") - body() -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt.new deleted file mode 100644 index 87422d45d88..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/inline.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - body() - println("i'm inline function") -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/usage.kt deleted file mode 100644 index 3f8161245b6..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionChanged/usage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package usage - -fun main(args: Array) { - inline.f { println("to be inlined") } -} From f315d6d64d50f32315f439cfbbe259427f5f811b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 15:51:18 +0300 Subject: [PATCH 0463/1557] Change one package part, then another at different steps Original commit: 45dae5e1a457e050492007d19124ce75d9cc1006 --- .../{module1_inlineF.kt.new => module1_inlineF.kt.new.1} | 0 .../{module1_inlineG.kt.new => module1_inlineG.kt.new.2} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/{module1_inlineF.kt.new => module1_inlineF.kt.new.1} (100%) rename jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/{module1_inlineG.kt.new => module1_inlineG.kt.new.2} (100%) diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new rename to jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineF.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new rename to jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/module1_inlineG.kt.new.2 From db1fed64b25025c8639fa6cb135f0d6022926b30 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 16:46:04 +0300 Subject: [PATCH 0464/1557] Use simple data class TargetId instead of Module to get incremental cache Original commit: 7e515e38200a095d76299c979e62a264cd12e052 --- .../compilerRunner/KotlinCompilerRunner.java | 10 +++--- .../kotlin/jps/build/KotlinBuilder.kt | 12 +++---- .../IncrementalCompilationComponentsImpl.kt | 32 ++----------------- .../jetbrains/kotlin/modules/modulesUtil.kt | 22 +++++++++++++ 4 files changed, 36 insertions(+), 40 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 3a6d6c023e2..36f347dfb71 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; -import org.jetbrains.kotlin.modules.Module; +import org.jetbrains.kotlin.modules.TargetId; import org.jetbrains.kotlin.rmi.*; import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; import org.jetbrains.kotlin.utils.UtilsPackage; @@ -59,7 +59,7 @@ public class KotlinCompilerRunner { CompilerSettings compilerSettings, MessageCollector messageCollector, CompilerEnvironment environment, - Map incrementalCaches, + Map incrementalCaches, File moduleFile, OutputItemsCollector collector ) { @@ -76,7 +76,7 @@ public class KotlinCompilerRunner { @NotNull CompilerSettings compilerSettings, @NotNull MessageCollector messageCollector, @NotNull CompilerEnvironment environment, - Map incrementalCaches, + Map incrementalCaches, @NotNull OutputItemsCollector collector, @NotNull Collection sourceFiles, @NotNull List libraryFiles, @@ -96,7 +96,7 @@ public class KotlinCompilerRunner { MessageCollector messageCollector, OutputItemsCollector collector, CompilerEnvironment environment, - Map incrementalCaches + Map incrementalCaches ) { ByteArrayOutputStream stream = new ByteArrayOutputStream(); PrintStream out = new PrintStream(stream); @@ -117,7 +117,7 @@ public class KotlinCompilerRunner { CommonCompilerArguments arguments, String additionalArguments, CompilerEnvironment environment, - Map incrementalCaches, + Map incrementalCaches, PrintStream out, MessageCollector messageCollector ) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 81ba0203fd5..defd46693df 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -62,7 +62,7 @@ import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -import org.jetbrains.kotlin.modules.Module +import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.resolve.jvm.JvmClassName @@ -320,8 +320,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, - incrementalCaches.mapKeysTo(HashMap(incrementalCaches.size()), - { ModuleToModuleBuildTargetAdapter(it.getKey()) }), + incrementalCaches.mapKeysTo(HashMap(incrementalCaches.size()), + { TargetId(it.getKey()) }), filesToCompile, messageCollector) } @@ -346,7 +346,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR || className.startsWith("org.apache.log4j.") // For logging from compiler || className == "org.jetbrains.kotlin.progress.CompilationCanceledStatus" || className == "org.jetbrains.kotlin.progress.CompilationCanceledException" - || className == "org.jetbrains.kotlin.modules.Module" + || className == "org.jetbrains.kotlin.modules.TargetId" }, compilerServices ) @@ -488,7 +488,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, environment: CompilerEnvironment, - incrementalCaches: MutableMap?, + incrementalCaches: MutableMap?, messageCollector: MessageCollectorAdapter, project: JpsProject ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() @@ -543,7 +543,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, environment: CompilerEnvironment, - incrementalCaches: MutableMap?, + incrementalCaches: MutableMap?, filesToCompile: MultiMap, messageCollector: MessageCollectorAdapter ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt index 850d9646f41..940313a74c1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt @@ -20,42 +20,16 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -import org.jetbrains.kotlin.modules.Module +import org.jetbrains.kotlin.modules.TargetId public class IncrementalCompilationComponentsImpl( caches: Map, private val lookupTracker: LookupTracker ): IncrementalCompilationComponents { - private val caches = caches.mapKeys { ModuleToModuleBuildTargetAdapter(it.key) } + private val caches = caches.mapKeys { TargetId(it.key) } - override fun getIncrementalCache(target: Module): IncrementalCache = + override fun getIncrementalCache(target: TargetId): IncrementalCache = caches[target]!! override fun getLookupTracker(): LookupTracker = lookupTracker } - -public class ModuleToModuleBuildTargetAdapter( - private val moduleBuildTarget: ModuleBuildTarget -) : Module { - - override fun getModuleName(): String = - moduleBuildTarget.id - - override fun getModuleType(): String = - moduleBuildTarget.targetType.typeId - - override fun getAnnotationsRoots(): List = - throw UnsupportedOperationException() - - override fun getClasspathRoots(): List = - throw UnsupportedOperationException() - - override fun getJavaSourceRoots(): List = - throw UnsupportedOperationException() - - override fun getOutputDirectory(): String = - throw UnsupportedOperationException() - - override fun getSourceFiles(): List = - throw UnsupportedOperationException() -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt new file mode 100644 index 00000000000..a972911e445 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt @@ -0,0 +1,22 @@ +/* + * Copyright 2010-2015 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.kotlin.modules + +import org.jetbrains.jps.incremental.ModuleBuildTarget + +public fun TargetId(moduleBuildTarget: ModuleBuildTarget): TargetId = + TargetId(moduleBuildTarget.id, moduleBuildTarget.targetType.typeId) From 3e5bc828b997c151597a89e41dfd5f92bf94980b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 18:58:39 +0300 Subject: [PATCH 0465/1557] Update after rebase to new package parts Original commit: b07ae87e25d82ea0f4ecdd0a72ba749ef4a0bac0 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index d92d0d119e3..cc7b75b4dd0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -243,7 +243,8 @@ public class IncrementalCacheImpl( packagePartMap.addPackagePart(className) protoMap.process(kotlinClass, isPackage = true) + - constantsMap.process(kotlinClass) + constantsMap.process(kotlinClass) + + inlineFunctionsMap.process(kotlinClass) } header.isCompatibleClassKind() && JvmAnnotationNames.KotlinClass.Kind.CLASS == header.classKind -> protoMap.process(kotlinClass, isPackage = false) + From 3c10ad29a65203a6cbe45d36a2571db049955b97 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 19:04:43 +0300 Subject: [PATCH 0466/1557] Update build logs in incremental tests Original commit: 196e59247fa60502a4e957a121007b3a1e650ecf --- .../inlineFunctionInlined/build.log | 10 ------ .../inlineFunctionTwoPackageParts/build.log | 36 +++++++++++-------- .../multiModule/transitiveInlining/build.log | 10 ------ .../classInlineFunctionChanged/build.log | 2 -- .../inlineFunctionRemoved/build.log | 8 ----- .../build.log | 10 ++++-- .../pureKotlin/inlineLinesChanged/build.log | 8 +++-- .../inlineTwoFunctionsOneChanged/build.log | 8 +++-- 8 files changed, 40 insertions(+), 52 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index f03d1cfe3b9..d83166dbc16 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -7,16 +7,6 @@ Compiling files: module1/src/module1_inline.kt End of files Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inlineKt.class -out/production/module1/inline/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_inline.kt -module1/src/module1_other.kt -End of files -Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageKt.class out/production/module2/usage/UsagePackage.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index f03d1cfe3b9..e58786bb51a 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -1,26 +1,34 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inlineKt.class +out/production/module1/inline/Module1_inlineFKt.class End of files Compiling files: -module1/src/module1_inline.kt -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.class -out/production/module1/inline/Module1_inlineKt.class -out/production/module1/inline/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_inline.kt -module1/src/module1_other.kt +module1/src/module1_inlineF.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageKt.class +out/production/module2/usage/Module2_usageFKt.class out/production/module2/usage/UsagePackage.class End of files Compiling files: -module2/src/module2_usage.kt +module2/src/module2_usageF.kt +End of files + + +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/inline/InlinePackage.class +out/production/module1/inline/Module1_inlineGKt.class +End of files +Compiling files: +module1/src/module1_inlineG.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/usage/Module2_usageGKt.class +out/production/module2/usage/UsagePackage.class +End of files +Compiling files: +module2/src/module2_usageG.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 2e4f60176ff..cbcb127580d 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -7,16 +7,6 @@ Compiling files: module1/src/module1_a.kt End of files Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/APackage.class -out/production/module1/a/Module1_aKt.class -out/production/module1/a/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_a.kt -module1/src/module1_other.kt -End of files -Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index ccd83f9121d..66ea0c9264b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -6,11 +6,9 @@ src/inline.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/inline/Klass.class out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: -src/inline.kt src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 119e029fc18..1610391fa42 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -5,12 +5,4 @@ out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class -End of files -Compiling files: -src/inline.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 8c256b559ec..4fc890074a5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -8,11 +8,17 @@ src/a.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class out/production/module/test/BKt.class out/production/module/test/TestPackage.class End of files Compiling files: -src/a.kt src/b.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/AKt.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/a.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log index ad663d5522d..387aadf985d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log @@ -1,14 +1,16 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/usage/UsagePackage$useG$*.class +out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsagePackage.class +out/production/module/usage/UseGKt.class End of files Compiling files: src/useG.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log index 793ddfbc22e..c881d0f9efe 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log @@ -1,14 +1,16 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/usage/UsagePackage$usesG$*.class +out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsagePackage.class +out/production/module/usage/UsesGKt.class End of files Compiling files: src/usesG.kt -End of files +End of files \ No newline at end of file From 76f80a44b6ff0be24e91dc7519355a907b545254 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 20:19:20 +0300 Subject: [PATCH 0467/1557] Fix incremental compilation for delegated property with inline accessor Original commit: a22e15449d12b2c61904e3ef48c48f8fc5a70e3d --- .../build/IncrementalJpsTestGenerated.java | 12 +++++++ .../UsageVal.kt | 7 ++++ .../UsageVar.kt | 7 ++++ .../build.log | 32 +++++++++++++++++++ .../inline.kt | 3 ++ .../inlineGet.kt | 5 +++ .../inlineGet.kt.new.1 | 5 +++ .../inlineSet.kt | 5 +++ .../inlineSet.kt.new.2 | 5 +++ .../other.kt | 3 ++ .../UsageVal.kt | 7 ++++ .../UsageVar.kt | 7 ++++ .../build.log | 28 ++++++++++++++++ .../inline.kt | 11 +++++++ .../inline.kt.new.1 | 11 +++++++ .../inline.kt.new.2 | 11 +++++++ .../other.kt | 3 ++ 17 files changed, 162 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 66233909bcc..fd38191767b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -239,6 +239,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("delegatedPropertyInlineExtensionAccessor") + public void testDelegatedPropertyInlineExtensionAccessor() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/"); + doTest(fileName); + } + + @TestMetadata("delegatedPropertyInlineMethodAccessor") + public void testDelegatedPropertyInlineMethodAccessor() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/"); + doTest(fileName); + } + @TestMetadata("dependencyClassReferenced") public void testDependencyClassReferenced() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt new file mode 100644 index 00000000000..a41723cbeb7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVal.kt @@ -0,0 +1,7 @@ +package usage + +import inline.* + +class UsageVal { + val x: Int by Inline() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt new file mode 100644 index 00000000000..02b4b418fb4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/UsageVar.kt @@ -0,0 +1,7 @@ +package usage + +import inline.* + +class UsageVar { + var x: Int by Inline() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log new file mode 100644 index 00000000000..c2f6c6d4d8f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log @@ -0,0 +1,32 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineGetKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inlineGet.kt +End of files +Cleaning output files: +out/production/module/usage/UsageVal.class +out/production/module/usage/UsageVar.class +End of files +Compiling files: +src/UsageVal.kt +src/UsageVar.kt +End of files + + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlinePackage.class +out/production/module/inline/InlineSetKt.class +End of files +Compiling files: +src/inlineSet.kt +End of files +Cleaning output files: +out/production/module/usage/UsageVar.class +End of files +Compiling files: +src/UsageVar.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt new file mode 100644 index 00000000000..b10bc0a71dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inline.kt @@ -0,0 +1,3 @@ +package inline + +class Inline \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt new file mode 100644 index 00000000000..405ef2eef20 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt @@ -0,0 +1,5 @@ +package inline + +inline fun Inline.get(receiver: Any?, prop: PropertyMetadata): Int { + return 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 new file mode 100644 index 00000000000..efc57e7afd9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 @@ -0,0 +1,5 @@ +package inline + +inline fun Inline.get(receiver: Any?, prop: PropertyMetadata): Int { + return 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt new file mode 100644 index 00000000000..ffebce91d6a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt @@ -0,0 +1,5 @@ +package inline + +inline fun Inline.set(receiver: Any?, prop: PropertyMetadata, value: Int) { + println(value) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 new file mode 100644 index 00000000000..4eda0b9b94e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 @@ -0,0 +1,5 @@ +package inline + +inline fun Inline.set(receiver: Any?, prop: PropertyMetadata, value: Int) { + println(value * 2) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt new file mode 100644 index 00000000000..8e918b81f47 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVal.kt @@ -0,0 +1,7 @@ +package usage + +import inline.Inline + +class UsageVal { + val x: Int by Inline() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt new file mode 100644 index 00000000000..3221201c277 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/UsageVar.kt @@ -0,0 +1,7 @@ +package usage + +import inline.Inline + +class UsageVar { + var x: Int by Inline() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log new file mode 100644 index 00000000000..eafebdfd179 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log @@ -0,0 +1,28 @@ +Cleaning output files: +out/production/module/inline/Inline.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsageVal.class +out/production/module/usage/UsageVar.class +End of files +Compiling files: +src/UsageVal.kt +src/UsageVar.kt +End of files + + +Cleaning output files: +out/production/module/inline/Inline.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/UsageVar.class +End of files +Compiling files: +src/UsageVar.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt new file mode 100644 index 00000000000..5840d17a8a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt @@ -0,0 +1,11 @@ +package inline + +class Inline { + inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + return 0 + } + + inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + println(value) + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 new file mode 100644 index 00000000000..bb80da599b8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 @@ -0,0 +1,11 @@ +package inline + +class Inline { + inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + return 1 + } + + inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + println(value) + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 new file mode 100644 index 00000000000..17180968e7a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 @@ -0,0 +1,11 @@ +package inline + +class Inline { + inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + return 1 + } + + inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + println(value * 2) + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file From ce43ba5db4f82d2bb2ce7536d17c5c430fdecaf3 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 7 Sep 2015 20:53:19 +0300 Subject: [PATCH 0468/1557] Remove InlineRegistering interface Original commit: 12181d274bfb43ce7592bf183941f7a6b5974d4c --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index cc7b75b4dd0..58b8b0d2dc0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -44,7 +44,6 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.components.InlineRegistering import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName import org.jetbrains.kotlin.serialization.Flags @@ -149,14 +148,10 @@ public class IncrementalCacheImpl( private val dependents = arrayListOf() private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } - private val inlineRegistering = object : InlineRegistering { - override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - inlinedTo.add(fromPath, jvmSignature, toPath) - } + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { + inlinedTo.add(fromPath, jvmSignature, toPath) } - override fun getInlineRegistering(): InlineRegistering = inlineRegistering - public fun addDependentCache(cache: IncrementalCacheImpl) { dependents.add(cache) } From bdeab23fee5f11174ef4f2e0791f921b42409832 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 8 Sep 2015 01:39:37 +0300 Subject: [PATCH 0469/1557] Add file without usage to classInlineFunctionChanged test case Original commit: 93776b711edb5f4a806b1203b23ebfaf5cebcb88 --- .../incremental/pureKotlin/classInlineFunctionChanged/other.kt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt new file mode 100644 index 00000000000..578cf272f91 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} From 863422fceee6e664c071f409865efaca384606f6 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 7 Sep 2015 15:23:49 +0300 Subject: [PATCH 0470/1557] Incremental compilation test for @file:JvmName Original commit: 37d5a16a3d06b79095b3f7e3b6035b9f004e125e --- .../build/IncrementalJpsTestGenerated.java | 6 +++++ .../a.kt | 3 +++ .../b.kt | 3 +++ .../b.kt.new | 4 ++++ .../build.log | 23 +++++++++++++++++++ .../other.kt | 3 +++ .../usage.kt | 5 ++++ .../usage.kt.new | 5 ++++ 8 files changed, 52 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index fd38191767b..c69eca20406 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -121,6 +121,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("accessingFunctionsViaRenamedFileClass") + public void testAccessingFunctionsViaRenamedFileClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); + doTest(fileName); + } + @TestMetadata("accessingPropertiesViaField") public void testAccessingPropertiesViaField() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/a.kt new file mode 100644 index 00000000000..0228de5e71d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/a.kt @@ -0,0 +1,3 @@ +package test + +fun a() = "a" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt new file mode 100644 index 00000000000..f3809d03866 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt @@ -0,0 +1,3 @@ +package test + +fun b() = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt.new new file mode 100644 index 00000000000..cb5f6909f8d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/b.kt.new @@ -0,0 +1,4 @@ +@file:JvmName("B") +package test + +fun b() = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log new file mode 100644 index 00000000000..7f7b03e5656 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/BKt.class +out/production/module/test/TestPackage.class +out/production/module/test/UsageKt.class +End of files +Compiling files: +src/b.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/other/OtherKt.class +out/production/module/other/OtherPackage.class +out/production/module/test/AKt.class +out/production/module/test/TestPackage.class +out/production/module/test/UsageKt.class +End of files +Compiling files: +src/a.kt +src/other.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/other.kt new file mode 100644 index 00000000000..2ff821a2d52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() = "other" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt new file mode 100644 index 00000000000..db702d74fea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + println(a() + b() + other.other()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt.new new file mode 100644 index 00000000000..db702d74fea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt.new @@ -0,0 +1,5 @@ +package test + +fun main(args: Array) { + println(a() + b() + other.other()) +} \ No newline at end of file From 17ca379de22cdae97111e735812e387ca3a560e9 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Sun, 6 Sep 2015 13:53:38 +0200 Subject: [PATCH 0471/1557] Refactoring startup and shutdown, refactoring service implementation, implementing error and info reporting to compiler output, idle autoshutdown mechanisms, fixing TargetId serializability, some other refactoring Fixing stream to log handler (by removing non-working optimization), fixing idle time calculation, reporting refactorings Original commit: c4719175f9bce0b235645d6c311219f60ed69ef3 --- .../compilerRunner/KotlinCompilerRunner.java | 131 +++++++++++------- 1 file changed, 83 insertions(+), 48 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index 36f347dfb71..e22c84941b6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -27,12 +27,17 @@ import org.jetbrains.kotlin.cli.common.ExitCode; import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; import org.jetbrains.kotlin.cli.common.messages.MessageCollector; import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; import org.jetbrains.kotlin.config.CompilerSettings; import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; import org.jetbrains.kotlin.modules.TargetId; import org.jetbrains.kotlin.rmi.*; +import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportCategory; +import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportMessage; +import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportingTargets; import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; import org.jetbrains.kotlin.utils.UtilsPackage; @@ -89,6 +94,24 @@ public class KotlinCompilerRunner { incrementalCaches); } + private static void ProcessCompilerOutput( + MessageCollector messageCollector, + OutputItemsCollector collector, + ByteArrayOutputStream stream, + String exitCode + ) { + BufferedReader reader = new BufferedReader(new StringReader(stream.toString())); + CompilerOutputParser.parseCompilerMessagesFromReader(messageCollector, reader, collector); + + if (INTERNAL_ERROR.equals(exitCode)) { + reportInternalCompilerError(messageCollector); + } + } + + private static void reportInternalCompilerError(MessageCollector messageCollector) { + messageCollector.report(ERROR, "Compiler terminated with internal error", NO_LOCATION); + } + private static void runCompiler( String compilerClassName, CommonCompilerArguments arguments, @@ -97,29 +120,6 @@ public class KotlinCompilerRunner { OutputItemsCollector collector, CompilerEnvironment environment, Map incrementalCaches - ) { - ByteArrayOutputStream stream = new ByteArrayOutputStream(); - PrintStream out = new PrintStream(stream); - - String exitCode = execCompiler(compilerClassName, arguments, additionalArguments, environment, incrementalCaches, out, messageCollector); - - BufferedReader reader = new BufferedReader(new StringReader(stream.toString())); - CompilerOutputParser.parseCompilerMessagesFromReader(messageCollector, reader, collector); - - if (INTERNAL_ERROR.equals(exitCode)) { - messageCollector.report(ERROR, "Compiler terminated with internal error", NO_LOCATION); - } - } - - @NotNull - private static String execCompiler( - String compilerClassName, - CommonCompilerArguments arguments, - String additionalArguments, - CompilerEnvironment environment, - Map incrementalCaches, - PrintStream out, - MessageCollector messageCollector ) { try { messageCollector.report(INFO, "Using kotlin-home = " + environment.getKotlinPaths().getHomePath(), NO_LOCATION); @@ -129,38 +129,73 @@ public class KotlinCompilerRunner { String[] argsArray = ArrayUtil.toStringArray(argumentsList); - // trying the daemon first - if (incrementalCaches != null && RmiPackage.isDaemonEnabled()) { - File libPath = CompilerRunnerUtil.getLibPath(environment.getKotlinPaths(), messageCollector); - // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\ - // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler - CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); - DaemonOptions daemonOptions = RmiPackage.configureDaemonOptions(); - DaemonJVMOptions daemonJVMOptions = RmiPackage.configureDaemonLaunchingOptions(true); - // TODO: find proper stream to report daemon connection progress - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, System.out, true, true); - if (daemon != null) { - Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, out); - return res.toString(); - } + if (!tryCompileWithDaemon(messageCollector, collector, environment, incrementalCaches, argsArray)) { + // otherwise fallback to in-process + + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + PrintStream out = new PrintStream(stream); + + Object rc = CompilerRunnerUtil.invokeExecMethod( compilerClassName, argsArray, environment, messageCollector, out); + + // exec() returns an ExitCode object, class of which is loaded with a different class loader, + // so we take it's contents through reflection + ProcessCompilerOutput(messageCollector, collector, stream, getReturnCodeFromObject(rc)); } - - // otherwise fallback to in-process - - Object rc = CompilerRunnerUtil.invokeExecMethod( - compilerClassName, argsArray, environment, messageCollector, out - ); - - // exec() returns an ExitCode object, class of which is loaded with a different class loader, - // so we take it's contents through reflection - return getReturnCodeFromObject(rc); } catch (Throwable e) { MessageCollectorUtil.reportException(messageCollector, e); - return INTERNAL_ERROR; + reportInternalCompilerError(messageCollector); } } + private static boolean tryCompileWithDaemon( + MessageCollector messageCollector, + OutputItemsCollector collector, + CompilerEnvironment environment, + Map incrementalCaches, + String[] argsArray + ) throws IOException { + if (incrementalCaches != null && RmiPackage.isDaemonEnabled()) { + File libPath = CompilerRunnerUtil.getLibPath(environment.getKotlinPaths(), messageCollector); + // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\ + // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler + CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); + DaemonOptions daemonOptions = RmiPackage.configureDaemonOptions(); + DaemonJVMOptions daemonJVMOptions = RmiPackage.configureDaemonJVMOptions(true); + + ArrayList daemonReportMessages = new ArrayList(); + + CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, new DaemonReportingTargets(null, daemonReportMessages), true, true); + + for (DaemonReportMessage msg: daemonReportMessages) { + if (msg.getCategory() == DaemonReportCategory.EXCEPTION && daemon == null) { + messageCollector.report(CompilerMessageSeverity.INFO, + "Falling back to compilation without daemon due to error: " + msg.getMessage(), + CompilerMessageLocation.NO_LOCATION); + } + else { + messageCollector.report(CompilerMessageSeverity.INFO, msg.getMessage(), CompilerMessageLocation.NO_LOCATION); + } + } + + if (daemon != null) { + ByteArrayOutputStream compilerOut = new ByteArrayOutputStream(); + ByteArrayOutputStream daemonOut = new ByteArrayOutputStream(); + + Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut); + + ProcessCompilerOutput(messageCollector, collector, compilerOut, res.toString()); + BufferedReader reader = new BufferedReader(new StringReader(daemonOut.toString())); + String line = null; + while ((line = reader.readLine()) != null) { + messageCollector.report(CompilerMessageSeverity.INFO, line, CompilerMessageLocation.NO_LOCATION); + } + return true; + } + } + return false; + } + @NotNull private static String getReturnCodeFromObject(@Nullable Object rc) throws Exception { if (rc == null) { From c5da7e1ea23215eb5a8bd87380104d2a2963eca0 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 8 Sep 2015 17:28:31 +0200 Subject: [PATCH 0472/1557] Refactorings, reformatting code, applying code style and other cleanup Original commit: 96558c52ffd2f0bc7548b00bdc9b922ce9c9ab8b --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java index e22c84941b6..3710979bd86 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java @@ -165,7 +165,7 @@ public class KotlinCompilerRunner { ArrayList daemonReportMessages = new ArrayList(); - CompileService daemon = KotlinCompilerClient.Companion.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, new DaemonReportingTargets(null, daemonReportMessages), true, true); + CompileService daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, new DaemonReportingTargets(null, daemonReportMessages), true, true); for (DaemonReportMessage msg: daemonReportMessages) { if (msg.getCategory() == DaemonReportCategory.EXCEPTION && daemon == null) { @@ -182,7 +182,7 @@ public class KotlinCompilerRunner { ByteArrayOutputStream compilerOut = new ByteArrayOutputStream(); ByteArrayOutputStream daemonOut = new ByteArrayOutputStream(); - Integer res = KotlinCompilerClient.Companion.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut); + Integer res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut); ProcessCompilerOutput(messageCollector, collector, compilerOut, res.toString()); BufferedReader reader = new BufferedReader(new StringReader(daemonOut.toString())); From bc9adf0b19263d235f7ae1573d05963835f9003a Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 8 Sep 2015 18:17:45 +0200 Subject: [PATCH 0473/1557] Adding jps building test with daemon, removing obsolete daemon shutdown code Original commit: b1bdbaf06aeed676454cb2ef4748ee6170dc23a6 --- .../jps/build/SimpleKotlinJpsBuildTest.kt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index d5c30d7b59c..b53e3bec6c2 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -18,7 +18,10 @@ package org.jetbrains.kotlin.jps.build import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY +import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY import org.jetbrains.kotlin.test.JetTestUtils +import java.io.File public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { @@ -104,4 +107,18 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { addKotlinRuntimeDependency() rebuildAll() } + + public fun testThreeModulesNoReexportWithDaemon() { + System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"") + val flagFile = File.createTempFile("kotlin-jps-tests-", "-is-running"); + try { + System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath) + testThreeModulesNoReexport() + } + finally { + flagFile.delete() + System.clearProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY) + System.clearProperty(COMPILE_DAEMON_ENABLED_PROPERTY) + } + } } From 1705b9a9d396f3a12b4504bd89f0ef8ead6b4f82 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 10 Sep 2015 17:51:03 +0200 Subject: [PATCH 0474/1557] Extending daemon diagnostics reporting in tests Original commit: 990c2dc5d77a002154e14a666cd9541948b95cfa --- .../org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index b53e3bec6c2..591da70fc26 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -20,6 +20,7 @@ import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY +import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY import org.jetbrains.kotlin.test.JetTestUtils import java.io.File @@ -110,6 +111,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { public fun testThreeModulesNoReexportWithDaemon() { System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"") + System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "") val flagFile = File.createTempFile("kotlin-jps-tests-", "-is-running"); try { System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath) @@ -118,6 +120,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { finally { flagFile.delete() System.clearProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY) + System.clearProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY) System.clearProperty(COMPILE_DAEMON_ENABLED_PROPERTY) } } From fd1f9f2d67a52feb2fc3342aaba51ca838af4967 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 11 Sep 2015 15:30:17 +0200 Subject: [PATCH 0475/1557] Fixing run filename compatibility with windows, improving diagnostics, some minor tweaks Original commit: 8b970cd186e96e0051ca3f33eb11438ab2da9e4a --- .../org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 591da70fc26..3870a842b98 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -112,7 +112,8 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { public fun testThreeModulesNoReexportWithDaemon() { System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"") System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "") - val flagFile = File.createTempFile("kotlin-jps-tests-", "-is-running"); + // spaces in the name to test proper file name handling + val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running"); try { System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath) testThreeModulesNoReexport() From 987946f4257d41db7a25bac2a114b1d44c6a5728 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 8 Sep 2015 20:21:19 +0300 Subject: [PATCH 0476/1557] Improve ABI version from one number to "major.minor.patch" Original commit: 6cecc66d1054df2581a33c22c2824d3a5cb92550 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 58b8b0d2dc0..c0b865d962a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -68,7 +68,11 @@ class CacheFormatVersion(targetDataRoot: File) { companion object { // Change this when incremental cache format changes private val INCREMENTAL_CACHE_OWN_VERSION = 4 - private val CACHE_FORMAT_VERSION: Int = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + JvmAbi.VERSION + + private val CACHE_FORMAT_VERSION = + INCREMENTAL_CACHE_OWN_VERSION * 1000000 + + JvmAbi.VERSION.major * 1000 + + JvmAbi.VERSION.minor private val NON_INCREMENTAL_MODE_PSEUDO_VERSION = Int.MAX_VALUE From f12cce0243196ac09a48163fbab054fbb51ec4f9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 9 Feb 2015 17:52:42 +0300 Subject: [PATCH 0477/1557] Report incomplete hierarchy error for deserialized types #KT-5129 Fixed Delete a JPS test that was specifically testing that we would not fail in this situation; now there's a compilation error Original commit: 949144e0c02bb1ee753701423e95b9e71d4f1eb4 --- .../jps/build/SimpleKotlinJpsBuildTest.kt | 51 ++----------------- 1 file changed, 4 insertions(+), 47 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 3870a842b98..ef23610fde3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -25,54 +25,11 @@ import org.jetbrains.kotlin.test.JetTestUtils import java.io.File public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { - override fun setUp() { super.setUp() workDir = JetTestUtils.tmpDirForTest(this) } - public fun testThreeModulesNoReexport() { - val aFile = createFile("a/a.kt", - """ - trait A1 { - fun bar() - } - trait A2 { - fun bar() - } - """) - val a = addModule("a", PathUtil.getParentPath(aFile)) - - val bFile = createFile("b/b.kt", - """ - trait B1 { - fun foo(): B2? = null - } - - trait B2 : A1, A2 { - override fun bar() {} - } - """) - val b = addModule("b", PathUtil.getParentPath(bFile)) - JpsJavaExtensionService.getInstance().getOrCreateDependencyExtension( - b.getDependenciesList().addModuleDependency(a) - ).setExported(false) - - val cFile = createFile("c/c.kt", - """ - class C : B1 { - fun test() { - foo()?.bar() - } - } - """) - val c = addModule("c", PathUtil.getParentPath(cFile)) - c.getDependenciesList().addModuleDependency(b) - - addKotlinRuntimeDependency() - rebuildAll() - } - public fun testLoadingKotlinFromDifferentModules() { val aFile = createFile("m1/K.kt", """ @@ -102,21 +59,21 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { """) val b = addModule("b", PathUtil.getParentPath(bFile)) JpsJavaExtensionService.getInstance().getOrCreateDependencyExtension( - b.getDependenciesList().addModuleDependency(a) - ).setExported(false) + b.dependenciesList.addModuleDependency(a) + ).isExported = false addKotlinRuntimeDependency() rebuildAll() } - public fun testThreeModulesNoReexportWithDaemon() { + public fun testDaemon() { System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"") System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "") // spaces in the name to test proper file name handling val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running"); try { System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath) - testThreeModulesNoReexport() + testLoadingKotlinFromDifferentModules() } finally { flagFile.delete() From 4aa3b9e334e4cfe89cf609dbdddb9ff93941d1d2 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 15 Sep 2015 14:07:10 +0200 Subject: [PATCH 0478/1557] don't initialize Kotlin caches if there is no Kotlin code to compile Original commit: 35d9880266a1ea454a71356431bd797d35c33e12 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index defd46693df..3c10754f873 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -102,10 +102,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { val messageCollector = MessageCollectorAdapter(context) - val incrementalCaches = getIncrementalCaches(chunk, context) try { - return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, incrementalCaches) + return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) } catch (e: StopBuildException) { throw e @@ -124,8 +123,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR chunk: ModuleChunk, context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, - messageCollector: MessageCollectorAdapter, outputConsumer: ModuleLevelBuilder.OutputConsumer, - incrementalCaches: Map + messageCollector: MessageCollectorAdapter, outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { // Workaround for Android Studio if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget()) && !JavaBuilder.IS_ENABLED[context, true]) { @@ -139,6 +137,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (chunk.getTargets().any { dataManager.getDataPaths().getKotlinCacheVersion(it).isIncompatible() }) { LOG.info("Clearing caches for " + chunk.getTargets().map { it.getPresentableName() }.join()) + val incrementalCaches = getIncrementalCaches(chunk, context) incrementalCaches.values().forEach(StorageOwner::clean) return CHUNK_REBUILD_REQUIRED } @@ -158,6 +157,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR it.data } ?: LookupTracker.DO_NOTHING + val incrementalCaches = getIncrementalCaches(chunk, context) val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) if (!environment.success()) { environment.reportErrorsTo(messageCollector) From d019bef728543efeff1604ed5dcde6a5f8352120 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 14 Sep 2015 16:26:59 +0300 Subject: [PATCH 0479/1557] Get rid of deprecated annotations and modifiers in project code Original commit: 9c4564a5a6557a192e1ece40c93c89d676a312c1 --- .../src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt | 5 ++--- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 6 +++--- .../jetbrains/kotlin/jps/incremental/storage/BasicMap.kt | 2 +- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index 0276a1665c0..97a89c990cc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -26,7 +26,6 @@ import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils import java.io.File import java.util.ArrayList -import kotlin.platform.platformStatic object JpsJsModuleUtils { @@ -63,9 +62,9 @@ object JpsJsModuleUtils { }) } - platformStatic + @JvmStatic fun getOutputFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.JS_EXT) - platformStatic + @JvmStatic fun getOutputMetaFile(outputDir: File, moduleName: String) = File(outputDir, moduleName + KotlinJavascriptMetadataUtils.META_JS_SUFFIX) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index c0b865d962a..2873e30f5ca 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -160,7 +160,7 @@ public class IncrementalCacheImpl( dependents.add(cache) } - TestOnly + @TestOnly public fun dump(): String { return maps.map { it.dump() }.join("\n\n") } @@ -821,7 +821,7 @@ private object PathCollectionExternalizer : DataExternalizer> private val File.normalizedPath: String get() = FileUtil.toSystemIndependentName(canonicalPath) -TestOnly +@TestOnly private fun , V> Map.dumpMap(dumpValue: (V)->String): String = StringBuilder { append("{") @@ -836,7 +836,7 @@ private fun , V> Map.dumpMap(dumpValue: (V)->String): St append("}") }.toString() -TestOnly +@TestOnly public fun > Collection.dumpCollection(): String = "[${sort().map(Any::toString).join(", ")}]" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index c89fb8bc5ce..7ef01948a49 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -64,7 +64,7 @@ public abstract class BasicMap, V>( storage.close() } - TestOnly + @TestOnly public fun dump(): String { return with(StringBuilder()) { with(Printer(this)) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 2ee2e68ebd0..eca21b76fbf 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -107,7 +107,7 @@ public abstract class AbstractIncrementalJpsTest( protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING - protected open fun checkLookups(@suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {} + protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {} fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath) From e3aa1fa4cb29e5d3e8e96160b96693fd024fb04b Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 14 Sep 2015 17:40:41 +0300 Subject: [PATCH 0480/1557] Get rid of deprecated annotations in testData Original commit: bae3320d525dbe653bf81606c88c2775f9d6a502 --- .../incremental/custom/javaConstantChangedUsedInKotlin/usage.kt | 2 +- .../custom/javaConstantUnchangedUsedInKotlin/usage.kt | 2 +- .../multiModule/constantValueChanged/module2_usage.kt | 2 +- .../testData/incremental/pureKotlin/allConstants/usage.kt | 2 +- .../incremental/pureKotlin/classObjectConstantChanged/usage.kt | 2 +- .../testData/incremental/pureKotlin/constantsUnchanged/usage.kt | 2 +- .../incremental/pureKotlin/fileWithConstantRemoved/usage.kt | 2 +- .../incremental/pureKotlin/objectConstantChanged/usage.kt | 2 +- .../testData/incremental/pureKotlin/optionalParameter/fun.kt | 2 +- .../incremental/pureKotlin/packageConstantChanged/usage.kt | 2 +- .../incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt | 2 +- .../pureKotlin/traitClassObjectConstantChanged/usage.kt | 2 +- .../withJava/javaUsedInKotlin/constantChanged/usage.kt | 2 +- .../withJava/javaUsedInKotlin/constantUnchanged/usage.kt | 2 +- .../withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt index 9f972262826..bb0b5cb52c0 100644 --- a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/usage.kt @@ -1,2 +1,2 @@ -deprecated(JavaClass.CONST + JavaClass.CONST) +@Deprecated(JavaClass.CONST + JavaClass.CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt index 9f972262826..bb0b5cb52c0 100644 --- a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/usage.kt @@ -1,2 +1,2 @@ -deprecated(JavaClass.CONST + JavaClass.CONST) +@Deprecated(JavaClass.CONST + JavaClass.CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt index 50c87e8aeb3..5275dca6468 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module2_usage.kt @@ -1,4 +1,4 @@ package usage -deprecated(test.CONST + test.CONST) +@Deprecated(test.CONST + test.CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt index a52256d1a83..afb25dfcf37 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/usage.kt @@ -1,4 +1,4 @@ package test -deprecated("$b $s $i $l $f $d $bb $c $str") +@Deprecated("$b $s $i $l $f $d $bb $c $str") class Usage diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt index 92fe20c977b..dbeb3fbf86c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/usage.kt @@ -1,4 +1,4 @@ package test -deprecated(Klass.CONST + Klass.CONST) +@Deprecated(Klass.CONST + Klass.CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt index 993031ad991..81506d4f37f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/usage.kt @@ -1,4 +1,4 @@ package test -deprecated(CONST + Klass.CONST) +@Deprecated(CONST + Klass.CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt index 2781036fbd6..80d9d873228 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/usage.kt @@ -1,5 +1,5 @@ package usage -deprecated(test.CONST) +@Deprecated(test.CONST) val usage = "" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt index 50ae79cf3fb..d35df24ec9f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt @@ -1,4 +1,4 @@ package test -deprecated(Object.CONST + Object.CONST) +@Deprecated(Object.CONST + Object.CONST) class Usage \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt index b4f268492af..911f5ceeebc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/fun.kt @@ -1,6 +1,6 @@ package test -kotlin.jvm.jvmOverloads +@kotlin.jvm.JvmOverloads fun f(a: String, b: Int = 5) { } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt index cb0f4ce8687..5ce8a2a89f7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/usage.kt @@ -1,4 +1,4 @@ package test -deprecated(CONST + CONST) +@Deprecated(CONST + CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt index 1580ba620dc..8505df45d7d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/b.kt @@ -16,7 +16,7 @@ var fieldlessVar: String get() = "" set(value) {} -deprecated("") +@Deprecated("") val fieldlessValWithAnnotation: String get() = "" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt index 5c0e712d868..83d2b3b2525 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/usage.kt @@ -1,4 +1,4 @@ package test -deprecated(Trait.CONST + Trait.CONST) +@Deprecated(Trait.CONST + Trait.CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt index 9f972262826..bb0b5cb52c0 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/usage.kt @@ -1,2 +1,2 @@ -deprecated(JavaClass.CONST + JavaClass.CONST) +@Deprecated(JavaClass.CONST + JavaClass.CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt index 9f972262826..bb0b5cb52c0 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/usage.kt @@ -1,2 +1,2 @@ -deprecated(JavaClass.CONST + JavaClass.CONST) +@Deprecated(JavaClass.CONST + JavaClass.CONST) class Usage diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new index b4f268492af..911f5ceeebc 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new @@ -1,6 +1,6 @@ package test -kotlin.jvm.jvmOverloads +@kotlin.jvm.JvmOverloads fun f(a: String, b: Int = 5) { } \ No newline at end of file From 62dcbf8aabcafc3640c5a23df7de01d40a389311 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 16 Sep 2015 23:12:01 +0300 Subject: [PATCH 0481/1557] Track lookups for conventions Original commit: 27a196b25be6d03aadf3ffac68543cff28b55f27 --- .../jps/build/AbstractLookupTrackerTest.kt | 21 ++++++++--- .../jps/build/LookupTrackerTestGenerated.java | 6 ++++ .../lookupTracker/conventions/comparison.kt | 18 ++++++++++ .../lookupTracker/conventions/declarations.kt | 35 +++++++++++++++++++ .../conventions/delegateProperty.kt | 28 +++++++++++++++ .../conventions/mathematicalLike.kt | 24 +++++++++++++ .../lookupTracker/conventions/other.kt | 16 +++++++++ 7 files changed, 144 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 27e54d25e60..e300418ef36 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -21,9 +21,11 @@ import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.utils.join import java.io.File -import java.util.ArrayList +import java.util.* import kotlin.test.fail +private val DECLARATION_KEYWORDS = listOf("interface", "class", "enum class", "object", "fun", "val", "var") + abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( allowNoFilesWithSuffixInTestData = true, allowNoBuildLogFileInTestData = true @@ -48,14 +50,13 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val matchResult = COMMENT_WITH_LOOKUP_INFO.match(text) if (matchResult != null) { - matchResult.groups fail("File $file unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") } val lines = text.lines().toArrayList() for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.lookupLine!! }) { - val columnToLookups = lookupsFromLine.groupBy { it.lookupColumn!! }.toList().sortBy { it.first } + val columnToLookups = lookupsFromLine.groupBy { it.lookupColumn!! }.toList().sortedBy { it.first } val lineContent = lines[line - 1] val parts = ArrayList(columnToLookups.size() * 2) @@ -67,8 +68,20 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( parts.add(lineContent.subSequence(start, end)) val lookups = lookupsFromColumn.distinct().joinToString(separator = " ", prefix = "/*", postfix = "*/") { - it.scopeKind.toString()[0].toLowerCase().toString() + ":" + it.scopeFqName + val rest = lineContent.substring(end) + + val name = + when { + rest.startsWith(it.name) || // same name + rest.startsWith("$" + it.name) || // backing field + DECLARATION_KEYWORDS.any { w -> rest.startsWith(w) } // it's declaration + -> "" + else -> "(" + it.name + ")" + } + + it.scopeKind.toString()[0].toLowerCase().toString() + ":" + it.scopeFqName + name } + parts.add(lookups) start = end diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index c7db1b2dbfb..c92b2605d3a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -41,6 +41,12 @@ public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { doTest(fileName); } + @TestMetadata("conventions") + public void testConventions() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/conventions/"); + doTest(fileName); + } + @TestMetadata("localDeclarations") public void testLocalDeclarations() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/localDeclarations/"); diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt new file mode 100644 index 00000000000..45124e49c44 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -0,0 +1,18 @@ +package foo.bar + +/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { + a /*c:foo.bar.A(equals)*/== c + a /*c:foo.bar.A(equals)*/!= c + na /*c:foo.bar.A(equals)*/== a + na /*c:foo.bar.A(equals)*/== null + + a /*c:foo.bar.A(compareTo)*/> b + a /*c:foo.bar.A(compareTo)*/< b + a /*c:foo.bar.A(compareTo)*/>= b + a /*c:foo.bar.A(compareTo)*/<= b + + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= c +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt new file mode 100644 index 00000000000..e0dc43739f2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt @@ -0,0 +1,35 @@ +package foo.bar + +/*p:foo.bar*/class A { + fun plus(a: /*c:foo.bar.A p:foo.bar*/Int) = this + fun timesAssign(a: /*c:foo.bar.A p:foo.bar*/Any?) {} + fun inc(): /*c:foo.bar.A p:foo.bar*/A = this + + fun get(i: /*c:foo.bar.A p:foo.bar*/Int) = 1 + fun contains(a: /*c:foo.bar.A p:foo.bar*/Int): /*c:foo.bar.A p:foo.bar*/Boolean = false + fun invoke() {} + + fun compareTo(a: /*c:foo.bar.A p:foo.bar*/Int) = 0 + + fun component1() = this + + fun iterator() = this + fun next() = this +} + +/*p:foo.bar*/fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = this +/*p:foo.bar*/fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar*/Any?) {} +/*p:foo.bar*/fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = this + +/*p:foo.bar*/fun /*p:foo.bar*/A.not() {} + +/*p:foo.bar*/fun /*p:foo.bar*/A.set(i: /*p:foo.bar*/Int, v: /*p:foo.bar*/Int) {} +/*p:foo.bar*/fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = true +/*p:foo.bar*/fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar*/Int) {} + +/*p:foo.bar*/fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = 0 + +/*p:foo.bar*/fun /*p:foo.bar*/A.component2() = this + +/*p:foo.bar*/fun /*p:foo.bar*/A?.iterator() = this!! +/*p:foo.bar*/fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt new file mode 100644 index 00000000000..073c7bfbcb7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -0,0 +1,28 @@ +package foo.bar + +/*p:foo.bar*/class D1 { + fun get(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1 p:foo.bar*/PropertyMetadata) = 1 +} + +/*p:foo.bar*/fun /*p:foo.bar*/D1.set(t: /*p:foo.bar*/Any?, p: /*p:foo.bar*/PropertyMetadata, v: /*p:foo.bar*/Int) {} + +/*p:foo.bar(D2)*/open class D2 { + fun set(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2 p:foo.bar*/PropertyMetadata, v: /*c:foo.bar.D2 p:foo.bar*/Int) {} +} + +/*p:foo.bar*/fun /*p:foo.bar*/D2.get(t: /*p:foo.bar*/Any?, p: /*p:foo.bar*/PropertyMetadata) = 1 +/*p:foo.bar*/fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} + +/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { + fun propertyDelegated(p: /*c:foo.bar.D3 p:foo.bar*/Any?) {} +} + + +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(get) c:foo.bar.D1(set) p:foo.bar(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() + +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() + +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt new file mode 100644 index 00000000000..9b9561693ae --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -0,0 +1,24 @@ +package foo.bar + +/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) { + var d = a + + d/*c:foo.bar.A(inc)*/++ + /*c:foo.bar.A(inc)*/++d + d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- + /*c:foo.bar.A(dec) p:foo.bar(dec)*/--d + + a /*c:foo.bar.A(plus)*/+ b + a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- b + /*c:foo.bar.A(not) p:foo.bar(not)*/!a + + // for val + a /*c:foo.bar.A(timesAssign)*/*= b + a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= b + + // for var + d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) c:foo.bar.A(plus)*/+= b + d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= b + d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times)*/*= b + d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div)*//= b +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt new file mode 100644 index 00000000000..70a42652aa0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -0,0 +1,16 @@ +package foo.bar + +/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { + /*c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] + + b /*c:foo.bar.A(contains)*/in a + "s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in a + + /*p:foo.bar c:foo.bar.A(invoke)*/a() + /*p:foo.bar c:foo.bar.A(invoke) p:foo.bar(invoke)*/a(1) + + val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = a; + + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); +} From 2041a9a414f17425da2b7e6195fb704027e25513 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 4 Sep 2015 21:37:09 +0300 Subject: [PATCH 0482/1557] Minor. Moved deserialized util functions from top-level to object Original commit: 377f7528378a7c2e92ca4f167d73e427b64f11e2 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 2873e30f5ca..b43043365e1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -48,7 +48,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.deserialization.visibility +import org.jetbrains.kotlin.serialization.deserialization.Deserialization import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.org.objectweb.asm.* @@ -399,7 +399,7 @@ public class IncrementalCacheImpl( return true } - private fun ProtoBuf.Callable.isPrivate(): Boolean = Visibilities.isPrivate(visibility(Flags.VISIBILITY.get(flags))) + private fun ProtoBuf.Callable.isPrivate(): Boolean = Visibilities.isPrivate(Deserialization.visibility(Flags.VISIBILITY.get(flags))) } return compareObject.checkEquals(oldClassData.classProto, newClassData.classProto) From 1fdc2b5d5653a06e986b30223e3de2237e3c7fec Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 7 Sep 2015 13:44:38 +0300 Subject: [PATCH 0483/1557] Minor. remove import package usages from sources Original commit: 5786e620e841bf614036a4c9f9747ad459f3aeb9 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index eca21b76fbf..39b3b8c9824 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.jps.build -import com.intellij.openapi.diagnostic import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtilRt import com.intellij.testFramework.TestLoggerFactory @@ -77,7 +76,7 @@ public abstract class AbstractIncrementalJpsTest( protected var workDir: File by Delegates.notNull() private fun enableDebugLogging() { - diagnostic.Logger.setFactory(javaClass()) + com.intellij.openapi.diagnostic.Logger.setFactory(javaClass()) TestLoggerFactory.dumpLogToStdout("") TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org") From 4130a88832be37ca184a3681cb4cae712e5d33e3 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Wed, 2 Sep 2015 16:23:06 +0300 Subject: [PATCH 0484/1557] Optimized task creation for local functions and variables Original commit: 68389d34e47dec481bf7d9f2431d80f838ce4d21 --- .../lookupTracker/classifierMembers/foo.kt | 24 +++++++++---------- .../lookupTracker/localDeclarations/locals.kt | 6 ++--- .../lookupTracker/packageDeclarations/foo1.kt | 4 ++-- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 964ef2290ca..a909d94a91a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -7,20 +7,20 @@ import bar.* var b = "" val c: /*c:foo.A c:foo.A.Companion p:foo*/String - get() = /*p:foo p:bar c:foo.A c:foo.A.Companion*/b + get() = /*c:foo.A*/b var d: /*c:foo.A c:foo.A.Companion p:foo*/String = "ddd" - get() = /*p:foo p:bar c:foo.A c:foo.A.Companion*/$d - set(v) { /*p:foo p:bar c:foo.A c:foo.A.Companion*/$d = v } + get() = /*c:foo.A*/$d + set(v) { /*c:foo.A*/$d = v } fun foo() { - /*p:foo p:bar c:foo.A c:foo.A.Companion*/a - /*p:foo p:bar c:foo.A c:foo.A.Companion*/foo() + /*c:foo.A*/a + /*c:foo.A*/foo() this./*c:foo.A*/a this./*c:foo.A*/foo() - /*p:foo p:bar c:foo.A c:foo.A.Companion*/baz() - /*p:foo p:bar c:foo.A c:foo.A.Companion*/Companion./*c:foo.A.Companion*/a - /*p:foo p:bar c:foo.A c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" + /*c:foo.A c:foo.A.Companion p:foo p:bar*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar*/O./*c:foo.A.O*/v = "OK" } class B { @@ -59,10 +59,10 @@ import bar.* val a = 1 fun foo() { - /*p:foo p:bar c:foo.E*/a - /*p:foo p:bar c:foo.E*/Y./*c:foo.E*/a - /*p:foo p:bar c:foo.E*/foo() - /*p:foo p:bar c:foo.E*/X./*c:foo.E*/foo() + /*c:foo.E*/a + /*c:foo.E p:foo p:bar*/Y./*c:foo.E*/a + /*c:foo.E*/foo() + /*c:foo.E p:foo p:bar*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index b6c26a2dafb..534ee1d4fc3 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -8,7 +8,7 @@ import bar.* val a = 1 val b = a fun localFun() = b - fun /*p:local.declarations*/Int.localExtFun() = /*p:local.declarations p:bar*/localFun() + fun /*p:local.declarations*/Int.localExtFun() = localFun() interface LocalI { var a: /*p:local.declarations*/Int @@ -30,10 +30,10 @@ import bar.* fun foo(): LocalI = null as LocalI } - /*p:local.declarations p:bar*/localFun() + localFun() 1./*p:local.declarations p:bar*/localExtFun() - val c = /*p:local.declarations p:bar*/LocalC() + val c = LocalC() c.a c.b c.foo() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 530a33c0558..bc2ad02cdd9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /*p:foo p:bar c:foo.MyClass*/b - return /*p:foo p:bar c:foo.MyClass*/MyClass() + /*c:foo.MyClass p:foo p:bar*/b + return /*c:foo.MyClass p:foo p:bar*/MyClass() } From 2165a0f99c97c49b91f391651040f8d9bcc3d14f Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 29 Jul 2015 16:14:13 +0300 Subject: [PATCH 0485/1557] GenerateProtoBufCompare: do not generate unnecessary empty lines Original commit: 20bae9916618adb167bb665908ec334884d0e56d --- .../jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 20335502d91..94e72b18f13 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -503,8 +503,6 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv return true } - - fun checkStringIdEquals(old: Int, new: Int): Boolean { stringIdMap.get(old)?.let { return it == new } From 5bf064193017d6b920a716c31bc409aa9c06925f Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 3 Aug 2015 21:04:33 +0300 Subject: [PATCH 0486/1557] descriptors.proto: add skip_in_comparison option for (prepared to retire) constructor field in Class message Original commit: be875d797ffaa93bc1d92c1b644dc4edef6d9345 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 94e72b18f13..d8c1a262027 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -141,8 +141,6 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } open fun checkEquals(old: ProtoBuf.Type, new: ProtoBuf.Type): Boolean { - if (!checkEquals(old.constructor, new.constructor)) return false - if (!checkEqualsTypeArgument(old, new)) return false if (old.hasNullable() != new.hasNullable()) return false @@ -259,10 +257,6 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv return true } - open fun checkEquals(old: ProtoBuf.Type.Constructor, new: ProtoBuf.Type.Constructor): Boolean { - return true - } - open fun checkEquals(old: ProtoBuf.Type.Argument, new: ProtoBuf.Type.Argument): Boolean { if (old.hasProjection() != new.hasProjection()) return false if (old.hasProjection()) { From 185547fbaf96b531b26a4906d24c770efebd70cf Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 6 Aug 2015 09:21:06 +0300 Subject: [PATCH 0487/1557] GenerateProtoBufCompare: optimization and generate difference and hashCode methods Original commit: 4c9ec56bc807db3865c0e6f9a912a7a80350bea7 --- .../jps/incremental/ProtoCompareGenerated.kt | 479 ++++++++++++++++-- 1 file changed, 436 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index d8c1a262027..594c1ec907a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -16,15 +16,23 @@ package org.jetbrains.kotlin.jps.incremental +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.serialization.Interner import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf +import java.util.EnumSet /** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */ -open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, private val newNameResolver: NameResolver) { - private val stringIdMap: MutableMap = hashMapOf() - private val fqNameIdMap: MutableMap = hashMapOf() +open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, public val newNameResolver: NameResolver) { + private val strings = Interner() + public val oldStringIndexes: IntArray = oldNameResolver.stringTable.stringList.map { strings.intern(it) }.toIntArray() + public val newStringIndexes: IntArray = newNameResolver.stringTable.stringList.map { strings.intern(it) }.toIntArray() + + private val fqNames = Interner() + public val oldFqNameIndexes: IntArray = oldNameResolver.qualifiedNameTable.qualifiedNameList.indices.map { fqNames.intern(oldNameResolver.getFqName(it)) }.toIntArray() + public val newFqNameIndexes: IntArray = newNameResolver.qualifiedNameTable.qualifiedNameList.indices.map { fqNames.intern(newNameResolver.getFqName(it)) }.toIntArray() open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { @@ -32,6 +40,17 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv return true } + public enum class ProtoBufPackageKind { + MEMBER_LIST + } + + public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { + val result = EnumSet.noneOf(javaClass()) + + if (!checkEqualsPackageMember(old, new)) result.add(ProtoBufPackageKind.MEMBER_LIST) + + return result + } open fun checkEquals(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { if (old.hasFlags() != new.hasFlags()) return false @@ -39,11 +58,11 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.flags != new.flags) return false } - if (!checkFqNameIdEquals(old.fqName, new.fqName)) return false + if (oldFqNameIndexes[old.fqName] != newFqNameIndexes[new.fqName]) return false if (old.hasCompanionObjectName() != new.hasCompanionObjectName()) return false if (old.hasCompanionObjectName()) { - if (!checkNameIdEquals(old.companionObjectName, new.companionObjectName)) return false + if (oldStringIndexes[old.companionObjectName] != newStringIndexes[new.companionObjectName]) return false } if (!checkEqualsClassTypeParameter(old, new)) return false @@ -69,9 +88,62 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) return false } - return true } + public enum class ProtoBufClassKind { + FLAGS, + FQ_NAME, + COMPANION_OBJECT_NAME, + TYPE_PARAMETER_LIST, + SUPERTYPE_LIST, + NESTED_CLASS_NAME_LIST, + MEMBER_LIST, + ENUM_ENTRY_LIST, + PRIMARY_CONSTRUCTOR, + SECONDARY_CONSTRUCTOR_LIST, + CLASS_ANNOTATION_LIST + } + + public fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet { + val result = EnumSet.noneOf(javaClass()) + + if (old.hasFlags() != new.hasFlags()) result.add(ProtoBufClassKind.FLAGS) + if (old.hasFlags()) { + if (old.flags != new.flags) result.add(ProtoBufClassKind.FLAGS) + } + + if (oldFqNameIndexes[old.fqName] != newFqNameIndexes[new.fqName]) result.add(ProtoBufClassKind.FQ_NAME) + + if (old.hasCompanionObjectName() != new.hasCompanionObjectName()) result.add(ProtoBufClassKind.COMPANION_OBJECT_NAME) + if (old.hasCompanionObjectName()) { + if (oldStringIndexes[old.companionObjectName] != newStringIndexes[new.companionObjectName]) result.add(ProtoBufClassKind.COMPANION_OBJECT_NAME) + } + + if (!checkEqualsClassTypeParameter(old, new)) result.add(ProtoBufClassKind.TYPE_PARAMETER_LIST) + + if (!checkEqualsClassSupertype(old, new)) result.add(ProtoBufClassKind.SUPERTYPE_LIST) + + if (!checkEqualsClassNestedClassName(old, new)) result.add(ProtoBufClassKind.NESTED_CLASS_NAME_LIST) + + if (!checkEqualsClassMember(old, new)) result.add(ProtoBufClassKind.MEMBER_LIST) + + if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST) + + if (old.hasPrimaryConstructor() != new.hasPrimaryConstructor()) result.add(ProtoBufClassKind.PRIMARY_CONSTRUCTOR) + if (old.hasPrimaryConstructor()) { + if (!checkEquals(old.primaryConstructor, new.primaryConstructor)) result.add(ProtoBufClassKind.PRIMARY_CONSTRUCTOR) + } + + if (!checkEqualsClassSecondaryConstructor(old, new)) result.add(ProtoBufClassKind.SECONDARY_CONSTRUCTOR_LIST) + + if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST) + + for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { + if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST) + } + + return result + } open fun checkEquals(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean { if (old.hasFlags() != new.hasFlags()) return false @@ -96,7 +168,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (!checkEquals(old.receiverType, new.receiverType)) return false } - if (!checkNameIdEquals(old.name, new.name)) return false + if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false if (!checkEqualsCallableValueParameter(old, new)) return false @@ -114,7 +186,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.hasExtension(JvmProtoBuf.implClassName) != new.hasExtension(JvmProtoBuf.implClassName)) return false if (old.hasExtension(JvmProtoBuf.implClassName)) { - if (!checkNameIdEquals(old.getExtension(JvmProtoBuf.implClassName), new.getExtension(JvmProtoBuf.implClassName))) return false + if (oldStringIndexes[old.getExtension(JvmProtoBuf.implClassName)] != newStringIndexes[new.getExtension(JvmProtoBuf.implClassName)]) return false } return true @@ -123,7 +195,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv open fun checkEquals(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { if (old.id != new.id) return false - if (!checkNameIdEquals(old.name, new.name)) return false + if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false if (old.hasReified() != new.hasReified()) return false if (old.hasReified()) { @@ -150,7 +222,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.hasFlexibleTypeCapabilitiesId() != new.hasFlexibleTypeCapabilitiesId()) return false if (old.hasFlexibleTypeCapabilitiesId()) { - if (!checkStringIdEquals(old.flexibleTypeCapabilitiesId, new.flexibleTypeCapabilitiesId)) return false + if (oldStringIndexes[old.flexibleTypeCapabilitiesId] != newStringIndexes[new.flexibleTypeCapabilitiesId]) return false } if (old.hasFlexibleUpperBound() != new.hasFlexibleUpperBound()) return false @@ -160,7 +232,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.hasConstructorClassName() != new.hasConstructorClassName()) return false if (old.hasConstructorClassName()) { - if (!checkFqNameIdEquals(old.constructorClassName, new.constructorClassName)) return false + if (oldFqNameIndexes[old.constructorClassName] != newFqNameIndexes[new.constructorClassName]) return false } if (old.hasConstructorTypeParameter() != new.hasConstructorTypeParameter()) return false @@ -174,7 +246,6 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (!checkEquals(old.getExtension(JvmProtoBuf.typeAnnotation, i), new.getExtension(JvmProtoBuf.typeAnnotation, i))) return false } - if (old.hasExtension(JvmProtoBuf.isRaw) != new.hasExtension(JvmProtoBuf.isRaw)) return false if (old.hasExtension(JvmProtoBuf.isRaw)) { if (old.getExtension(JvmProtoBuf.isRaw) != new.getExtension(JvmProtoBuf.isRaw)) return false @@ -193,7 +264,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { - if (!checkFqNameIdEquals(old.id, new.id)) return false + if (oldFqNameIndexes[old.id] != newFqNameIndexes[new.id]) return false if (!checkEqualsAnnotationArgument(old, new)) return false @@ -206,7 +277,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.flags != new.flags) return false } - if (!checkNameIdEquals(old.name, new.name)) return false + if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false if (!checkEquals(old.type, new.type)) return false @@ -224,7 +295,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } open fun checkEquals(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { - if (!checkStringIdEquals(old.name, new.name)) return false + if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false if (!checkEquals(old.returnType, new.returnType)) return false @@ -272,7 +343,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } open fun checkEquals(old: ProtoBuf.Annotation.Argument, new: ProtoBuf.Annotation.Argument): Boolean { - if (!checkNameIdEquals(old.nameId, new.nameId)) return false + if (oldStringIndexes[old.nameId] != newStringIndexes[new.nameId]) return false if (!checkEquals(old.value, new.value)) return false @@ -287,7 +358,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.hasClassFqName() != new.hasClassFqName()) return false if (old.hasClassFqName()) { - if (!checkFqNameIdEquals(old.classFqName, new.classFqName)) return false + if (oldFqNameIndexes[old.classFqName] != newFqNameIndexes[new.classFqName]) return false } if (old.hasArrayDimension() != new.hasArrayDimension()) return false @@ -299,7 +370,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv } open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { - if (!checkStringIdEquals(old.name, new.name)) return false + if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false if (!checkEquals(old.type, new.type)) return false @@ -334,17 +405,17 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.hasStringValue() != new.hasStringValue()) return false if (old.hasStringValue()) { - if (!checkStringIdEquals(old.stringValue, new.stringValue)) return false + if (oldStringIndexes[old.stringValue] != newStringIndexes[new.stringValue]) return false } if (old.hasClassId() != new.hasClassId()) return false if (old.hasClassId()) { - if (!checkFqNameIdEquals(old.classId, new.classId)) return false + if (oldFqNameIndexes[old.classId] != newFqNameIndexes[new.classId]) return false } if (old.hasEnumValueId() != new.hasEnumValueId()) return false if (old.hasEnumValueId()) { - if (!checkNameIdEquals(old.enumValueId, new.enumValueId)) return false + if (oldStringIndexes[old.enumValueId] != newStringIndexes[new.enumValueId]) return false } if (old.hasAnnotation() != new.hasAnnotation()) return false @@ -391,7 +462,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.nestedClassNameCount != new.nestedClassNameCount) return false for(i in 0..old.nestedClassNameCount - 1) { - if (!checkNameIdEquals(old.getNestedClassName(i), new.getNestedClassName(i))) return false + if (oldStringIndexes[old.getNestedClassName(i)] != newStringIndexes[new.getNestedClassName(i)]) return false } return true @@ -411,7 +482,7 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv if (old.enumEntryCount != new.enumEntryCount) return false for(i in 0..old.enumEntryCount - 1) { - if (!checkNameIdEquals(old.getEnumEntry(i), new.getEnumEntry(i))) return false + if (oldStringIndexes[old.getEnumEntry(i)] != newStringIndexes[new.getEnumEntry(i)]) return false } return true @@ -496,24 +567,346 @@ open class ProtoCompareGenerated(private val oldNameResolver: NameResolver, priv return true } - - fun checkStringIdEquals(old: Int, new: Int): Boolean { - stringIdMap.get(old)?.let { return it == new } - - val oldValue = oldNameResolver.stringTable.getString(old) - val newValue = newNameResolver.stringTable.getString(new) - - return if (oldValue == newValue) { stringIdMap[old] = new; true } else false - } - - fun checkNameIdEquals(old: Int, new: Int): Boolean = checkStringIdEquals(old, new) - - fun checkFqNameIdEquals(old: Int, new: Int): Boolean { - fqNameIdMap.get(old)?.let { return it == new } - - val oldValue = oldNameResolver.getFqName(old).asString() - val newValue = newNameResolver.getFqName(new).asString() - - return if (oldValue == newValue) { fqNameIdMap[old] = new; true } else false - } +} + +public fun ProtoBuf.Package.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + for(i in 0..memberCount - 1) { + hashCode = 31 * hashCode + getMember(i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Class.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + if (hasFlags()) { + hashCode = 31 * hashCode + flags + } + + hashCode = 31 * hashCode + fqNameIndexes[fqName] + + if (hasCompanionObjectName()) { + hashCode = 31 * hashCode + stringIndexes[companionObjectName] + } + + for(i in 0..typeParameterCount - 1) { + hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..supertypeCount - 1) { + hashCode = 31 * hashCode + getSupertype(i).hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..nestedClassNameCount - 1) { + hashCode = 31 * hashCode + stringIndexes[getNestedClassName(i)] + } + + for(i in 0..memberCount - 1) { + hashCode = 31 * hashCode + getMember(i).hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..enumEntryCount - 1) { + hashCode = 31 * hashCode + stringIndexes[getEnumEntry(i)] + } + + if (hasPrimaryConstructor()) { + hashCode = 31 * hashCode + primaryConstructor.hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..secondaryConstructorCount - 1) { + hashCode = 31 * hashCode + getSecondaryConstructor(i).hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Callable.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + if (hasFlags()) { + hashCode = 31 * hashCode + flags + } + + if (hasGetterFlags()) { + hashCode = 31 * hashCode + getterFlags + } + + if (hasSetterFlags()) { + hashCode = 31 * hashCode + setterFlags + } + + for(i in 0..typeParameterCount - 1) { + hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasReceiverType()) { + hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) + } + + hashCode = 31 * hashCode + stringIndexes[name] + + for(i in 0..valueParameterCount - 1) { + hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) + } + + hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) + + if (hasExtension(JvmProtoBuf.methodSignature)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasExtension(JvmProtoBuf.propertySignature)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.propertySignature).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasExtension(JvmProtoBuf.implClassName)) { + hashCode = 31 * hashCode + stringIndexes[getExtension(JvmProtoBuf.implClassName)] + } + + return hashCode +} + +public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + hashCode = 31 * hashCode + id + + hashCode = 31 * hashCode + stringIndexes[name] + + if (hasReified()) { + hashCode = 31 * hashCode + reified.hashCode() + } + + if (hasVariance()) { + hashCode = 31 * hashCode + variance.hashCode() + } + + for(i in 0..upperBoundCount - 1) { + hashCode = 31 * hashCode + getUpperBound(i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Type.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + for(i in 0..argumentCount - 1) { + hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasNullable()) { + hashCode = 31 * hashCode + nullable.hashCode() + } + + if (hasFlexibleTypeCapabilitiesId()) { + hashCode = 31 * hashCode + stringIndexes[flexibleTypeCapabilitiesId] + } + + if (hasFlexibleUpperBound()) { + hashCode = 31 * hashCode + flexibleUpperBound.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasConstructorClassName()) { + hashCode = 31 * hashCode + fqNameIndexes[constructorClassName] + } + + if (hasConstructorTypeParameter()) { + hashCode = 31 * hashCode + constructorTypeParameter + } + + for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.typeAnnotation, i).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasExtension(JvmProtoBuf.isRaw)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.isRaw).hashCode() + } + + return hashCode +} + +public fun ProtoBuf.Class.PrimaryConstructor.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + if (hasData()) { + hashCode = 31 * hashCode + data.hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Annotation.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + hashCode = 31 * hashCode + fqNameIndexes[id] + + for(i in 0..argumentCount - 1) { + hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Callable.ValueParameter.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + if (hasFlags()) { + hashCode = 31 * hashCode + flags + } + + hashCode = 31 * hashCode + stringIndexes[name] + + hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) + + if (hasVarargElementType()) { + hashCode = 31 * hashCode + varargElementType.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasExtension(JvmProtoBuf.index)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.index) + } + + return hashCode +} + +public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + hashCode = 31 * hashCode + stringIndexes[name] + + hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) + + for(i in 0..parameterTypeCount - 1) { + hashCode = 31 * hashCode + getParameterType(i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + if (hasField()) { + hashCode = 31 * hashCode + field.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasSyntheticMethod()) { + hashCode = 31 * hashCode + syntheticMethod.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasGetter()) { + hashCode = 31 * hashCode + getter.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasSetter()) { + hashCode = 31 * hashCode + setter.hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + if (hasProjection()) { + hashCode = 31 * hashCode + projection.hashCode() + } + + if (hasType()) { + hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + hashCode = 31 * hashCode + stringIndexes[nameId] + + hashCode = 31 * hashCode + value.hashCode(stringIndexes, fqNameIndexes) + + return hashCode +} + +public fun JvmProtoBuf.JvmType.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + if (hasPrimitiveType()) { + hashCode = 31 * hashCode + primitiveType.hashCode() + } + + if (hasClassFqName()) { + hashCode = 31 * hashCode + fqNameIndexes[classFqName] + } + + if (hasArrayDimension()) { + hashCode = 31 * hashCode + arrayDimension + } + + return hashCode +} + +public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + hashCode = 31 * hashCode + stringIndexes[name] + + hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) + + if (hasIsStaticInOuter()) { + hashCode = 31 * hashCode + isStaticInOuter.hashCode() + } + + return hashCode +} + +public fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { + var hashCode = 1 + + if (hasType()) { + hashCode = 31 * hashCode + type.hashCode() + } + + if (hasIntValue()) { + hashCode = 31 * hashCode + intValue.hashCode() + } + + if (hasFloatValue()) { + hashCode = 31 * hashCode + floatValue.hashCode() + } + + if (hasDoubleValue()) { + hashCode = 31 * hashCode + doubleValue.hashCode() + } + + if (hasStringValue()) { + hashCode = 31 * hashCode + stringIndexes[stringValue] + } + + if (hasClassId()) { + hashCode = 31 * hashCode + fqNameIndexes[classId] + } + + if (hasEnumValueId()) { + hashCode = 31 * hashCode + stringIndexes[enumValueId] + } + + if (hasAnnotation()) { + hashCode = 31 * hashCode + annotation.hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..arrayElementCount - 1) { + hashCode = 31 * hashCode + getArrayElement(i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode } From f59a42abc81afec75585af6c42b1496e47f3e48f Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 9 Sep 2015 15:54:46 +0300 Subject: [PATCH 0488/1557] add protoDifferenceUtils and implementation for calculation difference between proto data for classes. Original commit: df283c8f02cc9dccf2d09a002261984923e97990 --- .../jps/incremental/IncrementalCacheImpl.kt | 110 +++----- .../jps/incremental/protoDifferenceUtils.kt | 250 ++++++++++++++++++ 2 files changed, 281 insertions(+), 79 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index b43043365e1..d9a9c37e082 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -31,7 +31,6 @@ import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.BasicMap @@ -46,11 +45,7 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName -import org.jetbrains.kotlin.serialization.Flags -import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.deserialization.Deserialization import org.jetbrains.kotlin.serialization.jvm.BitEncoding -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.org.objectweb.asm.* import java.io.DataInput import java.io.DataInputStream @@ -67,7 +62,7 @@ private val CACHE_DIRECTORY_NAME = "kotlin" class CacheFormatVersion(targetDataRoot: File) { companion object { // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 4 + private val INCREMENTAL_CACHE_OWN_VERSION = 5 private val CACHE_FORMAT_VERSION = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + @@ -301,11 +296,11 @@ public class IncrementalCacheImpl( } override fun getPackagePartData(fqName: String): ByteArray? { - return protoMap[JvmClassName.byInternalName(fqName)] + return protoMap[JvmClassName.byInternalName(fqName)]?.bytes } override fun getModuleMappingData(): ByteArray? { - return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)] + return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)]?.bytes } override fun flush(memoryCachesOnly: Boolean) { @@ -321,7 +316,7 @@ public class IncrementalCacheImpl( maps.forEach { it.close () } } - private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ByteArrayExternalizer) { + private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): ChangesInfo { val header = kotlinClass.classHeader @@ -333,20 +328,21 @@ public class IncrementalCacheImpl( return put(className, data, isPackage, checkChangesIsOpenPart) } - private fun put(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { + private fun put(className: JvmClassName, bytes: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { val key = className.internalName val oldData = storage[key] + val data = ProtoMapValue(isPackage, bytes) - if (!Arrays.equals(data, oldData)) { + if (oldData == null || !Arrays.equals(bytes, oldData.bytes) || isPackage != oldData.isPackageFacade) { storage.put(key, data) } return ChangesInfo(protoChanged = oldData == null || !checkChangesIsOpenPart || - !isOpenPartNotChanged(oldData, data, isPackage)) + difference(oldData, data) != DifferenceKind.NONE) } - public fun get(className: JvmClassName): ByteArray? { + public fun get(className: JvmClassName): ProtoMapValue? { return storage[className.getInternalName()] } @@ -354,55 +350,8 @@ public class IncrementalCacheImpl( storage.remove(className.getInternalName()) } - override fun dumpValue(value: ByteArray): String { - return java.lang.Long.toHexString(value.md5()) - } - - private fun isOpenPartNotChanged(oldData: ByteArray, newData: ByteArray, isPackageFacade: Boolean): Boolean { - if (isPackageFacade) { - return isPackageFacadeOpenPartNotChanged(oldData, newData) - } - else { - return isClassOpenPartNotChanged(oldData, newData) - } - } - - private fun isPackageFacadeOpenPartNotChanged(oldData: ByteArray, newData: ByteArray): Boolean { - val oldPackageData = JvmProtoBufUtil.readPackageDataFrom(oldData) - val newPackageData = JvmProtoBufUtil.readPackageDataFrom(newData) - - val compareObject = ProtoCompareGenerated(oldPackageData.nameResolver, newPackageData.nameResolver) - return compareObject.checkEquals(oldPackageData.packageProto, newPackageData.packageProto) - } - - private fun isClassOpenPartNotChanged(oldData: ByteArray, newData: ByteArray): Boolean { - val oldClassData = JvmProtoBufUtil.readClassDataFrom(oldData) - val newClassData = JvmProtoBufUtil.readClassDataFrom(newData) - - val compareObject = object : ProtoCompareGenerated(oldClassData.nameResolver, newClassData.nameResolver) { - override fun checkEqualsClassMember(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean = - checkEquals(old.memberList, new.memberList) - - override fun checkEqualsClassSecondaryConstructor(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean = - checkEquals(old.secondaryConstructorList, new.secondaryConstructorList) - - private fun checkEquals(oldList: List, newList: List): Boolean { - val oldListFiltered = oldList.filter { !it.isPrivate() } - val newListFiltered = newList.filter { !it.isPrivate() } - - if (oldListFiltered.size() != newListFiltered.size()) return false - - for (i in oldListFiltered.indices) { - if (!checkEquals(oldListFiltered[i], newListFiltered[i])) return false - } - - return true - } - - private fun ProtoBuf.Callable.isPrivate(): Boolean = Visibilities.isPrivate(Deserialization.visibility(Flags.VISIBILITY.get(flags))) - } - - return compareObject.checkEquals(oldClassData.classProto, newClassData.classProto) + override fun dumpValue(value: ProtoMapValue): String { + return (if (value.isPackageFacade) "1" else "0") + java.lang.Long.toHexString(value.bytes.md5()) } } @@ -454,7 +403,7 @@ public class IncrementalCacheImpl( private object ConstantsMapExternalizer : DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size()) - for (name in map.keySet().toSortedList()) { + for (name in map.keySet().sorted()) { IOUtil.writeString(name, out) val value = map[name]!! when (value) { @@ -737,20 +686,6 @@ private fun ByteArray.md5(): Long { ) } -private object ByteArrayExternalizer : DataExternalizer { - override fun save(out: DataOutput, value: ByteArray) { - out.writeInt(value.size()) - out.write(value) - } - - override fun read(`in`: DataInput): ByteArray { - val length = `in`.readInt() - val buf = ByteArray(length) - `in`.readFully(buf) - return buf - } -} - private abstract class StringMapExternalizer : DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size()) @@ -825,7 +760,7 @@ private val File.normalizedPath: String private fun , V> Map.dumpMap(dumpValue: (V)->String): String = StringBuilder { append("{") - for (key in keySet().sort()) { + for (key in keySet().sorted()) { if (length() != 1) { append(", ") } @@ -838,7 +773,7 @@ private fun , V> Map.dumpMap(dumpValue: (V)->String): St @TestOnly public fun > Collection.dumpCollection(): String = - "[${sort().map(Any::toString).join(", ")}]" + "[${sorted().map(Any::toString).join(", ")}]" private class PathFunctionPair( public val path: String, @@ -882,3 +817,20 @@ private object PathFunctionPairKeyDescriptor : KeyDescriptor { } } + +private object ProtoMapValueExternalizer : DataExternalizer { + override fun save(out: DataOutput, value: ProtoMapValue) { + out.writeBoolean(value.isPackageFacade) + out.writeInt(value.bytes.size()) + out.write(value.bytes) + } + + override fun read(`in`: DataInput): ProtoMapValue { + val isPackageFacade = `in`.readBoolean() + val length = `in`.readInt() + val buf = ByteArray(length) + `in`.readFully(buf) + return ProtoMapValue(isPackageFacade, buf) + } +} + diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt new file mode 100644 index 00000000000..f575e4fda2e --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -0,0 +1,250 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.serialization.Flags +import org.jetbrains.kotlin.serialization.ProtoBuf +import org.jetbrains.kotlin.serialization.deserialization.Deserialization +import org.jetbrains.kotlin.serialization.deserialization.NameResolver +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil +import org.jetbrains.kotlin.utils.HashSetUtil +import java.util.* + +public sealed class DifferenceKind() { + public object NONE: DifferenceKind() + public object CLASS_SIGNATURE: DifferenceKind() + public class MEMBERS(val names: Collection): DifferenceKind() +} + +data class ProtoMapValue(val isPackageFacade: Boolean, val bytes: ByteArray) + +public fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): DifferenceKind { + if (oldData.isPackageFacade != newData.isPackageFacade) return DifferenceKind.CLASS_SIGNATURE + + val differenceObject = + if (oldData.isPackageFacade) DifferenceCalculatorForPackageFacade(oldData, newData) else DifferenceCalculatorForClass(oldData, newData) + + return differenceObject.difference() +} + +private abstract class DifferenceCalculator() { + protected abstract val oldNameResolver: NameResolver + protected abstract val newNameResolver: NameResolver + + protected val compareObject by lazy { ProtoCompareGenerated(oldNameResolver, newNameResolver) } + + abstract fun difference(): DifferenceKind + + protected fun membersOrNone(names: Collection): DifferenceKind = if (names.isEmpty()) DifferenceKind.NONE else DifferenceKind.MEMBERS(names) + + protected fun calcDifferenceForMembers( + oldList: List, + newList: List + ): Collection { + val result = hashSetOf() + + val oldMap = oldList.groupBy { it.hashCode(compareObject.oldStringIndexes, compareObject.oldFqNameIndexes) } + val newMap = newList.groupBy { it.hashCode(compareObject.newStringIndexes, compareObject.newFqNameIndexes) } + + fun List.names(nameResolver: NameResolver): List = + map { nameResolver.getString(it.name) } + + val hashes = oldMap.keySet() + newMap.keySet() + for (hash in hashes) { + val oldMembers = oldMap[hash] + val newMembers = newMap[hash] + + val differentMembers = when { + newMembers == null -> oldMembers!!.names(compareObject.oldNameResolver) + oldMembers == null -> newMembers.names(compareObject.newNameResolver) + else -> calcDifferenceForEqualHashes(oldMembers, newMembers) + } + result.addAll(differentMembers) + } + + return result + } + + private fun calcDifferenceForEqualHashes( + oldList: List, + newList: List + ): Collection { + val result = hashSetOf() + val newSet = HashSet(newList) + + oldList.forEach { oldMember -> + val newMember = newSet.firstOrNull { compareObject.checkEquals(oldMember, it) } + if (newMember != null) { + newSet.remove(newMember) + } + else { + result.add(compareObject.oldNameResolver.getString(oldMember.name)) + } + } + + newSet.forEach { newMember -> + result.add(compareObject.newNameResolver.getString(newMember.name)) + } + + return result + } + + protected fun calcDifferenceForNames( + oldList: List, + newList: List + ): Collection { + val oldNames = oldList.map { compareObject.oldNameResolver.getString(it) }.toSet() + val newNames = newList.map { compareObject.newNameResolver.getString(it) }.toSet() + return HashSetUtil.symmetricDifference(oldNames, newNames) + } +} + +private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { + companion object { + private val CONSTRUCTOR = "" + + private val CLASS_SIGNATURE_ENUMS = EnumSet.of( + ProtoCompareGenerated.ProtoBufClassKind.FLAGS, + ProtoCompareGenerated.ProtoBufClassKind.FQ_NAME, + ProtoCompareGenerated.ProtoBufClassKind.TYPE_PARAMETER_LIST, + ProtoCompareGenerated.ProtoBufClassKind.SUPERTYPE_LIST, + ProtoCompareGenerated.ProtoBufClassKind.CLASS_ANNOTATION_LIST + ) + } + + val oldClassData = JvmProtoBufUtil.readClassDataFrom(oldData.bytes) + val newClassData = JvmProtoBufUtil.readClassDataFrom(newData.bytes) + + val oldProto = oldClassData.classProto + val newProto = newClassData.classProto + + override val oldNameResolver = oldClassData.nameResolver + override val newNameResolver = newClassData.nameResolver + + val diff = compareObject.difference(oldProto, newProto) + + override fun difference(): DifferenceKind { + if (diff.isEmpty()) return DifferenceKind.NONE + + CLASS_SIGNATURE_ENUMS.forEach { if (it in diff) return DifferenceKind.CLASS_SIGNATURE } + + return membersOrNone(getChangedMembersNames()) + } + + private fun getChangedMembersNames(): Set { + val names = hashSetOf() + + fun Int.oldToNames() = names.add(oldNameResolver.getString(this)) + fun Int.newToNames() = names.add(newNameResolver.getString(this)) + + for (kind in diff) { + when (kind!!) { + ProtoCompareGenerated.ProtoBufClassKind.COMPANION_OBJECT_NAME -> { + if (oldProto.hasCompanionObjectName()) oldProto.companionObjectName.oldToNames() + if (newProto.hasCompanionObjectName()) newProto.companionObjectName.newToNames() + } + ProtoCompareGenerated.ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> + names.addAll(calcDifferenceForNames(oldProto.nestedClassNameList, newProto.nestedClassNameList)) + ProtoCompareGenerated.ProtoBufClassKind.MEMBER_LIST -> { + val oldMembers = oldProto.memberList.filter { !it.isPrivate } + val newMembers = newProto.memberList.filter { !it.isPrivate } + names.addAll(calcDifferenceForMembers(oldMembers, newMembers)) + } + ProtoCompareGenerated.ProtoBufClassKind.ENUM_ENTRY_LIST -> + names.addAll(calcDifferenceForNames(oldProto.enumEntryList, newProto.enumEntryList)) + ProtoCompareGenerated.ProtoBufClassKind.PRIMARY_CONSTRUCTOR -> + if (areNonPrivatePrimaryConstructorsDifferent()) { + names.add(CONSTRUCTOR) + } + ProtoCompareGenerated.ProtoBufClassKind.SECONDARY_CONSTRUCTOR_LIST -> + if (areNonPrivateSecondaryConstructorsDifferent()) { + names.add(CONSTRUCTOR) + } + ProtoCompareGenerated.ProtoBufClassKind.FLAGS, + ProtoCompareGenerated.ProtoBufClassKind.FQ_NAME, + ProtoCompareGenerated.ProtoBufClassKind.TYPE_PARAMETER_LIST, + ProtoCompareGenerated.ProtoBufClassKind.SUPERTYPE_LIST, + ProtoCompareGenerated.ProtoBufClassKind.CLASS_ANNOTATION_LIST -> + throw IllegalArgumentException("Unexpected kind: $kind") + else -> + throw IllegalArgumentException("Unsupported kind: $kind") + } + } + return names + } + + private fun areNonPrivatePrimaryConstructorsDifferent(): Boolean { + val oldPrimaryConstructor = oldProto.getNonPrivatePrimaryConstructor + val newPrimaryConstructor = newProto.getNonPrivatePrimaryConstructor + if (oldPrimaryConstructor == null && newPrimaryConstructor == null) return false + + if (oldPrimaryConstructor == null || newPrimaryConstructor == null) return true + + return !compareObject.checkEquals(oldPrimaryConstructor, newPrimaryConstructor) + } + + private fun areNonPrivateSecondaryConstructorsDifferent(): Boolean { + val oldSecondaryConstructors = oldProto.secondaryConstructorList.filter { !it.isPrivate } + val newSecondaryConstructors = newProto.secondaryConstructorList.filter { !it.isPrivate } + return (oldSecondaryConstructors.size() != newSecondaryConstructors.size() || + oldSecondaryConstructors.indices.any { !compareObject.checkEquals(oldSecondaryConstructors[it], newSecondaryConstructors[it]) }) + } + + private val ProtoBuf.Class.getNonPrivatePrimaryConstructor: ProtoBuf.Class.PrimaryConstructor? + get() { + if (!hasPrimaryConstructor()) return null + + return if (primaryConstructor?.data?.isPrivate ?: false) null else primaryConstructor + } + + private val ProtoBuf.Callable.isPrivate: Boolean + get() = Visibilities.isPrivate(Deserialization.visibility(Flags.VISIBILITY.get(flags))) +} + +private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { + val oldPackageData = JvmProtoBufUtil.readPackageDataFrom(oldData.bytes) + val newPackageData = JvmProtoBufUtil.readPackageDataFrom(newData.bytes) + + val oldProto = oldPackageData.packageProto + val newProto = newPackageData.packageProto + + override val oldNameResolver = oldPackageData.nameResolver + override val newNameResolver = newPackageData.nameResolver + + val diff = compareObject.difference(oldProto, newProto) + + override fun difference(): DifferenceKind { + if (diff.isEmpty()) return DifferenceKind.NONE + + return membersOrNone(getChangedMembersNames()) + } + + private fun getChangedMembersNames(): Set { + val names = hashSetOf() + + for (kind in diff) { + when (kind!!) { + ProtoCompareGenerated.ProtoBufPackageKind.MEMBER_LIST -> + names.addAll(calcDifferenceForMembers(oldProto.memberList, newProto.memberList)) + else -> + throw IllegalArgumentException("Unsupported kind: $kind") + } + } + return names + } +} From ff54b362ea62eed4a6af9c499d83a2abebf4f156 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 5 Aug 2015 16:38:19 +0300 Subject: [PATCH 0489/1557] tests for comparison of changes in classes Original commit: ae7cc8e4306dc18bf8a5fa6cd2b4cd55329c1df5 --- .../AbstractProtoComparisonTest.kt | 117 +++++++++++ .../ProtoComparisonTestGenerated.java | 185 ++++++++++++++++++ .../classWithCompanionObjectChanged/new.kt | 20 ++ .../classWithCompanionObjectChanged/old.kt | 21 ++ .../result.out | 12 ++ .../classWithConstructorChanged/new.kt | 25 +++ .../classWithConstructorChanged/old.kt | 24 +++ .../classWithConstructorChanged/result.out | 10 + .../classWithFunAndValChanged/new.kt | 31 +++ .../classWithFunAndValChanged/old.kt | 33 ++++ .../classWithFunAndValChanged/result.out | 12 ++ .../classWithNestedClassesChanged/new.kt | 15 ++ .../classWithNestedClassesChanged/old.kt | 14 ++ .../classWithNestedClassesChanged/result.out | 9 + .../classWitnEnumChanged/new.kt | 7 + .../classWitnEnumChanged/old.kt | 6 + .../classWitnEnumChanged/result.out | 2 + .../packageFacadeDifference/new.kt | 11 ++ .../packageFacadeDifference/old.kt | 11 ++ .../packageFacadeDifference/result.out | 3 + .../classWithPrivateFunChanged/new.kt | 15 ++ .../classWithPrivateFunChanged/old.kt | 15 ++ .../classWithPrivateFunChanged/result.out | 3 + .../new.kt | 12 ++ .../old.kt | 12 ++ .../result.out | 3 + .../new.kt | 15 ++ .../old.kt | 13 ++ .../result.out | 3 + .../classWithPrivateValChanged/new.kt | 21 ++ .../classWithPrivateValChanged/old.kt | 20 ++ .../classWithPrivateValChanged/result.out | 4 + .../classWithPrivateVarChanged/new.kt | 22 +++ .../classWithPrivateVarChanged/old.kt | 20 ++ .../classWithPrivateVarChanged/result.out | 4 + .../classFlagsChanged/new.kt | 6 + .../classFlagsChanged/old.kt | 4 + .../classFlagsChanged/result.out | 1 + .../classToPackageFacade/new.kt | 3 + .../classToPackageFacade/old.kt | 13 ++ .../classToPackageFacade/result.out | 3 + .../classTypeParameterListChanged/new.kt | 6 + .../classTypeParameterListChanged/old.kt | 4 + .../classTypeParameterListChanged/result.out | 1 + .../new.kt | 5 + .../old.kt | 4 + .../result.out | 1 + .../classWithSuperTypeListChanged/new.kt | 4 + .../classWithSuperTypeListChanged/old.kt | 6 + .../classWithSuperTypeListChanged/result.out | 1 + .../packageFacadeToClass/new.kt | 13 ++ .../packageFacadeToClass/old.kt | 3 + .../packageFacadeToClass/result.out | 3 + .../unchanged/unchangedClass/new.kt | 40 ++++ .../unchanged/unchangedClass/old.kt | 40 ++++ .../unchanged/unchangedClass/result.out | 4 + .../unchanged/unchangedPackageFacade/new.kt | 13 ++ .../unchanged/unchangedPackageFacade/old.kt | 13 ++ .../unchangedPackageFacade/result.out | 2 + 59 files changed, 943 insertions(+) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/result.out create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out create mode 100644 jps/jps-plugin/testData/comparison/unchanged/unchangedClass/new.kt create mode 100644 jps/jps-plugin/testData/comparison/unchanged/unchangedClass/old.kt create mode 100644 jps/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out create mode 100644 jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/new.kt create mode 100644 jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/old.kt create mode 100644 jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt new file mode 100644 index 00000000000..027be2715da --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -0,0 +1,117 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import com.intellij.openapi.util.io.FileUtil +import com.intellij.testFramework.UsefulTestCase +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.serialization.jvm.BitEncoding +import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.utils.Printer +import java.io.File +import kotlin.test.assertEquals + +public abstract class AbstractProtoComparisonTest : UsefulTestCase() { + + public fun doTest(testDataPath: String) { + val testDir = JetTestUtils.tmpDir("testDirectory") + + val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old.kt") + val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new.kt") + + val oldClassMap = oldClassFiles.toMap { it.name } + val newClassMap = newClassFiles.toMap { it.name } + + val sb = StringBuilder() + val p = Printer(sb) + + val oldSetOfNames = oldClassFiles.map { it.name }.toSet() + val newSetOfNames = newClassFiles.map { it.name }.toSet() + + val removedNames = (oldSetOfNames - newSetOfNames).sorted() + removedNames.forEach { + p.println("REMOVED: class $it") + } + + val addedNames = (newSetOfNames - oldSetOfNames).sorted() + addedNames.forEach { + p.println("ADDED: class $it") + } + + val commonNames = oldSetOfNames.intersect(newSetOfNames).sorted() + + for(name in commonNames) { + p.printDifference(oldClassMap[name]!!, newClassMap[name]!!) + } + + JetTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()); + } + + private fun compileFileAndGetClasses(testPath: String, testDir: File, fileName: String): List { + + val sourcesDirectory = testDir.createSubDirectory("sources") + val classesDirectory = testDir.createSubDirectory("$fileName.src") + + FileUtil.copy(File(testPath, fileName), File(sourcesDirectory, "main.kt")) + MockLibraryUtil.compileKotlin(sourcesDirectory.path, classesDirectory) + + return File(classesDirectory, "test").listFiles() { it.name.endsWith(".class") }?.sortedBy { it.name }!! + } + + private fun Printer.printDifference(oldClassFile: File, newClassFile: File) { + val oldLocalFileKotlinClass = LocalFileKotlinClass.create(oldClassFile)!! + val newLocalFileKotlinClass = LocalFileKotlinClass.create(newClassFile)!! + + val oldClassHeader = oldLocalFileKotlinClass.classHeader + val newClassHeader = newLocalFileKotlinClass.classHeader + + val oldProtoBytes = BitEncoding.decodeBytes(oldClassHeader.annotationData!!) + val newProtoBytes = BitEncoding.decodeBytes(newClassHeader.annotationData!!) + + val oldProto = ProtoMapValue(oldClassHeader.isCompatiblePackageFacadeKind() || oldClassHeader.isCompatibleFileFacadeKind(), oldProtoBytes) + val newProto = ProtoMapValue(newClassHeader.isCompatiblePackageFacadeKind() || newClassHeader.isCompatibleFileFacadeKind(), newProtoBytes) + + val diff = when { + newClassHeader.isCompatiblePackageFacadeKind(), newClassHeader.isCompatibleClassKind(), newClassHeader.isCompatibleFileFacadeKind() -> + difference(oldProto, newProto) + else -> { + println("ignore ${oldLocalFileKotlinClass.classId}") + return + } + } + + val changes = when (diff) { + is DifferenceKind.NONE -> + "NONE" + is DifferenceKind.CLASS_SIGNATURE -> + "CLASS_SIGNATURE" + is DifferenceKind.MEMBERS -> + "MEMBERS\n ${diff.names.sorted()}" + } + + println("changes in ${oldLocalFileKotlinClass.classId}: $changes") + } + + private fun File.createSubDirectory(relativePath: String): File { + val directory = File(this, relativePath) + FileUtil.createDirectory(directory) + return directory + } +} \ No newline at end of file diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java new file mode 100644 index 00000000000..079ab425bd0 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -0,0 +1,185 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@RunWith(JUnit3RunnerWithInners.class) +public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { + @TestMetadata("jps-plugin/testData/comparison/classSignatureChange") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ClassSignatureChange extends AbstractProtoComparisonTest { + public void testAllFilesPresentInClassSignatureChange() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("classFlagsChanged") + public void testClassFlagsChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/"); + doTest(fileName); + } + + @TestMetadata("classToPackageFacade") + public void testClassToPackageFacade() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/"); + doTest(fileName); + } + + @TestMetadata("classTypeParameterListChanged") + public void testClassTypeParameterListChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithClassAnnotationListChanged") + public void testClassWithClassAnnotationListChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithSuperTypeListChanged") + public void testClassWithSuperTypeListChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/"); + doTest(fileName); + } + + @TestMetadata("packageFacadeToClass") + public void testPackageFacadeToClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/"); + doTest(fileName); + } + + } + + @TestMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ClassPrivateOnlyChange extends AbstractProtoComparisonTest { + public void testAllFilesPresentInClassPrivateOnlyChange() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("classWithPrivateFunChanged") + public void testClassWithPrivateFunChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithPrivatePrimaryConstructorChanged") + public void testClassWithPrivatePrimaryConstructorChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithPrivateSecondaryConstructorChanged") + public void testClassWithPrivateSecondaryConstructorChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithPrivateValChanged") + public void testClassWithPrivateValChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithPrivateVarChanged") + public void testClassWithPrivateVarChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/"); + doTest(fileName); + } + + } + + @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ClassMembersOnlyChanged extends AbstractProtoComparisonTest { + public void testAllFilesPresentInClassMembersOnlyChanged() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("classWithCompanionObjectChanged") + public void testClassWithCompanionObjectChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithConstructorChanged") + public void testClassWithConstructorChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithFunAndValChanged") + public void testClassWithFunAndValChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/"); + doTest(fileName); + } + + @TestMetadata("classWithNestedClassesChanged") + public void testClassWithNestedClassesChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/"); + doTest(fileName); + } + + @TestMetadata("classWitnEnumChanged") + public void testClassWitnEnumChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/"); + doTest(fileName); + } + + @TestMetadata("packageFacadeDifference") + public void testPackageFacadeDifference() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/"); + doTest(fileName); + } + + } + + @TestMetadata("jps-plugin/testData/comparison/unchanged") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class Unchanged extends AbstractProtoComparisonTest { + public void testAllFilesPresentInUnchanged() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("unchangedClass") + public void testUnchangedClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedClass/"); + doTest(fileName); + } + + @TestMetadata("unchangedPackageFacade") + public void testUnchangedPackageFacade() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/"); + doTest(fileName); + } + + } +} diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/new.kt new file mode 100644 index 00000000000..969d9f4d5cd --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/new.kt @@ -0,0 +1,20 @@ +package test + +class ClassWithAddedCompanionObject { + public fun unchangedFun() {} + companion object {} +} + +class ClassWithRemovedCompanionObject { + public fun unchangedFun() {} +} + +class ClassWithChangedCompanionObject { + public fun unchangedFun() {} + companion object SecondName {} +} + +class ClassWithChangedVisibilityForCompanionObject { + public fun unchangedFun() {} + private companion object {} +} diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/old.kt new file mode 100644 index 00000000000..93907babbb4 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/old.kt @@ -0,0 +1,21 @@ +package test + +class ClassWithAddedCompanionObject { + public fun unchangedFun() {} +} + +class ClassWithRemovedCompanionObject { + public fun unchangedFun() {} + companion object {} +} + +class ClassWithChangedCompanionObject { + public fun unchangedFun() {} + companion object FirstName {} +} + +class ClassWithChangedVisibilityForCompanionObject { + public fun unchangedFun() {} + public companion object {} +} + diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out new file mode 100644 index 00000000000..bc754441fa2 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out @@ -0,0 +1,12 @@ +REMOVED: class ClassWithChangedCompanionObject$FirstName.class +REMOVED: class ClassWithRemovedCompanionObject$Companion.class +ADDED: class ClassWithAddedCompanionObject$Companion.class +ADDED: class ClassWithChangedCompanionObject$SecondName.class +changes in test/ClassWithAddedCompanionObject: MEMBERS + [Companion] +changes in test/ClassWithChangedCompanionObject: MEMBERS + [FirstName, SecondName] +changes in test/ClassWithChangedVisibilityForCompanionObject.Companion: CLASS_SIGNATURE +changes in test/ClassWithChangedVisibilityForCompanionObject: NONE +changes in test/ClassWithRemovedCompanionObject: MEMBERS + [Companion] diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/new.kt new file mode 100644 index 00000000000..cdd184116b8 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/new.kt @@ -0,0 +1,25 @@ +package test + +class ClassWithPrimaryConstructorChanged constructor(arg: String) { + public fun unchangedFun() {} +} + +class ClassWithPrimaryConstructorVisibilityChanged private constructor() { + public fun unchangedFun() {} +} + +class ClassWithSecondaryConstructorsAdded() { + constructor(arg: Int): this() {} + constructor(arg: String): this() {} + public fun unchangedFun() {} +} + +class ClassWithSecondaryConstructorsRemoved() { + public fun unchangedFun() {} +} + +class ClassWithSecondaryConstructorVisibilityChanged() { + private constructor(arg: Int): this() {} + public fun unchangedFun() {} +} + diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/old.kt new file mode 100644 index 00000000000..86eda90550d --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/old.kt @@ -0,0 +1,24 @@ +package test + +class ClassWithPrimaryConstructorChanged constructor() { + public fun unchangedFun() {} +} + +class ClassWithPrimaryConstructorVisibilityChanged constructor() { + public fun unchangedFun() {} +} + +class ClassWithSecondaryConstructorsAdded { + public fun unchangedFun() {} +} + +class ClassWithSecondaryConstructorsRemoved() { + public constructor(arg: Int): this() {} + constructor(arg: String): this() {} + public fun unchangedFun() {} +} + +class ClassWithSecondaryConstructorVisibilityChanged() { + protected constructor(arg: Int): this() {} + public fun unchangedFun() {} +} diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out new file mode 100644 index 00000000000..db18d890625 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out @@ -0,0 +1,10 @@ +changes in test/ClassWithPrimaryConstructorChanged: MEMBERS + [] +changes in test/ClassWithPrimaryConstructorVisibilityChanged: MEMBERS + [] +changes in test/ClassWithSecondaryConstructorVisibilityChanged: MEMBERS + [] +changes in test/ClassWithSecondaryConstructorsAdded: MEMBERS + [] +changes in test/ClassWithSecondaryConstructorsRemoved: MEMBERS + [] diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/new.kt new file mode 100644 index 00000000000..2eb9659e801 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/new.kt @@ -0,0 +1,31 @@ +package test + +class ClassWithFunAdded { + fun added() {} + public fun unchangedFun() {} +} + +class ClassWithFunRemoved { + public fun unchangedFun() {} +} + +class ClassWithValAndFunAddedAndRemoved { + public val valAdded: String = "" + fun funAdded() {} + public fun unchangedFun() {} +} + +class ClassWithValConvertedToVar { + public var value: Int = 10 + public fun unchangedFun() {} +} + +class ClassWithChangedVisiblityForFun1 { + private fun foo() {} + public fun unchangedFun() {} +} + +class ClassWithChangedVisiblityForFun2 { + protected fun foo() {} + public fun unchangedFun() {} +} diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/old.kt new file mode 100644 index 00000000000..e8ca9bd1db5 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/old.kt @@ -0,0 +1,33 @@ +package test + +class ClassWithFunAdded { + public fun unchangedFun() {} +} + +class ClassWithFunRemoved { + fun removed() {} + public fun unchangedFun() {} +} + +class ClassWithValAndFunAddedAndRemoved { + public val valRemoved: Int = 10 + fun funRemoved() {} + public fun unchangedFun() {} +} + +class ClassWithValConvertedToVar { + public val value: Int = 10 + public fun unchangedFun() {} +} + +class ClassWithChangedVisiblityForFun1 { + protected fun foo() {} + public fun unchangedFun() {} +} + +class ClassWithChangedVisiblityForFun2 { + private fun foo() {} + public fun unchangedFun() {} +} + + diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out new file mode 100644 index 00000000000..77239b3da8c --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/result.out @@ -0,0 +1,12 @@ +changes in test/ClassWithChangedVisiblityForFun1: MEMBERS + [foo] +changes in test/ClassWithChangedVisiblityForFun2: MEMBERS + [foo] +changes in test/ClassWithFunAdded: MEMBERS + [added] +changes in test/ClassWithFunRemoved: MEMBERS + [removed] +changes in test/ClassWithValAndFunAddedAndRemoved: MEMBERS + [funAdded, funRemoved, valAdded, valRemoved] +changes in test/ClassWithValConvertedToVar: MEMBERS + [value] diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/new.kt new file mode 100644 index 00000000000..02acd55cbcf --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/new.kt @@ -0,0 +1,15 @@ +package test + +class ClassWithNestedClasses { + class NestedClassAdded {} + inner class InnerClass {} + inner class InnerClassAdded {} + public fun unchangedFun() {} +} + +class ClassWithChangedVisibilityForNestedClasses { + private class NestedClass {} + protected inner class InnerClass {} + public fun unchangedFun() {} +} + diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/old.kt new file mode 100644 index 00000000000..35d66d1a9e6 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/old.kt @@ -0,0 +1,14 @@ +package test + +class ClassWithNestedClasses { + class NestedClassRemoved {} + inner class InnerClass {} + public fun unchangedFun() {} +} + +class ClassWithChangedVisibilityForNestedClasses { + class NestedClass {} + inner class InnerClass {} + public fun unchangedFun() {} +} + diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out new file mode 100644 index 00000000000..d9ebc0d8ae8 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/result.out @@ -0,0 +1,9 @@ +REMOVED: class ClassWithNestedClasses$NestedClassRemoved.class +ADDED: class ClassWithNestedClasses$InnerClassAdded.class +ADDED: class ClassWithNestedClasses$NestedClassAdded.class +changes in test/ClassWithChangedVisibilityForNestedClasses.InnerClass: CLASS_SIGNATURE +changes in test/ClassWithChangedVisibilityForNestedClasses.NestedClass: CLASS_SIGNATURE +changes in test/ClassWithChangedVisibilityForNestedClasses: NONE +changes in test/ClassWithNestedClasses.InnerClass: NONE +changes in test/ClassWithNestedClasses: MEMBERS + [InnerClassAdded, NestedClassAdded, NestedClassRemoved] diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/new.kt new file mode 100644 index 00000000000..ae88ae50272 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/new.kt @@ -0,0 +1,7 @@ +package test + +enum class EnumClassWithChanges { + CONST_1, + CONST_3, + CONST_4 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/old.kt new file mode 100644 index 00000000000..764e08538ad --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/old.kt @@ -0,0 +1,6 @@ +package test + +enum class EnumClassWithChanges { + CONST_1, + CONST_2 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out new file mode 100644 index 00000000000..853c9c77070 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out @@ -0,0 +1,2 @@ +changes in test/EnumClassWithChanges: MEMBERS + [CONST_2, CONST_3, CONST_4] diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt new file mode 100644 index 00000000000..9f98bc5a4b9 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt @@ -0,0 +1,11 @@ +package test + +public fun unchangedFun() {} + +private fun addedFun(): Int = 10 + +private val addedVal: String = "A" + +private val changedVal: String = "" + +private fun changedFun(arg: String) {} diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt new file mode 100644 index 00000000000..d84e45cd33e --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt @@ -0,0 +1,11 @@ +package test + +public fun unchangedFun() {} + +private fun removedFun(): Int = 10 + +private val removedVal: String = "A" + +private val changedVal: Int = 20 + +private fun changedFun(arg: Int) {} diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/result.out new file mode 100644 index 00000000000..78f2014d8d6 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/result.out @@ -0,0 +1,3 @@ +changes in test/MainKt: MEMBERS + [addedFun, addedVal, changedFun, changedVal, removedFun, removedVal] +changes in test/TestPackage: NONE diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/new.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/new.kt new file mode 100644 index 00000000000..c3f0b8f68a6 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/new.kt @@ -0,0 +1,15 @@ +package test + +class ClassWithPrivateFunAdded { + private fun privateFun() {} + val s = "20" +} + +class ClassWithPrivateFunRemoved { + public fun unchangedFun() {} +} + +class ClassWithPrivateFunSignatureChanged { + private fun privateFun(arg: Int) {} + public fun unchangedFun() {} +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/old.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/old.kt new file mode 100644 index 00000000000..79ad31fa40e --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/old.kt @@ -0,0 +1,15 @@ +package test + +class ClassWithPrivateFunAdded { + val s = "20" +} + +class ClassWithPrivateFunRemoved { + private fun privateFun() {} + public fun unchangedFun() {} +} + +class ClassWithPrivateFunSignatureChanged { + private fun privateFun(arg: String) {} + public fun unchangedFun() {} +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out new file mode 100644 index 00000000000..19c1bb7897a --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/result.out @@ -0,0 +1,3 @@ +changes in test/ClassWithPrivateFunAdded: NONE +changes in test/ClassWithPrivateFunRemoved: NONE +changes in test/ClassWithPrivateFunSignatureChanged: NONE diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/new.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/new.kt new file mode 100644 index 00000000000..6d08e307d8d --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/new.kt @@ -0,0 +1,12 @@ +package test + +class ClassWithPrivatePrimaryConstructorAdded private constructor() { + private constructor(arg: Int) : this() {} +} + +class ClassWithPrivatePrimaryConstructorRemoved { + private constructor(arg: Int) {} +} + +class ClassWithPrivatePrimaryConstructorChanged private constructor(arg: String) { +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/old.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/old.kt new file mode 100644 index 00000000000..05b24c69e56 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/old.kt @@ -0,0 +1,12 @@ +package test + +class ClassWithPrivatePrimaryConstructorAdded { + private constructor(arg: Int) {} +} + +class ClassWithPrivatePrimaryConstructorRemoved private constructor() { + private constructor(arg: Int) : this() {} +} + +class ClassWithPrivatePrimaryConstructorChanged private constructor() { +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out new file mode 100644 index 00000000000..8e093f6d40a --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/result.out @@ -0,0 +1,3 @@ +changes in test/ClassWithPrivatePrimaryConstructorAdded: NONE +changes in test/ClassWithPrivatePrimaryConstructorChanged: NONE +changes in test/ClassWithPrivatePrimaryConstructorRemoved: NONE diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/new.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/new.kt new file mode 100644 index 00000000000..7cf273358f7 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/new.kt @@ -0,0 +1,15 @@ +package test + +class ClassWithPrivateSecondaryConstructorsAdded() { + private constructor(arg: Int) : this() {} + private constructor(arg: String) : this() {} +} + +class ClassWithPrivateSecondaryConstructorsAdded2() { + private constructor(arg: Int) : this() {} + private constructor(arg: String) : this() {} + constructor(arg: Float) : this() {} +} + +class ClassWithPrivateSecondaryConstructorsRemoved() { +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/old.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/old.kt new file mode 100644 index 00000000000..53b981e8996 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/old.kt @@ -0,0 +1,13 @@ +package test + +class ClassWithPrivateSecondaryConstructorsAdded { +} + +class ClassWithPrivateSecondaryConstructorsAdded2() { + constructor(arg: Float) : this() {} +} + +class ClassWithPrivateSecondaryConstructorsRemoved() { + private constructor(arg: Int): this() {} + private constructor(arg: String): this() {} +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out new file mode 100644 index 00000000000..8915bd90306 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/result.out @@ -0,0 +1,3 @@ +changes in test/ClassWithPrivateSecondaryConstructorsAdded: NONE +changes in test/ClassWithPrivateSecondaryConstructorsAdded2: NONE +changes in test/ClassWithPrivateSecondaryConstructorsRemoved: NONE diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/new.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/new.kt new file mode 100644 index 00000000000..178a89088c6 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/new.kt @@ -0,0 +1,21 @@ +package test + +class ClassWithPrivateValAdded { + private val x: Int = 100 + public fun unchangedFun() {} +} + +class ClassWithPrivateValRemoved { + public fun unchangedFun() {} +} + +class ClassWithPrivateValSignatureChanged { + private val x: String = "X" + public fun unchangedFun() {} +} + +class ClassWithGetterForPrivateValChanged { + private val x: Int + get() = 200 + public fun unchangedFun() {} +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/old.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/old.kt new file mode 100644 index 00000000000..5576e86c988 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/old.kt @@ -0,0 +1,20 @@ +package test + +class ClassWithPrivateValAdded { + public fun unchangedFun() {} +} + +class ClassWithPrivateValRemoved { + private val x: Int = 100 + public fun unchangedFun() {} +} + +class ClassWithPrivateValSignatureChanged { + private val x: Int = 100 + public fun unchangedFun() {} +} + +class ClassWithGetterForPrivateValChanged { + private val x: Int = 100 + public fun unchangedFun() {} +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out new file mode 100644 index 00000000000..42d0bb51b3f --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/result.out @@ -0,0 +1,4 @@ +changes in test/ClassWithGetterForPrivateValChanged: NONE +changes in test/ClassWithPrivateValAdded: NONE +changes in test/ClassWithPrivateValRemoved: NONE +changes in test/ClassWithPrivateValSignatureChanged: NONE diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/new.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/new.kt new file mode 100644 index 00000000000..9024562066d --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/new.kt @@ -0,0 +1,22 @@ +package test + +class ClassWithPrivateVarAdded { + private var x: Int = 100 + public fun unchangedFun() {} +} + +class ClassWithPrivateVarRemoved { + public fun unchangedFun() {} +} + +class ClassWithPrivateVarSignatureChanged { + private var x: String = "X" + public fun unchangedFun() {} +} + +class ClassWithGetterAndSetterForPrivateVarChanged { + private var x: Int + get() = 200 + set(value) {} + public fun unchangedFun() {} +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/old.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/old.kt new file mode 100644 index 00000000000..ad239436f24 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/old.kt @@ -0,0 +1,20 @@ +package test + +class ClassWithPrivateVarAdded { + public fun unchangedFun() {} +} + +class ClassWithPrivateVarRemoved { + private var x: Int = 100 + public fun unchangedFun() {} +} + +class ClassWithPrivateVarSignatureChanged { + private var x: Int = 100 + public fun unchangedFun() {} +} + +class ClassWithGetterAndSetterForPrivateVarChanged { + private var x: Int = 100 + public fun unchangedFun() {} +} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out new file mode 100644 index 00000000000..77759ffa841 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/result.out @@ -0,0 +1,4 @@ +changes in test/ClassWithGetterAndSetterForPrivateVarChanged: NONE +changes in test/ClassWithPrivateVarAdded: NONE +changes in test/ClassWithPrivateVarRemoved: NONE +changes in test/ClassWithPrivateVarSignatureChanged: NONE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/new.kt new file mode 100644 index 00000000000..710e70d4f91 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/new.kt @@ -0,0 +1,6 @@ +package test + +import kotlin.annotation.* + +open class ClassWithFlagsChanged { +} diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/old.kt new file mode 100644 index 00000000000..6d7875d5438 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/old.kt @@ -0,0 +1,4 @@ +package test + +class ClassWithFlagsChanged { +} diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out new file mode 100644 index 00000000000..212f70d8f79 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out @@ -0,0 +1 @@ +changes in test/ClassWithFlagsChanged: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/new.kt new file mode 100644 index 00000000000..c63738c81cf --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/new.kt @@ -0,0 +1,3 @@ +package test + +public fun main() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/old.kt new file mode 100644 index 00000000000..36ad2f44f6d --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/old.kt @@ -0,0 +1,13 @@ +package test + +public class TestPackage { + public fun main() {} +} + +public class MainKt { + companion object { + @JvmStatic + public fun main() { + } + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out new file mode 100644 index 00000000000..2d7f4a601b2 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out @@ -0,0 +1,3 @@ +REMOVED: class MainKt$Companion.class +changes in test/MainKt: CLASS_SIGNATURE +changes in test/TestPackage: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/new.kt new file mode 100644 index 00000000000..9d081c29471 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/new.kt @@ -0,0 +1,6 @@ +package test + +import kotlin.annotation.* + +class ClassWithTypeParameterListChanged { +} diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/old.kt new file mode 100644 index 00000000000..b52cabd2939 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/old.kt @@ -0,0 +1,4 @@ +package test + +class ClassWithTypeParameterListChanged { +} diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out new file mode 100644 index 00000000000..cde88c8ffd0 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/result.out @@ -0,0 +1 @@ +changes in test/ClassWithTypeParameterListChanged: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/new.kt new file mode 100644 index 00000000000..7f1d546bb5c --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/new.kt @@ -0,0 +1,5 @@ +package test + +import kotlin.annotation.* + +annotation class ClassWithClassAnnotationListChanged diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/old.kt new file mode 100644 index 00000000000..d7c7cb077d4 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/old.kt @@ -0,0 +1,4 @@ +package test + +@Deprecated("") class ClassWithClassAnnotationListChanged + diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out new file mode 100644 index 00000000000..d447c5da3f9 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out @@ -0,0 +1 @@ +changes in test/ClassWithClassAnnotationListChanged: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt new file mode 100644 index 00000000000..682185d1729 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/new.kt @@ -0,0 +1,4 @@ +package test + +class ClassWithSuperTypeListChanged : java.io.Serializable { +} diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/old.kt new file mode 100644 index 00000000000..9228402497c --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/old.kt @@ -0,0 +1,6 @@ +package test + +class ClassWithSuperTypeListChanged { +} + + diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out new file mode 100644 index 00000000000..1cd2c9c8d22 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out @@ -0,0 +1 @@ +changes in test/ClassWithSuperTypeListChanged: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/new.kt new file mode 100644 index 00000000000..bee5fee69eb --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/new.kt @@ -0,0 +1,13 @@ +package test + +public class TestPackage { + public fun main() {} +} + +public class MainKt { + companion object { + @JvmStatic + public fun main() { + } + } +} diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/old.kt new file mode 100644 index 00000000000..81ffc604d8c --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/old.kt @@ -0,0 +1,3 @@ +package test + +public fun main() {} diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out new file mode 100644 index 00000000000..ea61b532d55 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out @@ -0,0 +1,3 @@ +ADDED: class MainKt$Companion.class +changes in test/MainKt: CLASS_SIGNATURE +changes in test/TestPackage: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/new.kt b/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/new.kt new file mode 100644 index 00000000000..0889792a218 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/new.kt @@ -0,0 +1,40 @@ +package test + +class UnchangedClassWithFunOnly { + public fun unchangedPublicFun() {} + protected fun unchangedProtectedFun() {} + internal fun unchangedInternalFun() {} + private fun unchangedPrivateFun() {} +} + +class UnchangedClassWithValOnly { + public val unchangedPublicVal = 10 + protected val unchangedProtectedVal = 10 + internal val unchangedInternalVal = 10 + private val unchangedPrivateVal = 10 +} + +class UnchangedClassWithVarOnly { + public var unchangedPublicVar = 20 + protected var unchangedProtectedVar = 20 + internal var unchangedInternalVar = 20 + private var unchangedPrivateVar = 20 +} + +class UnchangedClass { + public val unchangedPublicVal = 10 + protected val unchangedProtectedVal = 10 + internal val unchangedInternalVal = 10 + private val unchangedPrivateVal = 10 + + public var unchangedPublicVar = 20 + protected var unchangedProtectedVar = 20 + internal var unchangedInternalVar = 20 + private var unchangedPrivateVar = 20 + + public fun unchangedPublicFun() {} + protected fun unchangedProtectedFun() {} + internal fun unchangedInternalFun() {} + private fun unchangedPrivateFun() {} +} + diff --git a/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/old.kt b/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/old.kt new file mode 100644 index 00000000000..0889792a218 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/old.kt @@ -0,0 +1,40 @@ +package test + +class UnchangedClassWithFunOnly { + public fun unchangedPublicFun() {} + protected fun unchangedProtectedFun() {} + internal fun unchangedInternalFun() {} + private fun unchangedPrivateFun() {} +} + +class UnchangedClassWithValOnly { + public val unchangedPublicVal = 10 + protected val unchangedProtectedVal = 10 + internal val unchangedInternalVal = 10 + private val unchangedPrivateVal = 10 +} + +class UnchangedClassWithVarOnly { + public var unchangedPublicVar = 20 + protected var unchangedProtectedVar = 20 + internal var unchangedInternalVar = 20 + private var unchangedPrivateVar = 20 +} + +class UnchangedClass { + public val unchangedPublicVal = 10 + protected val unchangedProtectedVal = 10 + internal val unchangedInternalVal = 10 + private val unchangedPrivateVal = 10 + + public var unchangedPublicVar = 20 + protected var unchangedProtectedVar = 20 + internal var unchangedInternalVar = 20 + private var unchangedPrivateVar = 20 + + public fun unchangedPublicFun() {} + protected fun unchangedProtectedFun() {} + internal fun unchangedInternalFun() {} + private fun unchangedPrivateFun() {} +} + diff --git a/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out b/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out new file mode 100644 index 00000000000..7ff9822f5c7 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/unchanged/unchangedClass/result.out @@ -0,0 +1,4 @@ +changes in test/UnchangedClass: NONE +changes in test/UnchangedClassWithFunOnly: NONE +changes in test/UnchangedClassWithValOnly: NONE +changes in test/UnchangedClassWithVarOnly: NONE diff --git a/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/new.kt b/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/new.kt new file mode 100644 index 00000000000..0625597c878 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/new.kt @@ -0,0 +1,13 @@ +package test + +public fun unchangedFun() {} + +private fun unchangedPrivateFun(): Int = 10 + +public val unchangedVal: Int = 10 + +public var unchangedVar: Int = 20 + +private val unchangedPrivateVal: Int = 10 + +private var unchangedPrivateVar: Int = 20 diff --git a/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/old.kt b/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/old.kt new file mode 100644 index 00000000000..0625597c878 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/old.kt @@ -0,0 +1,13 @@ +package test + +public fun unchangedFun() {} + +private fun unchangedPrivateFun(): Int = 10 + +public val unchangedVal: Int = 10 + +public var unchangedVar: Int = 20 + +private val unchangedPrivateVal: Int = 10 + +private var unchangedPrivateVar: Int = 20 diff --git a/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out b/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out new file mode 100644 index 00000000000..2b72c17b8c9 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out @@ -0,0 +1,2 @@ +changes in test/MainKt: NONE +changes in test/TestPackage: NONE From 14c45372ee574e657b00615d3b5f36c11b3b7250 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 18 Sep 2015 16:17:02 +0200 Subject: [PATCH 0490/1557] remove support for 'trait' keyword Original commit: 4ca434da54e01c0b2a5b1cd2a8daadf643475430 --- .../kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt | 4 ++-- .../jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 4 ++-- .../general/DependencyToOldKotlinLib/module/src/module/A.kt | 2 +- .../DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt | 2 +- .../pureKotlin/traitClassObjectConstantChanged/const.kt | 2 +- .../pureKotlin/traitClassObjectConstantChanged/const.kt.new | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt index 5b9286bd4f7..f4709719d65 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.jps.build -import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.CompileContext +import org.jetbrains.jps.incremental.ModuleBuildTarget -public trait KotlinJpsCompilerArgumentsProvider { +public interface KotlinJpsCompilerArgumentsProvider { public fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List public fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List } \ No newline at end of file diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index ef23610fde3..3b1a7f395b5 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -35,7 +35,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { """ package m1; - trait K { + interface K { } """) createFile("m1/J.java", @@ -53,7 +53,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { import m1.J; import m1.K; - trait M2: J { + interface M2: J { override fun bar(): K } """) diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt index b57a44e4536..3314395f737 100644 --- a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/module/src/module/A.kt @@ -1,6 +1,6 @@ package module -public trait A { +public interface A { fun oldFun(): Int = 1 fun newFun(): Int = 42 } diff --git a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt index 0a6c17d7a78..a54a9569787 100644 --- a/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt +++ b/jps/jps-plugin/testData/general/DependencyToOldKotlinLib/oldModuleLib/src/module/A.kt @@ -1,5 +1,5 @@ package module -public trait A { +public interface A { fun oldFun(): Int = 1 } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt index 073204a43e1..6d7566e3856 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt @@ -1,6 +1,6 @@ package test -trait Trait { +interface Trait { companion object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new index 86cc1439efd..23bfae9ef54 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new @@ -1,6 +1,6 @@ package test -trait Trait { +interface Trait { companion object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" From e92511a30a9a0a135de76cf5ba7628174ede077c Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 21 Sep 2015 14:53:04 +0300 Subject: [PATCH 0491/1557] ProtoCompareGenerated: get rid ofusage of internal details of NameResolver Original commit: 34d4d2e7d9d017440a427e3295cb182141e2e461 --- .../jps/incremental/ProtoCompareGenerated.kt | 150 +++++++++++------- .../jps/incremental/protoDifferenceUtils.kt | 4 +- 2 files changed, 93 insertions(+), 61 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 594c1ec907a..77577656b37 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.incremental +import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.Interner import org.jetbrains.kotlin.serialization.ProtoBuf @@ -27,12 +28,13 @@ import java.util.EnumSet open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, public val newNameResolver: NameResolver) { private val strings = Interner() - public val oldStringIndexes: IntArray = oldNameResolver.stringTable.stringList.map { strings.intern(it) }.toIntArray() - public val newStringIndexes: IntArray = newNameResolver.stringTable.stringList.map { strings.intern(it) }.toIntArray() + public val oldStringIndexesMap: MutableMap = hashMapOf() + public val newStringIndexesMap: MutableMap = hashMapOf() + public val oldClassIdIndexesMap: MutableMap = hashMapOf() + public val newClassIdIndexesMap: MutableMap = hashMapOf() private val fqNames = Interner() - public val oldFqNameIndexes: IntArray = oldNameResolver.qualifiedNameTable.qualifiedNameList.indices.map { fqNames.intern(oldNameResolver.getFqName(it)) }.toIntArray() - public val newFqNameIndexes: IntArray = newNameResolver.qualifiedNameTable.qualifiedNameList.indices.map { fqNames.intern(newNameResolver.getFqName(it)) }.toIntArray() + private val classIds = Interner() open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { @@ -45,7 +47,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { - val result = EnumSet.noneOf(javaClass()) + val result = EnumSet.noneOf(ProtoBufPackageKind::class.java) if (!checkEqualsPackageMember(old, new)) result.add(ProtoBufPackageKind.MEMBER_LIST) @@ -58,11 +60,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.flags != new.flags) return false } - if (oldFqNameIndexes[old.fqName] != newFqNameIndexes[new.fqName]) return false + if (!checkClassIdEquals(old.fqName, new.fqName)) return false if (old.hasCompanionObjectName() != new.hasCompanionObjectName()) return false if (old.hasCompanionObjectName()) { - if (oldStringIndexes[old.companionObjectName] != newStringIndexes[new.companionObjectName]) return false + if (!checkStringEquals(old.companionObjectName, new.companionObjectName)) return false } if (!checkEqualsClassTypeParameter(old, new)) return false @@ -105,18 +107,18 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } public fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet { - val result = EnumSet.noneOf(javaClass()) + val result = EnumSet.noneOf(ProtoBufClassKind::class.java) if (old.hasFlags() != new.hasFlags()) result.add(ProtoBufClassKind.FLAGS) if (old.hasFlags()) { if (old.flags != new.flags) result.add(ProtoBufClassKind.FLAGS) } - if (oldFqNameIndexes[old.fqName] != newFqNameIndexes[new.fqName]) result.add(ProtoBufClassKind.FQ_NAME) + if (!checkClassIdEquals(old.fqName, new.fqName)) result.add(ProtoBufClassKind.FQ_NAME) if (old.hasCompanionObjectName() != new.hasCompanionObjectName()) result.add(ProtoBufClassKind.COMPANION_OBJECT_NAME) if (old.hasCompanionObjectName()) { - if (oldStringIndexes[old.companionObjectName] != newStringIndexes[new.companionObjectName]) result.add(ProtoBufClassKind.COMPANION_OBJECT_NAME) + if (!checkStringEquals(old.companionObjectName, new.companionObjectName)) result.add(ProtoBufClassKind.COMPANION_OBJECT_NAME) } if (!checkEqualsClassTypeParameter(old, new)) result.add(ProtoBufClassKind.TYPE_PARAMETER_LIST) @@ -168,7 +170,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.receiverType, new.receiverType)) return false } - if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false + if (!checkStringEquals(old.name, new.name)) return false if (!checkEqualsCallableValueParameter(old, new)) return false @@ -186,7 +188,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.hasExtension(JvmProtoBuf.implClassName) != new.hasExtension(JvmProtoBuf.implClassName)) return false if (old.hasExtension(JvmProtoBuf.implClassName)) { - if (oldStringIndexes[old.getExtension(JvmProtoBuf.implClassName)] != newStringIndexes[new.getExtension(JvmProtoBuf.implClassName)]) return false + if (!checkStringEquals(old.getExtension(JvmProtoBuf.implClassName), new.getExtension(JvmProtoBuf.implClassName))) return false } return true @@ -195,7 +197,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi open fun checkEquals(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { if (old.id != new.id) return false - if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false + if (!checkStringEquals(old.name, new.name)) return false if (old.hasReified() != new.hasReified()) return false if (old.hasReified()) { @@ -222,7 +224,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.hasFlexibleTypeCapabilitiesId() != new.hasFlexibleTypeCapabilitiesId()) return false if (old.hasFlexibleTypeCapabilitiesId()) { - if (oldStringIndexes[old.flexibleTypeCapabilitiesId] != newStringIndexes[new.flexibleTypeCapabilitiesId]) return false + if (!checkStringEquals(old.flexibleTypeCapabilitiesId, new.flexibleTypeCapabilitiesId)) return false } if (old.hasFlexibleUpperBound() != new.hasFlexibleUpperBound()) return false @@ -232,7 +234,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.hasConstructorClassName() != new.hasConstructorClassName()) return false if (old.hasConstructorClassName()) { - if (oldFqNameIndexes[old.constructorClassName] != newFqNameIndexes[new.constructorClassName]) return false + if (!checkClassIdEquals(old.constructorClassName, new.constructorClassName)) return false } if (old.hasConstructorTypeParameter() != new.hasConstructorTypeParameter()) return false @@ -264,7 +266,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { - if (oldFqNameIndexes[old.id] != newFqNameIndexes[new.id]) return false + if (!checkClassIdEquals(old.id, new.id)) return false if (!checkEqualsAnnotationArgument(old, new)) return false @@ -277,7 +279,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.flags != new.flags) return false } - if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false + if (!checkStringEquals(old.name, new.name)) return false if (!checkEquals(old.type, new.type)) return false @@ -295,7 +297,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } open fun checkEquals(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { - if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false + if (!checkStringEquals(old.name, new.name)) return false if (!checkEquals(old.returnType, new.returnType)) return false @@ -343,7 +345,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } open fun checkEquals(old: ProtoBuf.Annotation.Argument, new: ProtoBuf.Annotation.Argument): Boolean { - if (oldStringIndexes[old.nameId] != newStringIndexes[new.nameId]) return false + if (!checkStringEquals(old.nameId, new.nameId)) return false if (!checkEquals(old.value, new.value)) return false @@ -358,7 +360,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.hasClassFqName() != new.hasClassFqName()) return false if (old.hasClassFqName()) { - if (oldFqNameIndexes[old.classFqName] != newFqNameIndexes[new.classFqName]) return false + if (!checkClassIdEquals(old.classFqName, new.classFqName)) return false } if (old.hasArrayDimension() != new.hasArrayDimension()) return false @@ -370,7 +372,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { - if (oldStringIndexes[old.name] != newStringIndexes[new.name]) return false + if (!checkStringEquals(old.name, new.name)) return false if (!checkEquals(old.type, new.type)) return false @@ -405,17 +407,17 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.hasStringValue() != new.hasStringValue()) return false if (old.hasStringValue()) { - if (oldStringIndexes[old.stringValue] != newStringIndexes[new.stringValue]) return false + if (!checkStringEquals(old.stringValue, new.stringValue)) return false } if (old.hasClassId() != new.hasClassId()) return false if (old.hasClassId()) { - if (oldFqNameIndexes[old.classId] != newFqNameIndexes[new.classId]) return false + if (!checkClassIdEquals(old.classId, new.classId)) return false } if (old.hasEnumValueId() != new.hasEnumValueId()) return false if (old.hasEnumValueId()) { - if (oldStringIndexes[old.enumValueId] != newStringIndexes[new.enumValueId]) return false + if (!checkStringEquals(old.enumValueId, new.enumValueId)) return false } if (old.hasAnnotation() != new.hasAnnotation()) return false @@ -462,7 +464,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.nestedClassNameCount != new.nestedClassNameCount) return false for(i in 0..old.nestedClassNameCount - 1) { - if (oldStringIndexes[old.getNestedClassName(i)] != newStringIndexes[new.getNestedClassName(i)]) return false + if (!checkStringEquals(old.getNestedClassName(i), new.getNestedClassName(i))) return false } return true @@ -482,7 +484,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.enumEntryCount != new.enumEntryCount) return false for(i in 0..old.enumEntryCount - 1) { - if (oldStringIndexes[old.getEnumEntry(i)] != newStringIndexes[new.getEnumEntry(i)]) return false + if (!checkStringEquals(old.getEnumEntry(i), new.getEnumEntry(i))) return false } return true @@ -567,9 +569,39 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + + public fun oldGetIndexOfString(index: Int): Int = getIndexOfString(index, oldStringIndexesMap, oldNameResolver) + public fun newGetIndexOfString(index: Int): Int = getIndexOfString(index, newStringIndexesMap, newNameResolver) + + public fun getIndexOfString(index: Int, map: MutableMap, nameResolver: NameResolver): Int { + map[index]?.let { return it } + + val result = strings.intern(nameResolver.getString(index)) + map[index] = result + return result + } + + public fun oldGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, oldClassIdIndexesMap, oldNameResolver) + public fun newGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, newClassIdIndexesMap, newNameResolver) + + public fun getIndexOfClassId(index: Int, map: MutableMap, nameResolver: NameResolver): Int { + map[index]?.let { return it } + + val result = fqNames.intern(nameResolver.getFqName(index)) + map[index] = result + return result + } + + private fun checkStringEquals(old: Int, new: Int): Boolean { + return oldGetIndexOfString(old) == newGetIndexOfString(new) + } + + private fun checkClassIdEquals(old: Int, new: Int): Boolean { + return oldGetIndexOfClassId(old) == newGetIndexOfClassId(new) + } } -public fun ProtoBuf.Package.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 for(i in 0..memberCount - 1) { @@ -579,17 +611,17 @@ public fun ProtoBuf.Package.hashCode(stringIndexes: IntArray, fqNameIndexes: Int return hashCode } -public fun ProtoBuf.Class.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { hashCode = 31 * hashCode + flags } - hashCode = 31 * hashCode + fqNameIndexes[fqName] + hashCode = 31 * hashCode + fqNameIndexes(fqName) if (hasCompanionObjectName()) { - hashCode = 31 * hashCode + stringIndexes[companionObjectName] + hashCode = 31 * hashCode + stringIndexes(companionObjectName) } for(i in 0..typeParameterCount - 1) { @@ -601,7 +633,7 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: IntArray, fqNameIndexes: IntAr } for(i in 0..nestedClassNameCount - 1) { - hashCode = 31 * hashCode + stringIndexes[getNestedClassName(i)] + hashCode = 31 * hashCode + stringIndexes(getNestedClassName(i)) } for(i in 0..memberCount - 1) { @@ -609,7 +641,7 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: IntArray, fqNameIndexes: IntAr } for(i in 0..enumEntryCount - 1) { - hashCode = 31 * hashCode + stringIndexes[getEnumEntry(i)] + hashCode = 31 * hashCode + stringIndexes(getEnumEntry(i)) } if (hasPrimaryConstructor()) { @@ -627,7 +659,7 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: IntArray, fqNameIndexes: IntAr return hashCode } -public fun ProtoBuf.Callable.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Callable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { @@ -650,7 +682,7 @@ public fun ProtoBuf.Callable.hashCode(stringIndexes: IntArray, fqNameIndexes: In hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) } - hashCode = 31 * hashCode + stringIndexes[name] + hashCode = 31 * hashCode + stringIndexes(name) for(i in 0..valueParameterCount - 1) { hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) @@ -667,18 +699,18 @@ public fun ProtoBuf.Callable.hashCode(stringIndexes: IntArray, fqNameIndexes: In } if (hasExtension(JvmProtoBuf.implClassName)) { - hashCode = 31 * hashCode + stringIndexes[getExtension(JvmProtoBuf.implClassName)] + hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.implClassName)) } return hashCode } -public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 hashCode = 31 * hashCode + id - hashCode = 31 * hashCode + stringIndexes[name] + hashCode = 31 * hashCode + stringIndexes(name) if (hasReified()) { hashCode = 31 * hashCode + reified.hashCode() @@ -695,7 +727,7 @@ public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: IntArray, fqNameIndexe return hashCode } -public fun ProtoBuf.Type.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 for(i in 0..argumentCount - 1) { @@ -707,7 +739,7 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArr } if (hasFlexibleTypeCapabilitiesId()) { - hashCode = 31 * hashCode + stringIndexes[flexibleTypeCapabilitiesId] + hashCode = 31 * hashCode + stringIndexes(flexibleTypeCapabilitiesId) } if (hasFlexibleUpperBound()) { @@ -715,7 +747,7 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArr } if (hasConstructorClassName()) { - hashCode = 31 * hashCode + fqNameIndexes[constructorClassName] + hashCode = 31 * hashCode + fqNameIndexes(constructorClassName) } if (hasConstructorTypeParameter()) { @@ -733,7 +765,7 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArr return hashCode } -public fun ProtoBuf.Class.PrimaryConstructor.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Class.PrimaryConstructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasData()) { @@ -743,10 +775,10 @@ public fun ProtoBuf.Class.PrimaryConstructor.hashCode(stringIndexes: IntArray, f return hashCode } -public fun ProtoBuf.Annotation.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 - hashCode = 31 * hashCode + fqNameIndexes[id] + hashCode = 31 * hashCode + fqNameIndexes(id) for(i in 0..argumentCount - 1) { hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes) @@ -755,14 +787,14 @@ public fun ProtoBuf.Annotation.hashCode(stringIndexes: IntArray, fqNameIndexes: return hashCode } -public fun ProtoBuf.Callable.ValueParameter.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Callable.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { hashCode = 31 * hashCode + flags } - hashCode = 31 * hashCode + stringIndexes[name] + hashCode = 31 * hashCode + stringIndexes(name) hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) @@ -777,10 +809,10 @@ public fun ProtoBuf.Callable.ValueParameter.hashCode(stringIndexes: IntArray, fq return hashCode } -public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 - hashCode = 31 * hashCode + stringIndexes[name] + hashCode = 31 * hashCode + stringIndexes(name) hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) @@ -791,7 +823,7 @@ public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: IntArray, fqNa return hashCode } -public fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasField()) { @@ -813,7 +845,7 @@ public fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: IntArray, fq return hashCode } -public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasProjection()) { @@ -827,17 +859,17 @@ public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: IntArray, fqNameIndexe return hashCode } -public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 - hashCode = 31 * hashCode + stringIndexes[nameId] + hashCode = 31 * hashCode + stringIndexes(nameId) hashCode = 31 * hashCode + value.hashCode(stringIndexes, fqNameIndexes) return hashCode } -public fun JvmProtoBuf.JvmType.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun JvmProtoBuf.JvmType.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasPrimitiveType()) { @@ -845,7 +877,7 @@ public fun JvmProtoBuf.JvmType.hashCode(stringIndexes: IntArray, fqNameIndexes: } if (hasClassFqName()) { - hashCode = 31 * hashCode + fqNameIndexes[classFqName] + hashCode = 31 * hashCode + fqNameIndexes(classFqName) } if (hasArrayDimension()) { @@ -855,10 +887,10 @@ public fun JvmProtoBuf.JvmType.hashCode(stringIndexes: IntArray, fqNameIndexes: return hashCode } -public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 - hashCode = 31 * hashCode + stringIndexes[name] + hashCode = 31 * hashCode + stringIndexes(name) hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) @@ -869,7 +901,7 @@ public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: IntArray, fqNam return hashCode } -public fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: IntArray, fqNameIndexes: IntArray): Int { +public fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasType()) { @@ -889,15 +921,15 @@ public fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: IntArray, } if (hasStringValue()) { - hashCode = 31 * hashCode + stringIndexes[stringValue] + hashCode = 31 * hashCode + stringIndexes(stringValue) } if (hasClassId()) { - hashCode = 31 * hashCode + fqNameIndexes[classId] + hashCode = 31 * hashCode + fqNameIndexes(classId) } if (hasEnumValueId()) { - hashCode = 31 * hashCode + stringIndexes[enumValueId] + hashCode = 31 * hashCode + stringIndexes(enumValueId) } if (hasAnnotation()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index f575e4fda2e..7bc06f13708 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -58,8 +58,8 @@ private abstract class DifferenceCalculator() { ): Collection { val result = hashSetOf() - val oldMap = oldList.groupBy { it.hashCode(compareObject.oldStringIndexes, compareObject.oldFqNameIndexes) } - val newMap = newList.groupBy { it.hashCode(compareObject.newStringIndexes, compareObject.newFqNameIndexes) } + val oldMap = oldList.groupBy { it.hashCode({ compareObject.oldGetIndexOfString(it) }, { compareObject.oldGetIndexOfClassId(it) } )} + val newMap = newList.groupBy { it.hashCode({ compareObject.newGetIndexOfString(it) }, { compareObject.newGetIndexOfClassId(it) } )} fun List.names(nameResolver: NameResolver): List = map { nameResolver.getString(it.name) } From 3fd7114d4995bc815dacc80a879169378c6545bf Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 22 Sep 2015 17:45:58 +0300 Subject: [PATCH 0492/1557] Minor, fix annoying nullability warning Original commit: 1878f892c105a68e05074042611c545339f40865 --- .../jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 86e24b1c7e5..1ff5e0ace77 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -42,7 +42,7 @@ class LocalFileKotlinClass private constructor( public val className: JvmClassName by lazy { JvmClassName.byClassId(classId) } - override fun getLocation() = file.getAbsolutePath() + override fun getLocation(): String = file.absolutePath public override fun getFileContents(): ByteArray = fileContents From 2060ccebdf3147b22b20ab77e0a7d2f12d40e143 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 22 Sep 2015 18:10:02 +0300 Subject: [PATCH 0493/1557] Move Interner from deserialization to util This class is not used in core and should not end up in kotlin-reflect.jar Original commit: 4ca8a51234239ec126e91e58741aa1e17d8931f4 --- .../jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 77577656b37..5de59380920 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.serialization.Interner import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf -import java.util.EnumSet +import org.jetbrains.kotlin.utils.Interner +import java.util.* /** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */ From b4e7a9c740cbcd560e131bda7dd9be2c35b6df24 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 21 Sep 2015 23:06:22 +0300 Subject: [PATCH 0494/1557] add test for check access to internal elements from another module #KT-9178 Fixed Original commit: 4d9eaf19c39972f92fa4c13bb76cd71ad8f66a5f --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 18 +++++++++++ .../kotlinProject.ipr | 32 +++++++++++++++++++ .../module1/module1.iml | 13 ++++++++ .../module1/src/module1.kt | 10 ++++++ .../module2/module2.iml | 14 ++++++++ .../module2/src/additional.kt | 9 ++++++ .../module2/src/module2.kt | 29 +++++++++++++++++ 7 files changed, 125 insertions(+) create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 6a6a749a614..4e2843be32f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -43,6 +43,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.org.objectweb.asm.ClassReader @@ -472,6 +473,23 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) } + public fun testInternalFromAnotherModule() { + initProject() + val result = makeAll() + result.assertFailed() + + val module2File = File(workDir, "module2/src/module2.kt") + val expectedErrors = InTextDirectivesUtils.findLinesWithPrefixesRemoved(FileUtilRt.loadFile(module2File), "// ERROR:") + .sorted() + .joinToString("\n") + val actualErrors = result.getMessages(BuildMessage.Kind.ERROR) + .map { it.messageText } + .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() } + .sorted() + .joinToString("\n") + assertEquals(expectedErrors, actualErrors, "Error messages were different") + } + public fun testCircularDependencyWithReferenceToOldVersionLib() { initProject() diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr b/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml new file mode 100644 index 00000000000..3b1ba79ed61 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt new file mode 100644 index 00000000000..30fcc94d780 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt @@ -0,0 +1,10 @@ +package test + +internal open class InternalClass1 + +abstract class ClassA1(internal val member: Int) + +abstract class ClassB1 { + internal abstract val member: Int +} + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml new file mode 100644 index 00000000000..ecdc9e147ae --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt new file mode 100644 index 00000000000..e7ebf8914c0 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt @@ -0,0 +1,9 @@ +package test + +internal open class InternalClass2 + +abstract class ClassA2(internal val member: Int) + +abstract class ClassB2 { + internal abstract val member: Int +} diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt new file mode 100644 index 00000000000..1f1647ddad4 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt @@ -0,0 +1,29 @@ +// ERROR: 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it +// ERROR: Cannot access 'InternalClass1': it is 'internal' in 'test' +// ERROR: Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' +package test + +// InternalClass1, ClassA1, ClassB1 are in module1 +class ClassInheritedFromInternal1: InternalClass1() + +class ClassAA1 : ClassA1(10) + +class ClassBB1 : ClassB1() { + internal override val member = 10 +} + +// InternalClass2, ClassA2, ClassB2 are in module2 +class ClassInheritedFromInternal2: InternalClass2() + +class ClassAA2 : ClassA2(10) + +class ClassBB2 : ClassB2() { + internal override val member = 10 +} + +fun f() { + val x1 = ClassAA1().member + val x2 = ClassAA2().member +} + + From b23cbc0ade0f1044d0367c249bfbda2a69cc6ce9 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 23 Sep 2015 17:35:59 +0300 Subject: [PATCH 0495/1557] Revert "add test for check access to internal elements from another module" This reverts commit b4e7a9c740cbcd560e131bda7dd9be2c35b6df24. Original commit: db602df146033c887524cba27336c97ad3c54815 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 18 ----------- .../kotlinProject.ipr | 32 ------------------- .../module1/module1.iml | 13 -------- .../module1/src/module1.kt | 10 ------ .../module2/module2.iml | 14 -------- .../module2/src/additional.kt | 9 ------ .../module2/src/module2.kt | 29 ----------------- 7 files changed, 125 deletions(-) delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt delete mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 4e2843be32f..6a6a749a614 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -43,7 +43,6 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.org.objectweb.asm.ClassReader @@ -473,23 +472,6 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) } - public fun testInternalFromAnotherModule() { - initProject() - val result = makeAll() - result.assertFailed() - - val module2File = File(workDir, "module2/src/module2.kt") - val expectedErrors = InTextDirectivesUtils.findLinesWithPrefixesRemoved(FileUtilRt.loadFile(module2File), "// ERROR:") - .sorted() - .joinToString("\n") - val actualErrors = result.getMessages(BuildMessage.Kind.ERROR) - .map { it.messageText } - .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() } - .sorted() - .joinToString("\n") - assertEquals(expectedErrors, actualErrors, "Error messages were different") - } - public fun testCircularDependencyWithReferenceToOldVersionLib() { initProject() diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr b/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr deleted file mode 100644 index c1a403dd047..00000000000 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml deleted file mode 100644 index 3b1ba79ed61..00000000000 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt deleted file mode 100644 index 30fcc94d780..00000000000 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt +++ /dev/null @@ -1,10 +0,0 @@ -package test - -internal open class InternalClass1 - -abstract class ClassA1(internal val member: Int) - -abstract class ClassB1 { - internal abstract val member: Int -} - diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml deleted file mode 100644 index ecdc9e147ae..00000000000 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt deleted file mode 100644 index e7ebf8914c0..00000000000 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -internal open class InternalClass2 - -abstract class ClassA2(internal val member: Int) - -abstract class ClassB2 { - internal abstract val member: Int -} diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt deleted file mode 100644 index 1f1647ddad4..00000000000 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt +++ /dev/null @@ -1,29 +0,0 @@ -// ERROR: 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it -// ERROR: Cannot access 'InternalClass1': it is 'internal' in 'test' -// ERROR: Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' -package test - -// InternalClass1, ClassA1, ClassB1 are in module1 -class ClassInheritedFromInternal1: InternalClass1() - -class ClassAA1 : ClassA1(10) - -class ClassBB1 : ClassB1() { - internal override val member = 10 -} - -// InternalClass2, ClassA2, ClassB2 are in module2 -class ClassInheritedFromInternal2: InternalClass2() - -class ClassAA2 : ClassA2(10) - -class ClassBB2 : ClassB2() { - internal override val member = 10 -} - -fun f() { - val x1 = ClassAA1().member - val x2 = ClassAA2().member -} - - From 2da6169a4e7553357ac8cd7e4ac266072895fa32 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 23 Sep 2015 12:55:18 +0200 Subject: [PATCH 0496/1557] Utils for checking presense of certain lines in a sequence, using this tool for checking log after daemon builds in tests, fixing explicit daemon shutdown used in the test, some minor fixes Original commit: c294a682dee86abbdbe80adf68891a84edf62ed0 --- .../jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 3b1a7f395b5..f32820d9b48 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -20,6 +20,7 @@ import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY +import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_LOG_PATH_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY import org.jetbrains.kotlin.test.JetTestUtils import java.io.File @@ -71,12 +72,15 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "") // spaces in the name to test proper file name handling val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running"); + val logFile = File.createTempFile("kotlin-daemon", ".log") + System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath) + System.setProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY, logFile.absolutePath) try { - System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath) testLoadingKotlinFromDifferentModules() } finally { flagFile.delete() + System.clearProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY) System.clearProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY) System.clearProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY) System.clearProperty(COMPILE_DAEMON_ENABLED_PROPERTY) From 1d3856b70e020fa8cc741ac77160aa7de7887b63 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 23 Sep 2015 14:52:41 +0200 Subject: [PATCH 0497/1557] Converting KotlinCompilerRunner.java to kotlin - phase 1 - renaming to .kt to preserve history Original commit: fffe6dd83723eb405851a9b7af218006e5c37a91 --- .../{KotlinCompilerRunner.java => KotlinCompilerRunner.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/{KotlinCompilerRunner.java => KotlinCompilerRunner.kt} (100%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt From 448551f3f397759662cd60418edefd9423bffda2 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 23 Sep 2015 14:56:41 +0200 Subject: [PATCH 0498/1557] Converting KotlinCompilerRunner.java to kotlin - phase 2 - converter + manual fixes Original commit: 0047fb1272c1147c16e53fd4ae3bedab73ede5fc --- .../compilerRunner/KotlinCompilerRunner.kt | 338 +++++++++--------- .../kotlin/jps/build/KotlinBuilder.kt | 7 +- 2 files changed, 165 insertions(+), 180 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 3710979bd86..65dd3ccc23f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -14,261 +14,247 @@ * limitations under the License. */ -package org.jetbrains.kotlin.compilerRunner; +package org.jetbrains.kotlin.compilerRunner -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.ArrayUtil; -import com.intellij.util.Function; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.xmlb.XmlSerializerUtil; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.cli.common.ExitCode; -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.kotlin.cli.common.messages.MessageCollector; -import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil; -import org.jetbrains.kotlin.config.CompilerSettings; -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache; -import org.jetbrains.kotlin.modules.TargetId; -import org.jetbrains.kotlin.rmi.*; -import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportCategory; -import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportMessage; -import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportingTargets; -import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient; -import org.jetbrains.kotlin.utils.UtilsPackage; +import com.intellij.openapi.util.text.StringUtil +import com.intellij.util.ArrayUtil +import com.intellij.util.Function +import com.intellij.util.containers.ContainerUtil +import com.intellij.util.xmlb.XmlSerializerUtil +import org.jetbrains.kotlin.cli.common.ExitCode +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil +import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache +import org.jetbrains.kotlin.modules.TargetId +import org.jetbrains.kotlin.rmi.* +import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportCategory +import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportMessage +import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportingTargets +import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient +import org.jetbrains.kotlin.utils.* -import java.io.*; -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.io.* +import java.lang.reflect.Field +import java.lang.reflect.Modifier +import java.util.ArrayList -import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; -import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO -public class KotlinCompilerRunner { - private static final String K2JVM_COMPILER = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler"; - private static final String K2JS_COMPILER = "org.jetbrains.kotlin.cli.js.K2JSCompiler"; - private static final String INTERNAL_ERROR = ExitCode.INTERNAL_ERROR.toString(); +public object KotlinCompilerRunner { + private val K2JVM_COMPILER = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" + private val K2JS_COMPILER = "org.jetbrains.kotlin.cli.js.K2JSCompiler" + private val INTERNAL_ERROR = ExitCode.INTERNAL_ERROR.toString() - public static void runK2JvmCompiler( - CommonCompilerArguments commonArguments, - K2JVMCompilerArguments k2jvmArguments, - CompilerSettings compilerSettings, - MessageCollector messageCollector, - CompilerEnvironment environment, - Map incrementalCaches, - File moduleFile, - OutputItemsCollector collector - ) { - K2JVMCompilerArguments arguments = mergeBeans(commonArguments, k2jvmArguments); - setupK2JvmArguments(moduleFile, arguments); + public fun runK2JvmCompiler( + commonArguments: CommonCompilerArguments, + k2jvmArguments: K2JVMCompilerArguments, + compilerSettings: CompilerSettings, + messageCollector: MessageCollector, + environment: CompilerEnvironment, + incrementalCaches: Map?, + moduleFile: File, + collector: OutputItemsCollector) { + val arguments = mergeBeans(commonArguments, k2jvmArguments) + setupK2JvmArguments(moduleFile, arguments) - runCompiler(K2JVM_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment, - incrementalCaches); + runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment, + incrementalCaches) } - public static void runK2JsCompiler( - @NotNull CommonCompilerArguments commonArguments, - @NotNull K2JSCompilerArguments k2jsArguments, - @NotNull CompilerSettings compilerSettings, - @NotNull MessageCollector messageCollector, - @NotNull CompilerEnvironment environment, - Map incrementalCaches, - @NotNull OutputItemsCollector collector, - @NotNull Collection sourceFiles, - @NotNull List libraryFiles, - @NotNull File outputFile - ) { - K2JSCompilerArguments arguments = mergeBeans(commonArguments, k2jsArguments); - setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments); + public fun runK2JsCompiler( + commonArguments: CommonCompilerArguments, + k2jsArguments: K2JSCompilerArguments, + compilerSettings: CompilerSettings, + messageCollector: MessageCollector, + environment: CompilerEnvironment, + incrementalCaches: Map?, + collector: OutputItemsCollector, + sourceFiles: Collection, + libraryFiles: List, + outputFile: File) { + val arguments = mergeBeans(commonArguments, k2jsArguments) + setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments) - runCompiler(K2JS_COMPILER, arguments, compilerSettings.getAdditionalArguments(), messageCollector, collector, environment, - incrementalCaches); + runCompiler(K2JS_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment, + incrementalCaches) } - private static void ProcessCompilerOutput( - MessageCollector messageCollector, - OutputItemsCollector collector, - ByteArrayOutputStream stream, - String exitCode - ) { - BufferedReader reader = new BufferedReader(new StringReader(stream.toString())); - CompilerOutputParser.parseCompilerMessagesFromReader(messageCollector, reader, collector); + private fun ProcessCompilerOutput( + messageCollector: MessageCollector, + collector: OutputItemsCollector, + stream: ByteArrayOutputStream, + exitCode: String) { + val reader = BufferedReader(StringReader(stream.toString())) + CompilerOutputParser.parseCompilerMessagesFromReader(messageCollector, reader, collector) - if (INTERNAL_ERROR.equals(exitCode)) { - reportInternalCompilerError(messageCollector); + if (INTERNAL_ERROR == exitCode) { + reportInternalCompilerError(messageCollector) } } - private static void reportInternalCompilerError(MessageCollector messageCollector) { - messageCollector.report(ERROR, "Compiler terminated with internal error", NO_LOCATION); + private fun reportInternalCompilerError(messageCollector: MessageCollector) { + messageCollector.report(ERROR, "Compiler terminated with internal error", CompilerMessageLocation.NO_LOCATION) } - private static void runCompiler( - String compilerClassName, - CommonCompilerArguments arguments, - String additionalArguments, - MessageCollector messageCollector, - OutputItemsCollector collector, - CompilerEnvironment environment, - Map incrementalCaches - ) { + private fun runCompiler( + compilerClassName: String, + arguments: CommonCompilerArguments, + additionalArguments: String, + messageCollector: MessageCollector, + collector: OutputItemsCollector, + environment: CompilerEnvironment, + incrementalCaches: Map?) { try { - messageCollector.report(INFO, "Using kotlin-home = " + environment.getKotlinPaths().getHomePath(), NO_LOCATION); + messageCollector.report(INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) - List argumentsList = ArgumentUtils.convertArgumentsToStringList(arguments); - argumentsList.addAll(StringUtil.split(additionalArguments, " ")); + val argumentsList = ArgumentUtils.convertArgumentsToStringList(arguments) + argumentsList.addAll(StringUtil.split(additionalArguments, " ")) - String[] argsArray = ArrayUtil.toStringArray(argumentsList); + val argsArray = ArrayUtil.toStringArray(argumentsList) if (!tryCompileWithDaemon(messageCollector, collector, environment, incrementalCaches, argsArray)) { // otherwise fallback to in-process - ByteArrayOutputStream stream = new ByteArrayOutputStream(); - PrintStream out = new PrintStream(stream); + val stream = ByteArrayOutputStream() + val out = PrintStream(stream) - Object rc = CompilerRunnerUtil.invokeExecMethod( compilerClassName, argsArray, environment, messageCollector, out); + val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out) // exec() returns an ExitCode object, class of which is loaded with a different class loader, // so we take it's contents through reflection - ProcessCompilerOutput(messageCollector, collector, stream, getReturnCodeFromObject(rc)); + ProcessCompilerOutput(messageCollector, collector, stream, getReturnCodeFromObject(rc)) } } - catch (Throwable e) { - MessageCollectorUtil.reportException(messageCollector, e); - reportInternalCompilerError(messageCollector); + catch (e: Throwable) { + MessageCollectorUtil.reportException(messageCollector, e) + reportInternalCompilerError(messageCollector) } + } - private static boolean tryCompileWithDaemon( - MessageCollector messageCollector, - OutputItemsCollector collector, - CompilerEnvironment environment, - Map incrementalCaches, - String[] argsArray - ) throws IOException { - if (incrementalCaches != null && RmiPackage.isDaemonEnabled()) { - File libPath = CompilerRunnerUtil.getLibPath(environment.getKotlinPaths(), messageCollector); + private fun tryCompileWithDaemon( + messageCollector: MessageCollector, + collector: OutputItemsCollector, + environment: CompilerEnvironment, + incrementalCaches: Map?, + argsArray: Array): Boolean { + if (incrementalCaches != null && isDaemonEnabled()) { + val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\ // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler - CompilerId compilerId = CompilerId.makeCompilerId(new File(libPath, "kotlin-compiler.jar")); - DaemonOptions daemonOptions = RmiPackage.configureDaemonOptions(); - DaemonJVMOptions daemonJVMOptions = RmiPackage.configureDaemonJVMOptions(true); + val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) + val daemonOptions = configureDaemonOptions() + val daemonJVMOptions = configureDaemonJVMOptions(true) - ArrayList daemonReportMessages = new ArrayList(); + val daemonReportMessages = ArrayList() - CompileService daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, new DaemonReportingTargets(null, daemonReportMessages), true, true); + val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) - for (DaemonReportMessage msg: daemonReportMessages) { - if (msg.getCategory() == DaemonReportCategory.EXCEPTION && daemon == null) { + for (msg in daemonReportMessages) { + if (msg.category === DaemonReportCategory.EXCEPTION && daemon == null) { messageCollector.report(CompilerMessageSeverity.INFO, - "Falling back to compilation without daemon due to error: " + msg.getMessage(), - CompilerMessageLocation.NO_LOCATION); + "Falling back to compilation without daemon due to error: " + msg.message, + CompilerMessageLocation.NO_LOCATION) } else { - messageCollector.report(CompilerMessageSeverity.INFO, msg.getMessage(), CompilerMessageLocation.NO_LOCATION); + messageCollector.report(CompilerMessageSeverity.INFO, msg.message, CompilerMessageLocation.NO_LOCATION) } } if (daemon != null) { - ByteArrayOutputStream compilerOut = new ByteArrayOutputStream(); - ByteArrayOutputStream daemonOut = new ByteArrayOutputStream(); + val compilerOut = ByteArrayOutputStream() + val daemonOut = ByteArrayOutputStream() - Integer res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut); + val res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut) - ProcessCompilerOutput(messageCollector, collector, compilerOut, res.toString()); - BufferedReader reader = new BufferedReader(new StringReader(daemonOut.toString())); - String line = null; - while ((line = reader.readLine()) != null) { - messageCollector.report(CompilerMessageSeverity.INFO, line, CompilerMessageLocation.NO_LOCATION); + ProcessCompilerOutput(messageCollector, collector, compilerOut, res.toString()) + BufferedReader(StringReader(daemonOut.toString())).forEachLine { + messageCollector.report(CompilerMessageSeverity.INFO, it, CompilerMessageLocation.NO_LOCATION) } - return true; + return true } } - return false; + return false } - @NotNull - private static String getReturnCodeFromObject(@Nullable Object rc) throws Exception { + private fun getReturnCodeFromObject(rc: Any?): String { if (rc == null) { - return INTERNAL_ERROR; + return INTERNAL_ERROR } - else if (ExitCode.class.getName().equals(rc.getClass().getName())) { - return rc.toString(); + else if (ExitCode::class.java.name == rc.javaClass.name) { + return rc.toString() } else { - throw new IllegalStateException("Unexpected return: " + rc); + throw IllegalStateException("Unexpected return: " + rc) } } - private static T mergeBeans(CommonCompilerArguments from, T to) { + private fun mergeBeans(from: CommonCompilerArguments, to: T): T { // TODO: rewrite when updated version of com.intellij.util.xmlb is available on TeamCity try { - T copy = XmlSerializerUtil.createCopy(to); + val copy = XmlSerializerUtil.createCopy(to) - List fromFields = collectFieldsToCopy(from.getClass()); - for (Field fromField : fromFields) { - Field toField = copy.getClass().getField(fromField.getName()); - toField.set(copy, fromField.get(from)); + val fromFields = collectFieldsToCopy(from.javaClass) + for (fromField in fromFields) { + val toField = copy.javaClass.getField(fromField.name) + toField.set(copy, fromField.get(from)) } - return copy; + return copy } - catch (NoSuchFieldException e) { - throw UtilsPackage.rethrow(e); + catch (e: NoSuchFieldException) { + throw rethrow(e) } - catch (IllegalAccessException e) { - throw UtilsPackage.rethrow(e); + catch (e: IllegalAccessException) { + throw rethrow(e) } + } - private static List collectFieldsToCopy(Class clazz) { - List fromFields = new ArrayList(); + private fun collectFieldsToCopy(clazz: Class<*>): List { + val fromFields = ArrayList() - Class currentClass = clazz; - do { - for (Field field : currentClass.getDeclaredFields()) { - int modifiers = field.getModifiers(); + var currentClass: Class<*>? = clazz + while (currentClass != null) { + for (field in currentClass.declaredFields) { + val modifiers = field.modifiers if (!Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) { - fromFields.add(field); + fromFields.add(field) } } + currentClass = currentClass.superclass } - while ((currentClass = currentClass.getSuperclass()) != null); - return fromFields; + return fromFields } - private static void setupK2JvmArguments(File moduleFile, K2JVMCompilerArguments settings) { - settings.module = moduleFile.getAbsolutePath(); - settings.noStdlib = true; - settings.noJdkAnnotations = true; - settings.noJdk = true; + private fun setupK2JvmArguments(moduleFile: File, settings: K2JVMCompilerArguments) { + settings.module = moduleFile.absolutePath + settings.noStdlib = true + settings.noJdkAnnotations = true + settings.noJdk = true } - private static void setupK2JsArguments( - @NotNull File outputFile, - @NotNull Collection sourceFiles, - @NotNull List libraryFiles, - @NotNull K2JSCompilerArguments settings - ) { - settings.noStdlib = true; - settings.freeArgs = ContainerUtil.map(sourceFiles, new Function() { - @Override - public String fun(File file) { - return file.getPath(); + private fun setupK2JsArguments( + outputFile: File, + sourceFiles: Collection, + libraryFiles: List, + settings: K2JSCompilerArguments) { + settings.noStdlib = true + settings.freeArgs = ContainerUtil.map(sourceFiles, object : Function { + override fun `fun`(file: File): String { + return file.path } - }); - settings.outputFile = outputFile.getPath(); - settings.metaInfo = true; - settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles); + }) + settings.outputFile = outputFile.path + settings.metaInfo = true + settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 3c10754f873..81a96f10aa0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -47,8 +47,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment -import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler -import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler +import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX @@ -520,7 +519,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) - runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, incrementalCaches, outputItemCollector, sourceFiles, libraryFiles, outputFile) + KotlinCompilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, incrementalCaches, outputItemCollector, sourceFiles, libraryFiles, outputFile) return outputItemCollector } @@ -587,7 +586,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") + " in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) - runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, incrementalCaches, moduleFile, outputItemCollector) + KotlinCompilerRunner.runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, incrementalCaches, moduleFile, outputItemCollector) moduleFile.delete() return outputItemCollector From 23dc79b418bf8d51493246bd4ba0e2577e4ce5db Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 24 Sep 2015 10:42:54 +0200 Subject: [PATCH 0499/1557] Converting KotlinCompilerRunner.java to kotlin - phase 3 - refactoring to more kotlin style Original commit: 3c16b2de871de534f1ff71a4452792e157601743 --- .../compilerRunner/KotlinCompilerRunner.kt | 76 ++++++++----------- 1 file changed, 30 insertions(+), 46 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 65dd3ccc23f..4ebfec35d54 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -86,7 +86,7 @@ public object KotlinCompilerRunner { incrementalCaches) } - private fun ProcessCompilerOutput( + private fun processCompilerOutput( messageCollector: MessageCollector, collector: OutputItemsCollector, stream: ByteArrayOutputStream, @@ -115,9 +115,9 @@ public object KotlinCompilerRunner { messageCollector.report(INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) val argumentsList = ArgumentUtils.convertArgumentsToStringList(arguments) - argumentsList.addAll(StringUtil.split(additionalArguments, " ")) + argumentsList.addAll(additionalArguments.split(" ")) - val argsArray = ArrayUtil.toStringArray(argumentsList) + val argsArray = argumentsList.toTypedArray() if (!tryCompileWithDaemon(messageCollector, collector, environment, incrementalCaches, argsArray)) { // otherwise fallback to in-process @@ -129,7 +129,7 @@ public object KotlinCompilerRunner { // exec() returns an ExitCode object, class of which is loaded with a different class loader, // so we take it's contents through reflection - ProcessCompilerOutput(messageCollector, collector, stream, getReturnCodeFromObject(rc)) + processCompilerOutput(messageCollector, collector, stream, getReturnCodeFromObject(rc)) } } catch (e: Throwable) { @@ -145,6 +145,7 @@ public object KotlinCompilerRunner { environment: CompilerEnvironment, incrementalCaches: Map?, argsArray: Array): Boolean { + if (incrementalCaches != null && isDaemonEnabled()) { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\ @@ -174,7 +175,7 @@ public object KotlinCompilerRunner { val res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut) - ProcessCompilerOutput(messageCollector, collector, compilerOut, res.toString()) + processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { messageCollector.report(CompilerMessageSeverity.INFO, it, CompilerMessageLocation.NO_LOCATION) } @@ -185,37 +186,24 @@ public object KotlinCompilerRunner { } private fun getReturnCodeFromObject(rc: Any?): String { - if (rc == null) { - return INTERNAL_ERROR - } - else if (ExitCode::class.java.name == rc.javaClass.name) { - return rc.toString() - } - else { - throw IllegalStateException("Unexpected return: " + rc) + when { + rc == null -> return INTERNAL_ERROR + ExitCode::class.java.name == rc.javaClass.name -> return rc.toString() + else -> throw IllegalStateException("Unexpected return: " + rc) } } private fun mergeBeans(from: CommonCompilerArguments, to: T): T { // TODO: rewrite when updated version of com.intellij.util.xmlb is available on TeamCity - try { - val copy = XmlSerializerUtil.createCopy(to) + val copy = XmlSerializerUtil.createCopy(to) - val fromFields = collectFieldsToCopy(from.javaClass) - for (fromField in fromFields) { - val toField = copy.javaClass.getField(fromField.name) - toField.set(copy, fromField.get(from)) - } - - return copy - } - catch (e: NoSuchFieldException) { - throw rethrow(e) - } - catch (e: IllegalAccessException) { - throw rethrow(e) + val fromFields = collectFieldsToCopy(from.javaClass) + for (fromField in fromFields) { + val toField = copy.javaClass.getField(fromField.name) + toField.set(copy, fromField.get(from)) } + return copy } private fun collectFieldsToCopy(clazz: Class<*>): List { @@ -236,25 +224,21 @@ public object KotlinCompilerRunner { } private fun setupK2JvmArguments(moduleFile: File, settings: K2JVMCompilerArguments) { - settings.module = moduleFile.absolutePath - settings.noStdlib = true - settings.noJdkAnnotations = true - settings.noJdk = true + with(settings) { + module = moduleFile.absolutePath + noStdlib = true + noJdkAnnotations = true + noJdk = true + } } - private fun setupK2JsArguments( - outputFile: File, - sourceFiles: Collection, - libraryFiles: List, - settings: K2JSCompilerArguments) { - settings.noStdlib = true - settings.freeArgs = ContainerUtil.map(sourceFiles, object : Function { - override fun `fun`(file: File): String { - return file.path - } - }) - settings.outputFile = outputFile.path - settings.metaInfo = true - settings.libraryFiles = ArrayUtil.toStringArray(libraryFiles) + private fun setupK2JsArguments( _outputFile: File, sourceFiles: Collection, _libraryFiles: List, settings: K2JSCompilerArguments) { + with(settings) { + noStdlib = true + freeArgs = sourceFiles.map { it.path } + outputFile = _outputFile.path + metaInfo = true + libraryFiles = _libraryFiles.toTypedArray() + } } } From 1efdfbe6dbe4f682b77875ca6a087980e2315e3f Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 23 Sep 2015 15:07:48 +0200 Subject: [PATCH 0500/1557] Refactoring parts related to passing services to compiler in daemon, adding uniform support for cancellation check and lookup tracking Original commit: 4b1601974f4f2c185cf5dc17d7668471a1085868 --- .../compilerRunner/KotlinCompilerRunner.kt | 55 +++++++++---------- .../kotlin/jps/build/KotlinBuilder.kt | 10 +--- 2 files changed, 28 insertions(+), 37 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 4ebfec35d54..0dd541b1b9a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -27,25 +27,23 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil import org.jetbrains.kotlin.config.CompilerSettings -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.modules.TargetId -import org.jetbrains.kotlin.rmi.* -import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportCategory -import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportMessage -import org.jetbrains.kotlin.rmi.kotlinr.DaemonReportingTargets -import org.jetbrains.kotlin.rmi.kotlinr.KotlinCompilerClient -import org.jetbrains.kotlin.utils.* - +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents +import org.jetbrains.kotlin.progress.CompilationCanceledStatus +import org.jetbrains.kotlin.rmi.CompilerId +import org.jetbrains.kotlin.rmi.configureDaemonJVMOptions +import org.jetbrains.kotlin.rmi.configureDaemonOptions +import org.jetbrains.kotlin.rmi.isDaemonEnabled +import org.jetbrains.kotlin.rmi.kotlinr.* +import org.jetbrains.kotlin.utils.rethrow import java.io.* import java.lang.reflect.Field import java.lang.reflect.Modifier -import java.util.ArrayList - -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO +import java.util.* public object KotlinCompilerRunner { private val K2JVM_COMPILER = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" @@ -58,14 +56,12 @@ public object KotlinCompilerRunner { compilerSettings: CompilerSettings, messageCollector: MessageCollector, environment: CompilerEnvironment, - incrementalCaches: Map?, moduleFile: File, collector: OutputItemsCollector) { val arguments = mergeBeans(commonArguments, k2jvmArguments) setupK2JvmArguments(moduleFile, arguments) - runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment, - incrementalCaches) + runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) } public fun runK2JsCompiler( @@ -74,7 +70,6 @@ public object KotlinCompilerRunner { compilerSettings: CompilerSettings, messageCollector: MessageCollector, environment: CompilerEnvironment, - incrementalCaches: Map?, collector: OutputItemsCollector, sourceFiles: Collection, libraryFiles: List, @@ -82,8 +77,7 @@ public object KotlinCompilerRunner { val arguments = mergeBeans(commonArguments, k2jsArguments) setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments) - runCompiler(K2JS_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment, - incrementalCaches) + runCompiler(K2JS_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) } private fun processCompilerOutput( @@ -109,8 +103,7 @@ public object KotlinCompilerRunner { additionalArguments: String, messageCollector: MessageCollector, collector: OutputItemsCollector, - environment: CompilerEnvironment, - incrementalCaches: Map?) { + environment: CompilerEnvironment) { try { messageCollector.report(INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) @@ -119,7 +112,7 @@ public object KotlinCompilerRunner { val argsArray = argumentsList.toTypedArray() - if (!tryCompileWithDaemon(messageCollector, collector, environment, incrementalCaches, argsArray)) { + if (!tryCompileWithDaemon(messageCollector, collector, environment, argsArray)) { // otherwise fallback to in-process val stream = ByteArrayOutputStream() @@ -139,14 +132,12 @@ public object KotlinCompilerRunner { } - private fun tryCompileWithDaemon( - messageCollector: MessageCollector, - collector: OutputItemsCollector, - environment: CompilerEnvironment, - incrementalCaches: Map?, - argsArray: Array): Boolean { + private fun tryCompileWithDaemon(messageCollector: MessageCollector, + collector: OutputItemsCollector, + environment: CompilerEnvironment, + argsArray: Array): Boolean { - if (incrementalCaches != null && isDaemonEnabled()) { + if (isDaemonEnabled()) { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\ // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler @@ -173,7 +164,11 @@ public object KotlinCompilerRunner { val compilerOut = ByteArrayOutputStream() val daemonOut = ByteArrayOutputStream() - val res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, incrementalCaches, compilerOut, daemonOut) + val services = CompilationServices( + incrementalCompilationComponents = environment.services.get(IncrementalCompilationComponents::class.java), + compilationCanceledStatus = environment.services.get(CompilationCanceledStatus::class.java)) + + val res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, services, compilerOut, daemonOut) processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 81a96f10aa0..1c028a21d29 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -318,10 +318,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ) } - return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, - incrementalCaches.mapKeysTo(HashMap(incrementalCaches.size()), - { TargetId(it.getKey()) }), - filesToCompile, messageCollector) + return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) } private fun createCompileEnvironment( @@ -519,7 +516,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) - KotlinCompilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, incrementalCaches, outputItemCollector, sourceFiles, libraryFiles, outputFile) + KotlinCompilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) return outputItemCollector } @@ -542,7 +539,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, environment: CompilerEnvironment, - incrementalCaches: MutableMap?, filesToCompile: MultiMap, messageCollector: MessageCollectorAdapter ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() @@ -586,7 +582,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") + " in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) - KotlinCompilerRunner.runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, incrementalCaches, moduleFile, outputItemCollector) + KotlinCompilerRunner.runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) moduleFile.delete() return outputItemCollector From 08f5093adbd682aa07e332b36927ed3ae5de1ab5 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 24 Sep 2015 22:50:48 +0300 Subject: [PATCH 0501/1557] Add tests for cases when add and remove custom accessors for val with smartcasted usage Original commit: 79ac436b9f83de4503ec6d3066f0a4b8115e91d6 --- .../build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../pureKotlin/valAddCustomAccessor/A.kt | 5 +++++ .../pureKotlin/valAddCustomAccessor/A.kt.new | 6 ++++++ .../pureKotlin/valAddCustomAccessor/build.log | 16 ++++++++++++++++ .../pureKotlin/valAddCustomAccessor/usage.kt | 8 ++++++++ .../pureKotlin/valRemoveCustomAccessor/A.kt | 6 ++++++ .../valRemoveCustomAccessor/A.kt.new.2 | 5 +++++ .../valRemoveCustomAccessor/build.log | 19 +++++++++++++++++++ .../valRemoveCustomAccessor/usage.kt | 8 ++++++++ .../valRemoveCustomAccessor/usage.kt.new.1 | 8 ++++++++ 10 files changed, 93 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1 diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index c69eca20406..3410fb148a9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -551,6 +551,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("valAddCustomAccessor") + public void testValAddCustomAccessor() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/"); + doTest(fileName); + } + + @TestMetadata("valRemoveCustomAccessor") + public void testValRemoveCustomAccessor() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/"); + doTest(fileName); + } + } @TestMetadata("jps-plugin/testData/incremental/withJava") diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt new file mode 100644 index 00000000000..b4f36071131 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt @@ -0,0 +1,5 @@ +package test + +class A() { + val x: Int? = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new new file mode 100644 index 00000000000..eb3e9b669b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/A.kt.new @@ -0,0 +1,6 @@ +package test + +class A() { + val x: Int? = 100 + get() = field?.inc() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log new file mode 100644 index 00000000000..6f1e2c934a1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/test/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/TestPackage.class +out/production/module/test/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Int? diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt new file mode 100644 index 00000000000..a078d191b0b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/usage.kt @@ -0,0 +1,8 @@ +package test + +public fun usage() { + val a = A() + if (a.x != null) { + a.x.dec() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt new file mode 100644 index 00000000000..eb3e9b669b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt @@ -0,0 +1,6 @@ +package test + +class A() { + val x: Int? = 100 + get() = field?.inc() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2 new file mode 100644 index 00000000000..b4f36071131 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/A.kt.new.2 @@ -0,0 +1,5 @@ +package test + +class A() { + val x: Int? = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log new file mode 100644 index 00000000000..a16744da042 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log @@ -0,0 +1,19 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/TestPackage.class +out/production/module/test/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Int? + + +Cleaning output files: +out/production/module/test/A.class +End of files +Compiling files: +src/A.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt new file mode 100644 index 00000000000..e7d40a8d067 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt @@ -0,0 +1,8 @@ +package test + +public fun usage() { + val a = A() + if (a.x != null) { +// a.x.dec() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1 new file mode 100644 index 00000000000..a078d191b0b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/usage.kt.new.1 @@ -0,0 +1,8 @@ +package test + +public fun usage() { + val a = A() + if (a.x != null) { + a.x.dec() + } +} From 6b3ab6ec569bc18dbb7a1e5333db6420c46598ce Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Wed, 23 Sep 2015 13:39:07 +0300 Subject: [PATCH 0502/1557] add tests for incremental compilation with changed internal class Original commit: ad274c51372cc93a51c2082933afd971cfed21c1 --- .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../pureKotlin/internalClassChanged/ClassA.kt | 5 +++++ .../pureKotlin/internalClassChanged/ClassA.kt.new | 6 ++++++ .../pureKotlin/internalClassChanged/build.log | 12 ++++++++++++ .../pureKotlin/internalClassChanged/usage.kt | 7 +++++++ .../internalMemberInClassChanged/ClassA.kt | 6 ++++++ .../internalMemberInClassChanged/ClassA.kt.new | 6 ++++++ .../internalMemberInClassChanged/build.log | 12 ++++++++++++ .../pureKotlin/internalMemberInClassChanged/usage.kt | 7 +++++++ 9 files changed, 73 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 3410fb148a9..c728a2802e2 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -329,6 +329,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("internalClassChanged") + public void testInternalClassChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); + doTest(fileName); + } + + @TestMetadata("internalMemberInClassChanged") + public void testInternalMemberInClassChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/"); + doTest(fileName); + } + @TestMetadata("localClassChanged") public void testLocalClassChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt new file mode 100644 index 00000000000..859b0ed8526 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt @@ -0,0 +1,5 @@ +package test + +internal class ClassA() { + public fun meth1() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new new file mode 100644 index 00000000000..ead68452a1f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +internal class ClassA() { + public fun meth1() {} + public val x = 100 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log new file mode 100644 index 00000000000..bc45ca377cb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log @@ -0,0 +1,12 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files +Cleaning output files: +out/production/module/test/Usage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt new file mode 100644 index 00000000000..6402cd3e87a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt @@ -0,0 +1,6 @@ +package test + +class ClassA() { + public fun meth1() {} + internal fun f() {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new new file mode 100644 index 00000000000..5a13f1073cc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/ClassA.kt.new @@ -0,0 +1,6 @@ +package test + +class ClassA() { + public fun meth1() {} + internal fun f(arg: Int) {} +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log new file mode 100644 index 00000000000..bc45ca377cb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log @@ -0,0 +1,12 @@ +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files +Cleaning output files: +out/production/module/test/Usage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt new file mode 100644 index 00000000000..5ba6a9572bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/usage.kt @@ -0,0 +1,7 @@ +package test + +public object Usage { + public fun f() { + ClassA().meth1() + } +} From 5852d10a1ae234a9900e9d247f80aafa8c5a00f9 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 21 Sep 2015 23:06:22 +0300 Subject: [PATCH 0503/1557] add tests in KotlinJpsTest for check access to internal elements from another module Original commit: 0b49195a036d269d3f34882f09296efcdcebf412 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 27 ++++++++++++++++ .../kotlinProject.iml | 13 ++++++++ .../kotlinProject.ipr | 14 ++++++++ .../src/src.kt | 3 ++ .../test/test.kt | 4 +++ .../kotlinProject.ipr | 32 +++++++++++++++++++ .../module1/module1.iml | 14 ++++++++ .../module1/src/module1.kt | 10 ++++++ .../module2/module2.iml | 14 ++++++++ .../module2/src/additional.kt | 9 ++++++ .../module2/src/module2.kt | 29 +++++++++++++++++ .../InternalFromAnotherModule/errors.txt | 3 ++ .../kotlinProject.ipr | 32 +++++++++++++++++++ .../module1/module1.iml | 13 ++++++++ .../module1/src/module1.kt | 10 ++++++ .../module2/module2.iml | 14 ++++++++ .../module2/src/additional.kt | 9 ++++++ .../module2/src/module2.kt | 26 +++++++++++++++ 18 files changed, 276 insertions(+) create mode 100644 jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/src/src.kt create mode 100644 jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/test/test.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/additional.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt create mode 100644 jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 6a6a749a614..48721526603 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -43,6 +43,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.org.objectweb.asm.ClassReader @@ -472,6 +473,25 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) } + public fun testInternalFromAnotherModule() { + initProject() + val result = makeAll() + result.assertFailed() + + val actualErrors = result.getMessages(BuildMessage.Kind.ERROR) + .map { it.messageText }.sorted().joinToString("\n") + val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) + val expectedFile = File(projectRoot, "errors.txt") + JetTestUtils.assertEqualsToFile(expectedFile, actualErrors) + } + + // TODO See KT-9299 In a project with circular dependencies between modules, IDE reports error on use of internal class from another module, but the corresponding code still compiles and runs. + public fun testCircularDependenciesInternalFromAnotherModule() { + initProject() + val result = makeAll() + result.assertSuccessful() + } + public fun testCircularDependencyWithReferenceToOldVersionLib() { initProject() @@ -496,6 +516,13 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.assertSuccessful() } + public fun testAccessToInternalInProductionFromTests() { + initProject() + + val result = makeAll() + result.assertSuccessful() + } + private fun createKotlinJavaScriptLibraryArchive() { val jarFile = File(workDir, KOTLIN_JS_LIBRARY_JAR) try { diff --git a/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/kotlinProject.iml b/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/kotlinProject.iml new file mode 100644 index 00000000000..a441b33e10b --- /dev/null +++ b/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/kotlinProject.ipr b/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/src/src.kt b/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/src/src.kt new file mode 100644 index 00000000000..f820de4b762 --- /dev/null +++ b/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/src/src.kt @@ -0,0 +1,3 @@ +fun foo() { } + +internal fun internalBar() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/test/test.kt b/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/test/test.kt new file mode 100644 index 00000000000..1249dfa8d90 --- /dev/null +++ b/jps/jps-plugin/testData/general/AccessToInternalInProductionFromTests/test/test.kt @@ -0,0 +1,4 @@ +fun test() { + foo() + internalBar() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/kotlinProject.ipr b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/module1.iml b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/module1.iml new file mode 100644 index 00000000000..c9205eae762 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/module1.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt new file mode 100644 index 00000000000..30fcc94d780 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt @@ -0,0 +1,10 @@ +package test + +internal open class InternalClass1 + +abstract class ClassA1(internal val member: Int) + +abstract class ClassB1 { + internal abstract val member: Int +} + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/module2.iml new file mode 100644 index 00000000000..ecdc9e147ae --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/additional.kt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/additional.kt new file mode 100644 index 00000000000..e7ebf8914c0 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/additional.kt @@ -0,0 +1,9 @@ +package test + +internal open class InternalClass2 + +abstract class ClassA2(internal val member: Int) + +abstract class ClassB2 { + internal abstract val member: Int +} diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt new file mode 100644 index 00000000000..1f1647ddad4 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt @@ -0,0 +1,29 @@ +// ERROR: 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it +// ERROR: Cannot access 'InternalClass1': it is 'internal' in 'test' +// ERROR: Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' +package test + +// InternalClass1, ClassA1, ClassB1 are in module1 +class ClassInheritedFromInternal1: InternalClass1() + +class ClassAA1 : ClassA1(10) + +class ClassBB1 : ClassB1() { + internal override val member = 10 +} + +// InternalClass2, ClassA2, ClassB2 are in module2 +class ClassInheritedFromInternal2: InternalClass2() + +class ClassAA2 : ClassA2(10) + +class ClassBB2 : ClassB2() { + internal override val member = 10 +} + +fun f() { + val x1 = ClassAA1().member + val x2 = ClassAA2().member +} + + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt new file mode 100644 index 00000000000..b1533fc68e8 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -0,0 +1,3 @@ +'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it +Cannot access 'InternalClass1': it is 'internal' in 'test' +Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr b/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml new file mode 100644 index 00000000000..3b1ba79ed61 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/module1.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt new file mode 100644 index 00000000000..30fcc94d780 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt @@ -0,0 +1,10 @@ +package test + +internal open class InternalClass1 + +abstract class ClassA1(internal val member: Int) + +abstract class ClassB1 { + internal abstract val member: Int +} + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml new file mode 100644 index 00000000000..ecdc9e147ae --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt new file mode 100644 index 00000000000..e7ebf8914c0 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/additional.kt @@ -0,0 +1,9 @@ +package test + +internal open class InternalClass2 + +abstract class ClassA2(internal val member: Int) + +abstract class ClassB2 { + internal abstract val member: Int +} diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt new file mode 100644 index 00000000000..e4e4077a9f4 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt @@ -0,0 +1,26 @@ +package test + +// InternalClass1, ClassA1, ClassB1 are in module1 +class ClassInheritedFromInternal1: InternalClass1() + +class ClassAA1 : ClassA1(10) + +class ClassBB1 : ClassB1() { + internal override val member = 10 +} + +// InternalClass2, ClassA2, ClassB2 are in module2 +class ClassInheritedFromInternal2: InternalClass2() + +class ClassAA2 : ClassA2(10) + +class ClassBB2 : ClassB2() { + internal override val member = 10 +} + +fun f() { + val x1 = ClassAA1().member + val x2 = ClassAA2().member +} + + From e1266bb28faf0d2fcf495b38f064ef6a18685650 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 25 Sep 2015 14:36:22 +0300 Subject: [PATCH 0504/1557] Minor. Fix file path for windows Original commit: 40554996f874df1a2dfe0183f2d640d4db45bf79 --- .../jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index e300418ef36..4af96a722b6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.build +import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.test.JetTestUtils @@ -44,7 +45,8 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( for (file in workSrcDir.walkTopDown()) { if (!file.isFile) continue - val lookupsFromFile = fileToLookups[file.path] ?: continue + val independentFilePath = FileUtil.toSystemIndependentName(file.path) + val lookupsFromFile = fileToLookups[independentFilePath] ?: continue val text = file.readText() @@ -92,7 +94,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val actual = lines.joinToString("\n") - JetTestUtils.assertEqualsToFile(File(testDataDir, file.path.replace(".*/src/".toRegex(), "")), actual) + JetTestUtils.assertEqualsToFile(File(testDataDir, independentFilePath.replace(".*/src/".toRegex(), "")), actual) } } From c5e44eca7b0e37e8f4dab6824f4d8c7b850c1c4b Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 25 Sep 2015 15:05:27 +0300 Subject: [PATCH 0505/1557] Minor. Fix testdata. Original commit: 8ab41142917d054bbbedbf484719bf27338aaa48 --- .../testData/incremental/lookupTracker/conventions/other.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index 70a42652aa0..f5fcc5c1b4a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -6,8 +6,8 @@ package foo.bar b /*c:foo.bar.A(contains)*/in a "s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in a - /*p:foo.bar c:foo.bar.A(invoke)*/a() - /*p:foo.bar c:foo.bar.A(invoke) p:foo.bar(invoke)*/a(1) + /*c:foo.bar.A(invoke)*/a() + /*c:foo.bar.A(invoke) p:foo.bar(invoke)*/a(1) val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = a; From 6a1fc0c56334304544cc3ac5b5e3bdc1a0f6b92f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 23 Sep 2015 19:39:57 +0300 Subject: [PATCH 0506/1557] Flush dataManager in KotlinJpsBuildTest Original commit: 8c7053552b736c3fcbc4de53a2996e8716a9fed7 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 48721526603..f967323bcb7 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -650,6 +650,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { builder.build(scopeBuilder.build(), false) } finally { + descriptor.dataManager.flush(false) descriptor.release() } } From e810c6f00755abdaf4ed121d7e511cf21be7c15f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 15 Sep 2015 15:57:58 +0300 Subject: [PATCH 0507/1557] Revert removing testDoNotCreateUselessKotlinIncrementalCaches Removed by mistake in 46233cb721d88f74a9c3e0556990a56a942ad039 Original commit: c0b208275e727d2437fe15344b18c122d8013c5a --- .../jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index f967323bcb7..4e34f068d9f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -31,6 +31,7 @@ import org.jetbrains.jps.builders.BuildResult import org.jetbrains.jps.builders.CompileScopeTestBuilder import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.builders.TestProjectBuilderLogger +import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.incremental.BuilderRegistry import org.jetbrains.jps.incremental.IncProjectBuilder @@ -641,6 +642,15 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { ) } + public fun testDoNotCreateUselessKotlinIncrementalCaches() { + initProject() + makeAll().assertSuccessful() + + val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot + assertTrue(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) + assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) + } + private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) { val scopeBuilder = CompileScopeTestBuilder.make().all() val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger)) From eabfd142f3bdb99aecf73d2641be6397aee51f13 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 15 Sep 2015 17:25:28 +0300 Subject: [PATCH 0508/1557] Create Kotlin incremental caches only on write Original commit: fe390a04c512473c8e70c89f78cba603e2b91226 --- .../jps/incremental/IncrementalCacheImpl.kt | 64 +++++----- .../jps/incremental/storage/BasicMap.kt | 53 +++----- .../jps/incremental/storage/LazyStorage.kt | 113 ++++++++++++++++++ .../kotlin/jps/build/KotlinJpsBuildTest.kt | 11 ++ .../kotlinProject.iml | 13 ++ .../kotlinProject.ipr | 15 +++ .../module2/module2.iml | 14 +++ .../module2/src/B.java | 2 + .../src/A.java | 2 + .../src/utils.kt | 1 + 10 files changed, 217 insertions(+), 71 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/src/B.java create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/A.java create mode 100644 jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/utils.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index d9a9c37e082..4171936452b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -92,7 +92,7 @@ class CacheFormatVersion(targetDataRoot: File) { } fun saveIfNeeded() { - if (!file.exists()) { + if (file.parentFile.exists() && !file.exists()) { file.writeText(actualCacheFormatVersion().toString()) } } @@ -271,9 +271,8 @@ public class IncrementalCacheImpl( .toList() val changesInfo = dirtyClasses.fold(ChangesInfo.NO_CHANGES) { info, className -> - val internalName = className.internalName - val newInfo = ChangesInfo(protoChanged = internalName in protoMap, - constantsChanged = internalName in constantsMap) + val newInfo = ChangesInfo(protoChanged = className in protoMap, + constantsChanged = className in constantsMap) newInfo.logIfSomethingChanged(className) info + newInfo } @@ -334,7 +333,7 @@ public class IncrementalCacheImpl( val data = ProtoMapValue(isPackage, bytes) if (oldData == null || !Arrays.equals(bytes, oldData.bytes) || isPackage != oldData.isPackageFacade) { - storage.put(key, data) + storage[key] = data } return ChangesInfo(protoChanged = oldData == null || @@ -342,12 +341,14 @@ public class IncrementalCacheImpl( difference(oldData, data) != DifferenceKind.NONE) } - public fun get(className: JvmClassName): ProtoMapValue? { - return storage[className.getInternalName()] - } + public fun contains(className: JvmClassName): Boolean = + className.internalName in storage + + public fun get(className: JvmClassName): ProtoMapValue? = + storage[className.internalName] public fun remove(className: JvmClassName) { - storage.remove(className.getInternalName()) + storage.remove(className.internalName) } override fun dumpValue(value: ProtoMapValue): String { @@ -372,6 +373,9 @@ public class IncrementalCacheImpl( return if (result.isEmpty()) null else result } + fun contains(className: JvmClassName): Boolean = + className.internalName in storage + public fun process(kotlinClass: LocalFileKotlinClass): ChangesInfo { return put(kotlinClass.className, getConstantsMap(kotlinClass.fileContents)) } @@ -383,7 +387,7 @@ public class IncrementalCacheImpl( if (oldMap == constantsMap) return ChangesInfo.NO_CHANGES if (constantsMap != null) { - storage.put(key, constantsMap) + storage[key] = constantsMap } else { storage.remove(key) @@ -514,7 +518,7 @@ public class IncrementalCacheImpl( } when { - newMap.isNotEmpty() -> storage.put(internalName, newMap) + newMap.isNotEmpty() -> storage[internalName] = newMap else -> storage.remove(internalName) } @@ -536,48 +540,46 @@ public class IncrementalCacheImpl( private inner class PackagePartMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { public fun addPackagePart(className: JvmClassName) { - storage.put(className.getInternalName(), true) + storage[className.internalName] = true } public fun remove(className: JvmClassName) { - storage.remove(className.getInternalName()) + storage.remove(className.internalName) } - public fun isPackagePart(className: JvmClassName): Boolean { - return storage.containsMapping(className.getInternalName()) - } + public fun isPackagePart(className: JvmClassName): Boolean = + className.internalName in storage override fun dumpValue(value: Boolean) = "" } private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringListExternalizer) { public fun clearOutputsForSource(sourceFile: File) { - storage.remove(sourceFile.getAbsolutePath()) + storage.remove(sourceFile.absolutePath) } public fun add(sourceFile: File, className: JvmClassName) { - storage.appendData(sourceFile.getAbsolutePath(), { out -> IOUtil.writeUTF(out, className.getInternalName()) }) + storage.append(sourceFile.absolutePath, { out -> IOUtil.writeUTF(out, className.getInternalName()) }) } - public fun get(sourceFile: File): Collection { - return storage[sourceFile.getAbsolutePath()].orEmpty().map { JvmClassName.byInternalName(it) } - } + public fun get(sourceFile: File): Collection = + storage[sourceFile.absolutePath].orEmpty().map { JvmClassName.byInternalName(it) } override fun dumpValue(value: List) = value.toString() } private inner class ClassToSourcesMap(storageFile: File) : BasicStringMap>(storageFile, PathCollectionExternalizer) { public fun get(className: JvmClassName): Collection = - storage[className.internalName] ?: emptySet() + getFromStorage(className.internalName) ?: emptySet() public fun add(className: JvmClassName, sourceFile: File) { - storage.appendData(className.internalName) { out -> + appendDataToStorage(className.internalName) { out -> IOUtil.writeUTF(out, sourceFile.normalizedPath) } } public fun remove(className: JvmClassName) { - storage.remove(className.internalName) + removeFromStorage(className.internalName) } override fun dumpValue(value: Collection): String = @@ -586,27 +588,25 @@ public class IncrementalCacheImpl( private inner class DirtyOutputClassesMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { public fun markDirty(className: String) { - storage.put(className, true) + storage[className] = true } public fun notDirty(className: String) { storage.remove(className) } - public fun getDirtyOutputClasses(): Collection { - return storage.getAllKeysWithExistingMapping() - } + public fun getDirtyOutputClasses(): Collection = + storage.keys override fun dumpValue(value: Boolean) = "" } private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { public fun getEntries(): Map> = - storage.allKeysWithExistingMapping - .toMap(JvmClassName::byInternalName) { storage[it] } + storage.keys.toMap(JvmClassName::byInternalName) { storage[it]!! } public fun put(className: JvmClassName, changedFunctions: List) { - storage.put(className.internalName, changedFunctions) + storage[className.internalName] = changedFunctions } override fun dumpValue(value: List) = @@ -625,7 +625,7 @@ public class IncrementalCacheImpl( private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { public fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val key = PathFunctionPair(sourcePath, jvmSignature) - storage.appendData(key) { out -> + storage.append(key) { out -> IOUtil.writeUTF(out, targetPath) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 7ef01948a49..13d62fc9e42 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -19,60 +19,38 @@ package org.jetbrains.kotlin.jps.incremental.storage import com.intellij.util.io.DataExternalizer import com.intellij.util.io.EnumeratorStringDescriptor import com.intellij.util.io.KeyDescriptor -import com.intellij.util.io.PersistentHashMap import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.utils.Printer import java.io.File -import java.io.IOException -public abstract class BasicMap, V>( - private val storageFile: File, - private val keyDescriptor: KeyDescriptor, - private val valueExternalizer: DataExternalizer +abstract class BasicMap, V>( + storageFile: File, + keyDescriptor: KeyDescriptor, + valueExternalizer: DataExternalizer ) { - protected var storage: PersistentHashMap = createMap() + protected val storage = LazyStorage(storageFile, keyDescriptor, valueExternalizer) - public fun contains(key: K): Boolean = storage.containsMapping(key) - - public fun clean() { - try { - storage.close() - } - catch (ignored: IOException) { - } - - PersistentHashMap.deleteFilesStartingWith(storage.getBaseFile()!!) - try { - storage = createMap() - } - catch (ignored: IOException) { - } + fun clean() { + storage.clean() } - public fun flush(memoryCachesOnly: Boolean) { - if (memoryCachesOnly) { - if (storage.isDirty()) { - storage.dropMemoryCaches() - } - } - else { - storage.force() - } + fun flush(memoryCachesOnly: Boolean) { + storage.flush(memoryCachesOnly) } - public fun close() { + fun close() { storage.close() } @TestOnly - public fun dump(): String { + fun dump(): String { return with(StringBuilder()) { with(Printer(this)) { - println(this@BasicMap.javaClass.getSimpleName()) + println(this@BasicMap.javaClass.simpleName) pushIndent() - for (key in storage.getAllKeysWithExistingMapping().sort()) { - println("${dumpKey(key)} -> ${dumpValue(storage[key])}") + for (key in storage.keys.sorted()) { + println("${dumpKey(key)} -> ${dumpValue(storage[key]!!)}") } popIndent() @@ -84,9 +62,6 @@ public abstract class BasicMap, V>( protected abstract fun dumpKey(key: K): String protected abstract fun dumpValue(value: V): String - - private fun createMap(): PersistentHashMap = - PersistentHashMap(storageFile, keyDescriptor, valueExternalizer) } public abstract class BasicStringMap( diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt new file mode 100644 index 00000000000..9a002b05951 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt @@ -0,0 +1,113 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import com.intellij.util.io.DataExternalizer +import com.intellij.util.io.KeyDescriptor +import com.intellij.util.io.PersistentHashMap +import java.io.DataOutput +import java.io.File +import java.io.IOException + + +/** + * It's lazy in a sense that PersistentHashMap is created only on write + */ +internal class LazyStorage( + private val storageFile: File, + private val keyDescriptor: KeyDescriptor, + private val valueExternalizer: DataExternalizer +) { + @Volatile + private var storage: PersistentHashMap? = null + + @Synchronized + private fun getStorageIfExists(): PersistentHashMap? { + if (storage != null) return storage + + if (storageFile.exists()) { + storage = createMap() + return storage + } + + return null + } + + @Synchronized + private fun getStorageOrCreateNew(): PersistentHashMap { + if (storage == null) { + storage = createMap() + } + + return storage!! + } + + val keys: Collection + get() = getStorageIfExists()?.allKeysWithExistingMapping ?: listOf() + + fun contains(key: K): Boolean = + getStorageIfExists()?.containsMapping(key) ?: false + + fun get(key: K): V? = + getStorageIfExists()?.get(key) + + fun set(key: K, value: V) { + getStorageOrCreateNew().put(key, value) + } + + fun remove(key: K) { + getStorageIfExists()?.remove(key) + } + + fun append(key: K, append: (DataOutput)->Unit) { + getStorageOrCreateNew().appendData(key, append) + } + + @Synchronized + fun clean() { + try { + storage?.close() + } + catch (ignored: IOException) { + } + + PersistentHashMap.deleteFilesStartingWith(storageFile) + storage = null + } + + @Synchronized + fun flush(memoryCachesOnly: Boolean) { + val existingStorage = storage ?: return + + if (memoryCachesOnly) { + if (existingStorage.isDirty) { + existingStorage.dropMemoryCaches() + } + } + else { + existingStorage.force() + } + } + + @Synchronized + fun close() { + storage?.close() + } + + private fun createMap(): PersistentHashMap = + PersistentHashMap(storageFile, keyDescriptor, valueExternalizer) +} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 4e34f068d9f..e43df4eb49e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -651,6 +651,17 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) } + public fun testDoNotCreateUselessKotlinIncrementalCachesForDependentTargets() { + initProject() + makeAll().assertSuccessful() + + checkWhen(touch("src/utils.kt"), null, packageClasses("kotlinProject", "src/utils.kt", "_DefaultPackage")) + + val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot + assertTrue(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) + assertFalse(File(storageRoot, "targets/java-production/module2/kotlin").exists()) + } + private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) { val scopeBuilder = CompileScopeTestBuilder.make().all() val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger)) diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.iml b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.iml new file mode 100644 index 00000000000..3b1ba79ed61 --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.ipr b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.ipr new file mode 100644 index 00000000000..809737b0b76 --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/kotlinProject.ipr @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/module2.iml b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/module2.iml new file mode 100644 index 00000000000..eace69878a2 --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/src/B.java b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/src/B.java new file mode 100644 index 00000000000..66dd24ce675 --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/module2/src/B.java @@ -0,0 +1,2 @@ +public class B { +} diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/A.java b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/A.java new file mode 100644 index 00000000000..61ff2abcc95 --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/A.java @@ -0,0 +1,2 @@ +public class A { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/utils.kt b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/utils.kt new file mode 100644 index 00000000000..67d276629bf --- /dev/null +++ b/jps/jps-plugin/testData/general/DoNotCreateUselessKotlinIncrementalCachesForDependentTargets/src/utils.kt @@ -0,0 +1 @@ +fun f(): String = "f()" \ No newline at end of file From 10ee4858d09ec6667ed75baae407ec85c14db0c4 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 21 Sep 2015 19:35:48 +0300 Subject: [PATCH 0509/1557] Minor: remove unused ClassToSources map Original commit: b8388ae7ed4c0885c7a621cacbf515ce426ccf6b --- .../jps/incremental/IncrementalCacheImpl.kt | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 4171936452b..cb1bfbaa405 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -112,7 +112,6 @@ public class IncrementalCacheImpl( val INLINE_FUNCTIONS = "inline-functions.tab" val PACKAGE_PARTS = "package-parts.tab" val SOURCE_TO_CLASSES = "source-to-classes.tab" - val CLASS_TO_SOURCES = "class-to-sources.tab" val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions.tab" val INLINED_TO = "inlined-to.tab" @@ -130,7 +129,6 @@ public class IncrementalCacheImpl( private val inlineFunctionsMap = InlineFunctionsMap(INLINE_FUNCTIONS.storageFile) private val packagePartMap = PackagePartMap(PACKAGE_PARTS.storageFile) private val sourceToClassesMap = SourceToClassesMap(SOURCE_TO_CLASSES.storageFile) - private val classToSourcesMap = ClassToSourcesMap(CLASS_TO_SOURCES.storageFile) private val dirtyOutputClassesMap = DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile) private val dirtyInlineFunctionsMap = DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile) private val inlinedTo = InlineFunctionsFilesMap(INLINED_TO.storageFile) @@ -165,7 +163,6 @@ public class IncrementalCacheImpl( val classes = sourceToClassesMap[sourceFile] classes.forEach { dirtyOutputClassesMap.markDirty(it.internalName) - classToSourcesMap.remove(it) } sourceToClassesMap.clearOutputsForSource(sourceFile) @@ -225,7 +222,6 @@ public class IncrementalCacheImpl( dirtyOutputClassesMap.notDirty(className.internalName) sourceFiles.forEach { sourceToClassesMap.add(it, className) - classToSourcesMap.add(className, it) } val header = kotlinClass.classHeader @@ -568,24 +564,6 @@ public class IncrementalCacheImpl( override fun dumpValue(value: List) = value.toString() } - private inner class ClassToSourcesMap(storageFile: File) : BasicStringMap>(storageFile, PathCollectionExternalizer) { - public fun get(className: JvmClassName): Collection = - getFromStorage(className.internalName) ?: emptySet() - - public fun add(className: JvmClassName, sourceFile: File) { - appendDataToStorage(className.internalName) { out -> - IOUtil.writeUTF(out, sourceFile.normalizedPath) - } - } - - public fun remove(className: JvmClassName) { - removeFromStorage(className.internalName) - } - - override fun dumpValue(value: Collection): String = - value.dumpCollection() - } - private inner class DirtyOutputClassesMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { public fun markDirty(className: String) { storage[className] = true From 71e3aef80869fe990208cb08eb23c4bb622b0858 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 22 Sep 2015 16:05:07 +0300 Subject: [PATCH 0510/1557] Minor: remove unused function Original commit: a611dd9d253104c03a472c393f657483cea562b8 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index cb1bfbaa405..c36cdebf21b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -731,9 +731,6 @@ private object PathCollectionExternalizer : DataExternalizer> } } -private val File.normalizedPath: String - get() = FileUtil.toSystemIndependentName(canonicalPath) - @TestOnly private fun , V> Map.dumpMap(dumpValue: (V)->String): String = StringBuilder { From 37c861100d8209fbd03edd4538255102b739f97e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 22 Sep 2015 15:30:23 +0300 Subject: [PATCH 0511/1557] Create map so it will always be added to maps Original commit: 5c9b962567a688fcc901da0449e575f645c5d5ce --- .../jps/incremental/IncrementalCacheImpl.kt | 49 ++++++++++--------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index c36cdebf21b..ff27b3ea592 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -107,39 +107,40 @@ public class IncrementalCacheImpl( private val target: ModuleBuildTarget ) : StorageOwner, IncrementalCache { companion object { - val PROTO_MAP = "proto.tab" - val CONSTANTS_MAP = "constants.tab" - val INLINE_FUNCTIONS = "inline-functions.tab" - val PACKAGE_PARTS = "package-parts.tab" - val SOURCE_TO_CLASSES = "source-to-classes.tab" - val DIRTY_OUTPUT_CLASSES = "dirty-output-classes.tab" - val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions.tab" - val INLINED_TO = "inlined-to.tab" + val CACHE_EXTENSION = "tab" + + private val PROTO_MAP = "proto" + private val CONSTANTS_MAP = "constants" + private val INLINE_FUNCTIONS = "inline-functions" + private val PACKAGE_PARTS = "package-parts" + private val SOURCE_TO_CLASSES = "source-to-classes" + private val DIRTY_OUTPUT_CLASSES = "dirty-output-classes" + private val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions" + private val INLINED_TO = "inlined-to" private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) + private val maps = arrayListOf>() private val String.storageFile: File - get() = File(baseDir, this) + get() = File(baseDir, this + "." + CACHE_EXTENSION) - private val protoMap = ProtoMap(PROTO_MAP.storageFile) - private val constantsMap = ConstantsMap(CONSTANTS_MAP.storageFile) - private val inlineFunctionsMap = InlineFunctionsMap(INLINE_FUNCTIONS.storageFile) - private val packagePartMap = PackagePartMap(PACKAGE_PARTS.storageFile) - private val sourceToClassesMap = SourceToClassesMap(SOURCE_TO_CLASSES.storageFile) - private val dirtyOutputClassesMap = DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile) - private val dirtyInlineFunctionsMap = DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile) - private val inlinedTo = InlineFunctionsFilesMap(INLINED_TO.storageFile) + private fun > registerMap(map: M): M { + maps.add(map) + return map + } - private val maps = listOf(protoMap, - constantsMap, - inlineFunctionsMap, - packagePartMap, - sourceToClassesMap, - dirtyOutputClassesMap, - inlinedTo) + private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) + private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) + private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) + private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile)) + private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile)) + private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile)) + // TODO: can be removed? + private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) + private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val dependents = arrayListOf() From 44293a581f7323c1a59ec726a3c49f20d435c05f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 22 Sep 2015 15:43:43 +0300 Subject: [PATCH 0512/1557] Move CacheFormatVersion to separate file Original commit: 0904b4bae895a08b50bfd6402ae61b9b32f8482d --- .../jps/incremental/CacheFormatVersion.kt | 65 +++++++++++++++++++ .../jps/incremental/IncrementalCacheImpl.kt | 47 +------------- 2 files changed, 66 insertions(+), 46 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt new file mode 100644 index 00000000000..283347db5ed --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt @@ -0,0 +1,65 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.jps.build.KotlinBuilder +import org.jetbrains.kotlin.load.java.JvmAbi +import java.io.File + +class CacheFormatVersion(targetDataRoot: File) { + companion object { + // Change this when incremental cache format changes + private val INCREMENTAL_CACHE_OWN_VERSION = 5 + + private val CACHE_FORMAT_VERSION = + INCREMENTAL_CACHE_OWN_VERSION * 1000000 + + JvmAbi.VERSION.major * 1000 + + JvmAbi.VERSION.minor + + private val NON_INCREMENTAL_MODE_PSEUDO_VERSION = Int.MAX_VALUE + + val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" + } + + private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) + + private fun actualCacheFormatVersion() = if (IncrementalCompilation.ENABLED) CACHE_FORMAT_VERSION else NON_INCREMENTAL_MODE_PSEUDO_VERSION + + public fun isIncompatible(): Boolean { + if (!file.exists()) return false + + val versionNumber = file.readText().toInt() + val expectedVersionNumber = actualCacheFormatVersion() + + if (versionNumber != expectedVersionNumber) { + KotlinBuilder.LOG.info("Incompatible incremental cache version, expected $expectedVersionNumber, actual $versionNumber") + return true + } + return false + } + + fun saveIfNeeded() { + if (file.parentFile.exists() && !file.exists()) { + file.writeText(actualCacheFormatVersion().toString()) + } + } + + fun clean() { + file.delete() + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index ff27b3ea592..4d92ee1b445 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -30,12 +30,10 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.jps.incremental.storage.StorageOwner -import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.BasicMap import org.jetbrains.kotlin.jps.incremental.storage.BasicStringMap -import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.PackageClassUtils @@ -56,52 +54,9 @@ import java.util.* val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" -private val CACHE_DIRECTORY_NAME = "kotlin" +internal val CACHE_DIRECTORY_NAME = "kotlin" -class CacheFormatVersion(targetDataRoot: File) { - companion object { - // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 5 - - private val CACHE_FORMAT_VERSION = - INCREMENTAL_CACHE_OWN_VERSION * 1000000 + - JvmAbi.VERSION.major * 1000 + - JvmAbi.VERSION.minor - - private val NON_INCREMENTAL_MODE_PSEUDO_VERSION = Int.MAX_VALUE - - val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" - } - - private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) - - private fun actualCacheFormatVersion() = if (IncrementalCompilation.ENABLED) CACHE_FORMAT_VERSION else NON_INCREMENTAL_MODE_PSEUDO_VERSION - - public fun isIncompatible(): Boolean { - if (!file.exists()) return false - - val versionNumber = file.readText().toInt() - val expectedVersionNumber = actualCacheFormatVersion() - - if (versionNumber != expectedVersionNumber) { - KotlinBuilder.LOG.info("Incompatible incremental cache version, expected $expectedVersionNumber, actual $versionNumber") - return true - } - return false - } - - fun saveIfNeeded() { - if (file.parentFile.exists() && !file.exists()) { - file.writeText(actualCacheFormatVersion().toString()) - } - } - - fun clean() { - file.delete() - } -} - public class IncrementalCacheImpl( targetDataRoot: File, private val target: ModuleBuildTarget From dace4038758e3b60d454a54fe1fa52c3520b6200 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 22 Sep 2015 16:16:05 +0300 Subject: [PATCH 0513/1557] Move incremental compilation enabled check from CacheFormatVersion to KotlinBuilder Original commit: 92d5b93cc76e62eb5656d9bf0eb9f3f8e93d67bd --- .../kotlin/jps/build/KotlinBuilder.kt | 6 ++++-- .../jps/incremental/CacheFormatVersion.kt | 19 ++++++++----------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1c028a21d29..1e4592e2e47 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -134,8 +134,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val dataManager = projectDescriptor.dataManager - if (chunk.getTargets().any { dataManager.getDataPaths().getKotlinCacheVersion(it).isIncompatible() }) { - LOG.info("Clearing caches for " + chunk.getTargets().map { it.getPresentableName() }.join()) + if (IncrementalCompilation.ENABLED && + chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() } + ) { + LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) val incrementalCaches = getIncrementalCaches(chunk, context) incrementalCaches.values().forEach(StorageOwner::clean) return CHUNK_REBUILD_REQUIRED diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt index 283347db5ed..c8cb8784996 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.load.java.JvmAbi import java.io.File @@ -31,32 +30,30 @@ class CacheFormatVersion(targetDataRoot: File) { JvmAbi.VERSION.major * 1000 + JvmAbi.VERSION.minor - private val NON_INCREMENTAL_MODE_PSEUDO_VERSION = Int.MAX_VALUE - val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" } private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) - private fun actualCacheFormatVersion() = if (IncrementalCompilation.ENABLED) CACHE_FORMAT_VERSION else NON_INCREMENTAL_MODE_PSEUDO_VERSION - - public fun isIncompatible(): Boolean { + fun isIncompatible(): Boolean { if (!file.exists()) return false val versionNumber = file.readText().toInt() - val expectedVersionNumber = actualCacheFormatVersion() - if (versionNumber != expectedVersionNumber) { - KotlinBuilder.LOG.info("Incompatible incremental cache version, expected $expectedVersionNumber, actual $versionNumber") + if (versionNumber != CACHE_FORMAT_VERSION) { + KotlinBuilder.LOG.info("Incompatible incremental cache version, expected $CACHE_FORMAT_VERSION, actual $versionNumber") return true } + return false } fun saveIfNeeded() { - if (file.parentFile.exists() && !file.exists()) { - file.writeText(actualCacheFormatVersion().toString()) + if (!file.parentFile.exists()) { + file.parentFile.mkdirs() } + + file.writeText("$CACHE_FORMAT_VERSION") } fun clean() { From 3823a0f9862207c656146559577c4e120dec6901 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 22 Sep 2015 18:28:03 +0300 Subject: [PATCH 0514/1557] Access cache version file in tests using CacheVersionFormat Original commit: 4b880f324a196bc3800a409a7944ebfc420c1109 --- .../jps/incremental/CacheFormatVersion.kt | 7 ++++- .../jps/build/AbstractIncrementalJpsTest.kt | 30 +++++++++++-------- .../IncrementalCacheVersionChangedTest.kt | 20 +++++-------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt index c8cb8784996..473dad5d1af 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.incremental +import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.load.java.JvmAbi import java.io.File @@ -30,7 +31,7 @@ class CacheFormatVersion(targetDataRoot: File) { JvmAbi.VERSION.major * 1000 + JvmAbi.VERSION.minor - val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" + private val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" } private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) @@ -59,4 +60,8 @@ class CacheFormatVersion(targetDataRoot: File) { fun clean() { file.delete() } + + @TestOnly + val formatVersionFile: File + get() = file } \ No newline at end of file diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 39b3b8c9824..8da3559fb11 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -75,6 +75,8 @@ public abstract class AbstractIncrementalJpsTest( protected var workDir: File by Delegates.notNull() + protected var projectDescriptor: ProjectDescriptor by Delegates.notNull() + private fun enableDebugLogging() { com.intellij.openapi.diagnostic.Logger.setFactory(javaClass()) TestLoggerFactory.dumpLogToStdout("") @@ -106,19 +108,20 @@ public abstract class AbstractIncrementalJpsTest( protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING - protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) {} + protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) { + } fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath) val logger = MyLogger(workDirPath) - val descriptor = createProjectDescriptor(BuildLoggingManager(logger)) + projectDescriptor = createProjectDescriptor(BuildLoggingManager(logger)) val lookupTracker = createLookupTracker() val dataContainer = JpsElementFactory.getInstance().createSimpleElement(lookupTracker) - descriptor.project.container.setChild(KotlinBuilder.LOOKUP_TRACKER, dataContainer) + projectDescriptor.project.container.setChild(KotlinBuilder.LOOKUP_TRACKER, dataContainer) try { - val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), myBuildParams, CanceledStatus.NULL, mockConstantSearch, true) + val builder = IncProjectBuilder(projectDescriptor, BuilderRegistry.getInstance(), myBuildParams, CanceledStatus.NULL, mockConstantSearch, true) val buildResult = BuildResult() builder.addMessageHandler(buildResult) builder.build(scope.build(), false) @@ -135,11 +138,12 @@ public abstract class AbstractIncrementalJpsTest( return MakeResult(logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", true, null) } else { - return MakeResult(logger.log, false, createMappingsDump(descriptor)) + return MakeResult(logger.log, false, createMappingsDump(projectDescriptor)) } - } finally { - descriptor.dataManager.flush(false) - descriptor.release() + } + finally { + projectDescriptor.dataManager.flush(false) + projectDescriptor.release() } } @@ -289,10 +293,7 @@ public abstract class AbstractIncrementalJpsTest( private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { return StringBuilder { - val allTargets = project.buildTargetIndex.allTargets - val moduleTargets = allTargets.filterIsInstance(ModuleBuildTarget::class.java) - - for (target in moduleTargets.sortedBy { it.presentableName }) { + for (target in project.allModuleTargets.sortedBy { it.presentableName }) { append("\n") append(project.dataManager.getKotlinCache(target).dump()) append("\n\n\n") @@ -307,7 +308,7 @@ public abstract class AbstractIncrementalJpsTest( result.println("Begin of SourceToOutputMap") result.pushIndent() - for (target in project.buildTargetIndex.allTargets) { + for (target in project.allModuleTargets) { result.println(target) result.pushIndent() @@ -445,3 +446,6 @@ public abstract class AbstractIncrementalJpsTest( } } } + +internal val ProjectDescriptor.allModuleTargets: Collection + get() = buildTargetIndex.allTargets.filterIsInstance() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt index 97c7880cfc8..53b7dfe1cf6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt @@ -16,11 +16,8 @@ package org.jetbrains.kotlin.jps.build -import org.jetbrains.jps.builders.impl.BuildDataPathsImpl -import java.io.File -import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType +import org.jetbrains.kotlin.jps.incremental.getKotlinCacheVersion import kotlin.test.assertTrue -import org.jetbrains.kotlin.jps.incremental.CacheFormatVersion public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { fun testCacheVersionChanged() { @@ -36,16 +33,13 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(all } override fun performAdditionalModifications() { - val storageForTargetType = BuildDataPathsImpl(myDataStorageRoot).getTargetTypeDataRoot(JavaModuleBuildTargetType.PRODUCTION) + val targets = projectDescriptor.allModuleTargets + val paths = projectDescriptor.dataManager.dataPaths - - val moduleNames = if (getTestName(false) == "CacheVersionChangedMultiModule") listOf("module1", "module2") else listOf("module") - - for (moduleName in moduleNames) { - val relativePath = "$moduleName/${CacheFormatVersion.FORMAT_VERSION_FILE_PATH}" - val cacheVersionFile = File(storageForTargetType, relativePath) - - assertTrue(cacheVersionFile.exists()) + for (target in targets) { + val cacheVersion = paths.getKotlinCacheVersion(target) + val cacheVersionFile = cacheVersion.formatVersionFile + assertTrue(cacheVersionFile.exists(), "Cache version file does not exists: $cacheVersionFile") cacheVersionFile.writeText("777") } } From 86e80e4a58c0d45c6dc18f270f0f1d7367bc2023 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 22 Sep 2015 23:47:52 +0300 Subject: [PATCH 0515/1557] Test that Kotlin incremental caches are created lazily Original commit: a3f2ccf72ddce869a17e16c6e296fb80f7e41bf2 --- .../jps/incremental/IncrementalCacheImpl.kt | 3 + .../AbstractIncrementalLazyCachesTest.kt | 62 ++++++++++++++++ .../IncrementalLazyCachesTestGenerated.java | 74 +++++++++++++++++++ .../incremental/lazyKotlinCaches/class/A.kt | 1 + .../lazyKotlinCaches/class/A.kt.new | 1 + .../lazyKotlinCaches/class/build.log | 6 ++ .../class/expected-kotlin-caches.txt | 4 + .../lazyKotlinCaches/constant/build.log | 16 ++++ .../lazyKotlinCaches/constant/constant.kt | 3 + .../lazyKotlinCaches/constant/constant.kt.new | 3 + .../constant/expected-kotlin-caches.txt | 8 ++ .../lazyKotlinCaches/constant/usage.kt | 4 + .../lazyKotlinCaches/function/build.log | 8 ++ .../function/expected-kotlin-caches.txt | 5 ++ .../lazyKotlinCaches/function/utils.kt | 1 + .../lazyKotlinCaches/function/utils.kt.new | 1 + .../inlineFunctionDeclared/build.log | 8 ++ .../expected-kotlin-caches.txt | 6 ++ .../inlineFunctionDeclared/inline.kt | 3 + .../inlineFunctionDeclared/inline.kt.new | 3 + .../inlineFunctionInlined/build.log | 16 ++++ .../expected-kotlin-caches.txt | 7 ++ .../inlineFunctionInlined/inline.kt | 3 + .../inlineFunctionInlined/inline.kt.new | 5 ++ .../inlineFunctionInlined/usage.kt | 5 ++ .../lazyKotlinCaches/noKotlin/A.java | 2 + .../lazyKotlinCaches/noKotlin/A.java.new | 2 + .../lazyKotlinCaches/noKotlin/build.log | 6 ++ .../noKotlin/expected-kotlin-caches.txt | 2 + 29 files changed, 268 insertions(+) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 4d92ee1b445..8bfa18534b3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -56,6 +56,9 @@ val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" internal val CACHE_DIRECTORY_NAME = "kotlin" +@TestOnly +public fun getCacheDirectoryName(): String = + CACHE_DIRECTORY_NAME public class IncrementalCacheImpl( targetDataRoot: File, diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt new file mode 100644 index 00000000000..91e17db91ce --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +import com.intellij.testFramework.UsefulTestCase +import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl +import org.jetbrains.kotlin.jps.incremental.getCacheDirectoryName +import org.jetbrains.kotlin.utils.Printer +import java.io.File + +public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() { + override fun doTest(testDataPath: String) { + super.doTest(testDataPath) + + val actual = dumpKotlinCachesFileNames() + val expectedFile = File(testDataPath, "expected-kotlin-caches.txt") + UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual) + } + + private fun dumpKotlinCachesFileNames(): String { + val sb = StringBuilder() + val p = Printer(sb) + val targets = projectDescriptor.allModuleTargets + val paths = projectDescriptor.dataManager.dataPaths + + for (target in targets.sortedBy { it.presentableName }) { + p.println(target) + p.pushIndent() + + val dataRoot = paths.getTargetDataRoot(target) + val cacheNames = kotlinCacheNames(dataRoot) + cacheNames.sorted().forEach { p.println(it) } + + p.popIndent() + } + + return sb.toString() + } + + private fun kotlinCacheNames(dataRoot: File): List { + val cacheDir = File(dataRoot, getCacheDirectoryName()) + val fileNames = cacheDir.list() ?: arrayOf() + val cacheFiles = fileNames + .map { File(cacheDir, it) } + .filter { it.isFile && it.extension == IncrementalCacheImpl.CACHE_EXTENSION } + return cacheFiles.map { it.name } + } +} \ No newline at end of file diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java new file mode 100644 index 00000000000..19d5ce2d25d --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -0,0 +1,74 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyCachesTest { + public void testAllFilesPresentInLazyKotlinCaches() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("class") + public void testClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/"); + doTest(fileName); + } + + @TestMetadata("constant") + public void testConstant() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); + doTest(fileName); + } + + @TestMetadata("function") + public void testFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionDeclared") + public void testInlineFunctionDeclared() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionInlined") + public void testInlineFunctionInlined() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/"); + doTest(fileName); + } + + @TestMetadata("noKotlin") + public void testNoKotlin() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/"); + doTest(fileName); + } + +} diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt new file mode 100644 index 00000000000..3dbcdef91ed --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt @@ -0,0 +1 @@ +public class A diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new new file mode 100644 index 00000000000..3dbcdef91ed --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new @@ -0,0 +1 @@ +public class A diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log new file mode 100644 index 00000000000..8c01fa6b2e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt new file mode 100644 index 00000000000..dbf1d85159b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -0,0 +1,4 @@ +Module 'module' production + proto.tab + source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log new file mode 100644 index 00000000000..2a2e5870c31 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/constant/ConstantKt.class +out/production/module/constant/ConstantPackage.class +End of files +Compiling files: +src/constant.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt new file mode 100644 index 00000000000..5bb00251bf3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt @@ -0,0 +1,3 @@ +package constant + +val X = 10 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new new file mode 100644 index 00000000000..922484aea23 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new @@ -0,0 +1,3 @@ +package constant + +val X = 11 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt new file mode 100644 index 00000000000..924694c447e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt @@ -0,0 +1,8 @@ +Module 'module' production + format-version.txt + constants.tab + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module' tests + format-version.txt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/usage.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/usage.kt new file mode 100644 index 00000000000..4a70ee33065 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/usage.kt @@ -0,0 +1,4 @@ +package usage + +fun f(): Int = + constant.X \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log new file mode 100644 index 00000000000..2664e23862b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UtilsKt.class +out/production/module/_DefaultPackage.class +End of files +Compiling files: +src/utils.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt new file mode 100644 index 00000000000..fbf6d51c660 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt @@ -0,0 +1,5 @@ +Module 'module' production + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt new file mode 100644 index 00000000000..7417787603f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt @@ -0,0 +1 @@ +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new new file mode 100644 index 00000000000..7417787603f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new @@ -0,0 +1 @@ +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/build.log new file mode 100644 index 00000000000..003142b5452 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt new file mode 100644 index 00000000000..33a2850ca0a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt @@ -0,0 +1,6 @@ +Module 'module' production + inline-functions.tab + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt new file mode 100644 index 00000000000..406f6ee4388 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt @@ -0,0 +1,3 @@ +package inline + +inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt.new new file mode 100644 index 00000000000..406f6ee4388 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt.new @@ -0,0 +1,3 @@ +package inline + +inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/build.log new file mode 100644 index 00000000000..83bdd5a2da2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt new file mode 100644 index 00000000000..fd3128f4651 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt @@ -0,0 +1,7 @@ +Module 'module' production + inline-functions.tab + inlined-to.tab + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt new file mode 100644 index 00000000000..406f6ee4388 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt @@ -0,0 +1,3 @@ +package inline + +inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt.new new file mode 100644 index 00000000000..1b69393d6eb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f() { + println("changed") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/usage.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/usage.kt new file mode 100644 index 00000000000..4e9d8fe8eb2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/usage.kt @@ -0,0 +1,5 @@ +package usage + +inline fun use() { + inline.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java new file mode 100644 index 00000000000..61ff2abcc95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java @@ -0,0 +1,2 @@ +public class A { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new new file mode 100644 index 00000000000..61ff2abcc95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new @@ -0,0 +1,2 @@ +public class A { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log new file mode 100644 index 00000000000..b97f58152ee --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.java +End of files diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt new file mode 100644 index 00000000000..ce3849d63ef --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt @@ -0,0 +1,2 @@ +Module 'module' production +Module 'module' tests \ No newline at end of file From 20d6f019190aeac8a25b9afa9b2e2341f2cf60fe Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 23 Sep 2015 20:00:29 +0300 Subject: [PATCH 0516/1557] Write cache version only if incremental compilation is enabled Original commit: b6bbc4015beb351c5c38032b5e728c94a3bcaf1e --- .../jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt | 2 ++ .../kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt | 7 +++++++ .../lazyKotlinCaches/class/expected-kotlin-caches.txt | 2 ++ .../lazyKotlinCaches/function/expected-kotlin-caches.txt | 2 ++ .../inlineFunctionDeclared/expected-kotlin-caches.txt | 2 ++ .../inlineFunctionInlined/expected-kotlin-caches.txt | 2 ++ 6 files changed, 17 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt index 473dad5d1af..7e3fab51be1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.annotations.TestOnly +import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.load.java.JvmAbi import java.io.File @@ -37,6 +38,7 @@ class CacheFormatVersion(targetDataRoot: File) { private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) fun isIncompatible(): Boolean { + assert(IncrementalCompilation.ENABLED) { "Incremental compilation is not enabled" } if (!file.exists()) return false val versionNumber = file.readText().toInt() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 91e17db91ce..7cbe409cc37 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -17,8 +17,10 @@ package org.jetbrains.kotlin.jps.build import com.intellij.testFramework.UsefulTestCase +import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl import org.jetbrains.kotlin.jps.incremental.getCacheDirectoryName +import org.jetbrains.kotlin.jps.incremental.getKotlinCacheVersion import org.jetbrains.kotlin.utils.Printer import java.io.File @@ -41,6 +43,11 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps p.println(target) p.pushIndent() + val cacheVersion = paths.getKotlinCacheVersion(target) + if (cacheVersion.formatVersionFile.exists()) { + p.println(cacheVersion.formatVersionFile.name) + } + val dataRoot = paths.getTargetDataRoot(target) val cacheNames = kotlinCacheNames(dataRoot) cacheNames.sorted().forEach { p.println(it) } diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index dbf1d85159b..6fd1abe9f15 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -1,4 +1,6 @@ Module 'module' production + format-version.txt proto.tab source-to-classes.tab Module 'module' tests + format-version.txt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt index fbf6d51c660..bad440e5bfa 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt @@ -1,5 +1,7 @@ Module 'module' production + format-version.txt package-parts.tab proto.tab source-to-classes.tab Module 'module' tests + format-version.txt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt index 33a2850ca0a..7d660ea18f4 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt @@ -1,6 +1,8 @@ Module 'module' production + format-version.txt inline-functions.tab package-parts.tab proto.tab source-to-classes.tab Module 'module' tests + format-version.txt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt index fd3128f4651..b21bfa7b4ec 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt @@ -1,7 +1,9 @@ Module 'module' production + format-version.txt inline-functions.tab inlined-to.tab package-parts.tab proto.tab source-to-classes.tab Module 'module' tests + format-version.txt \ No newline at end of file From d591e31eee106e510ec640450cee57e5db5f4a4c Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Sep 2015 23:26:53 +0300 Subject: [PATCH 0517/1557] Enable disabling incremental compilation for tests Original commit: 68437175f650e2869ffbf092c342058265cf9573 --- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 12 ++++++------ .../build/KotlinBuilderModuleScriptGenerator.java | 2 +- .../kotlin/jps/incremental/CacheFormatVersion.kt | 2 +- .../kotlin/modules/KotlinModuleXmlBuilder.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1e4592e2e47..7586958262e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -134,7 +134,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val dataManager = projectDescriptor.dataManager - if (IncrementalCompilation.ENABLED && + if (IncrementalCompilation.isEnabled() && chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() } ) { LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) @@ -215,7 +215,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR copyJsLibraryFilesIfNeeded(chunk, project) } - if (!IncrementalCompilation.ENABLED) return OK + if (!IncrementalCompilation.isEnabled()) return OK val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } val marker = ChangesProcessor(context, chunk, allCompiledFiles, caches) @@ -293,8 +293,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return compileToJs(chunk, commonArguments, environment, null, messageCollector, project) } - if (IncrementalCompilation.ENABLED) { - for (target in chunk.getTargets()) { + if (IncrementalCompilation.isEnabled()) { + for (target in chunk.targets) { val cache = incrementalCaches[target]!! val removedAndDirtyFiles = filesToCompile[target] + dirtyFilesHolder.getRemovedFiles(target).map { File(it) } cache.markOutputClassesDirty(removedAndDirtyFiles) @@ -410,7 +410,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return sources } - if (!IncrementalCompilation.ENABLED) { + if (!IncrementalCompilation.isEnabled()) { return } @@ -449,7 +449,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): ChangesInfo { incrementalCaches.values().forEach { it.saveCacheFormatVersion() } - if (!IncrementalCompilation.ENABLED) { + if (!IncrementalCompilation.isEnabled()) { return ChangesInfo.NO_CHANGES } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index f650f7042bf..4b55b5d3572 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -72,7 +72,7 @@ public class KotlinBuilderModuleScriptGenerator { File outputDir = getOutputDirSafe(target); List moduleSources = new ArrayList( - IncrementalCompilation.ENABLED + IncrementalCompilation.isEnabled() ? sourceFiles.get(target) : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)); diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt index 7e3fab51be1..42233675171 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt @@ -38,7 +38,7 @@ class CacheFormatVersion(targetDataRoot: File) { private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) fun isIncompatible(): Boolean { - assert(IncrementalCompilation.ENABLED) { "Incremental compilation is not enabled" } + assert(IncrementalCompilation.isEnabled()) { "Incremental compilation is not enabled" } if (!file.exists()) return false val versionNumber = file.readText().toInt() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java index e9b2cda097e..1df8e11addd 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java @@ -83,7 +83,7 @@ public class KotlinModuleXmlBuilder { ) { p.println(""); for (File file : files) { - boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.ENABLED; + boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.isEnabled(); if (isOutput) { // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was From 5fae296bea2422c7d7c41818f67cdcaaeeb2de7d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Sep 2015 23:27:03 +0300 Subject: [PATCH 0518/1557] Test caches creation with turning incremental on/off Original commit: 2bed8d055755e52a7ae05b9cfa4a50813cf467f1 --- .../kotlin/jps/build/KotlinBuilder.kt | 4 +- .../jps/build/AbstractIncrementalJpsTest.kt | 10 ++--- .../AbstractIncrementalLazyCachesTest.kt | 41 +++++++++++++++++-- .../IncrementalCacheVersionChangedTest.kt | 2 +- .../IncrementalLazyCachesTestGenerated.java | 12 ++++++ .../IncrementalProjectPathCaseChangedTest.kt | 2 +- .../incrementalCompilationOff/build.log | 7 ++++ .../dependencies.txt | 2 + .../expected-kotlin-caches.txt | 4 ++ .../incrementalCompilationOff/module1_a.kt | 3 ++ .../module1_a.kt.new | 5 +++ .../module1_incremental_compilation_off.new | 0 .../module1_other.kt | 3 ++ .../incrementalCompilationOff/module2_B.java | 5 +++ .../incrementalCompilationOffOn/build.log | 35 ++++++++++++++++ .../dependencies.txt | 3 ++ .../expected-kotlin-caches.txt | 18 ++++++++ .../incrementalCompilationOffOn/module1_a.kt | 3 ++ .../module1_a.kt.new.1 | 5 +++ .../module1_a.kt.new.2 | 5 +++ ...dule1_incremental_compilation_off.delete.2 | 0 .../module1_incremental_compilation_off.new.1 | 0 .../module1_other.kt | 3 ++ .../module2_B.java | 5 +++ .../incrementalCompilationOffOn/module3_c.kt | 3 ++ 25 files changed, 167 insertions(+), 13 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 7586958262e..c7b0ddaf97f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -447,12 +447,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR incrementalCaches: Map, generatedFiles: List ): ChangesInfo { - incrementalCaches.values().forEach { it.saveCacheFormatVersion() } - if (!IncrementalCompilation.isEnabled()) { return ChangesInfo.NO_CHANGES } + incrementalCaches.values().forEach { it.saveCacheFormatVersion() } + var changesInfo = ChangesInfo.NO_CHANGES for (generatedFile in generatedFiles) { val ic = incrementalCaches[generatedFile.target]!! diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 8da3559fb11..2da6fb54ed7 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -345,13 +345,13 @@ public abstract class AbstractIncrementalJpsTest( val modifications = getModificationsToPerform(moduleNames) for (step in modifications) { step.forEach { it.perform(workDir) } - performAdditionalModifications() + performAdditionalModifications(step) results.add(make()) } return results } - protected open fun performAdditionalModifications() { + protected open fun performAdditionalModifications(modifications: List) { } // null means one module @@ -415,13 +415,13 @@ public abstract class AbstractIncrementalJpsTest( } } - private abstract class Modification(val path: String) { + protected abstract class Modification(val path: String) { abstract fun perform(workDir: File) override fun toString(): String = "${javaClass.simpleName} $path" } - private class ModifyContent(path: String, val dataFile: File) : Modification(path) { + protected class ModifyContent(path: String, val dataFile: File) : Modification(path) { override fun perform(workDir: File) { val file = File(workDir, path) @@ -437,7 +437,7 @@ public abstract class AbstractIncrementalJpsTest( } } - private class DeleteFile(path: String) : Modification(path) { + protected class DeleteFile(path: String) : Modification(path) { override fun perform(workDir: File) { val fileToDelete = File(workDir, path) if (!fileToDelete.delete()) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 7cbe409cc37..83bda764732 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -26,11 +26,44 @@ import java.io.File public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() { override fun doTest(testDataPath: String) { - super.doTest(testDataPath) + try { + super.doTest(testDataPath) - val actual = dumpKotlinCachesFileNames() - val expectedFile = File(testDataPath, "expected-kotlin-caches.txt") - UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual) + val actual = dumpKotlinCachesFileNames() + val expectedFile = File(testDataPath, "expected-kotlin-caches.txt") + UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual) + } + finally { + IncrementalCompilation.enableIncrementalCompilation() + } + } + + override fun performAdditionalModifications(modifications: List) { + super.performAdditionalModifications(modifications) + + var modified = 0 + + for (modification in modifications) { + if (!modification.path.endsWith("incremental_compilation_off")) continue + + when (modification) { + is AbstractIncrementalJpsTest.ModifyContent -> { + IncrementalCompilation.disableIncrementalCompilation() + } + is AbstractIncrementalJpsTest.DeleteFile -> { + IncrementalCompilation.enableIncrementalCompilation() + } + else -> { + throw IllegalStateException("Unknown modification type: ${modification.javaClass}") + } + } + + modified++ + } + + if (modified > 1) { + throw IllegalStateException("Incremental compilation was enabled/disable more than once") + } } private fun dumpKotlinCachesFileNames(): String { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt index 53b7dfe1cf6..82cc117936a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt @@ -32,7 +32,7 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(all doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/") } - override fun performAdditionalModifications() { + override fun performAdditionalModifications(modifications: List) { val targets = projectDescriptor.allModuleTargets val paths = projectDescriptor.dataManager.dataPaths diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 19d5ce2d25d..454ac655c04 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -53,6 +53,18 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC doTest(fileName); } + @TestMetadata("incrementalCompilationOff") + public void testIncrementalCompilationOff() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/"); + doTest(fileName); + } + + @TestMetadata("incrementalCompilationOffOn") + public void testIncrementalCompilationOffOn() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionDeclared") public void testInlineFunctionDeclared() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt index 13954948030..437c9e11ab8 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt @@ -36,7 +36,7 @@ public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest( super.doTest(testDataPath) } - override fun performAdditionalModifications() { + override fun performAdditionalModifications(modifications: List) { val module = myProject.getModules()[0] val sourceRoot = module.getSourceRoots()[0].getUrl() assert(sourceRoot.endsWith("/src")) diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log new file mode 100644 index 00000000000..ce877d3eba3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module1/module1/A.class +End of files +Compiling files: +module1/src/module1_a.kt +module1/src/module1_other.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt new file mode 100644 index 00000000000..ec937d3cdd9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt new file mode 100644 index 00000000000..469e8d85401 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt @@ -0,0 +1,4 @@ +Module 'module1' production +Module 'module1' tests +Module 'module2' production +Module 'module2' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt new file mode 100644 index 00000000000..92cc446cfe0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt @@ -0,0 +1,3 @@ +package module1 + +class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new new file mode 100644 index 00000000000..5bf5052e9e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new @@ -0,0 +1,5 @@ +package module1 + +class A + +inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt new file mode 100644 index 00000000000..fbf512b4fa3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt @@ -0,0 +1,3 @@ +package module1 + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java new file mode 100644 index 00000000000..0f61b4f1a9b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java @@ -0,0 +1,5 @@ +class B { + void f() { + new module1.A(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log new file mode 100644 index 00000000000..c151c910c93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log @@ -0,0 +1,35 @@ +Cleaning output files: +out/production/module1/module1/A.class +End of files +Compiling files: +module1/src/module1_a.kt +module1/src/module1_other.kt +End of files + + +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/A.class +out/production/module1/module1/Module1Package.class +out/production/module1/module1/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/A.class +out/production/module1/module1/Module1Package.class +out/production/module1/module1/Module1_aKt.class +out/production/module1/module1/Module1_otherKt.class +End of files +Compiling files: +module1/src/module1_a.kt +module1/src/module1_other.kt +End of files +Cleaning output files: +out/production/module2/B.class +End of files +Compiling files: +module2/src/module2_B.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt new file mode 100644 index 00000000000..42b512b6648 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3-> \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt new file mode 100644 index 00000000000..5e139cc0c51 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt @@ -0,0 +1,18 @@ +Module 'module1' production + format-version.txt + inline-functions.tab + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module1' tests + format-version.txt +Module 'module2' production + format-version.txt +Module 'module2' tests +Module 'module3' production + format-version.txt + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module3' tests + format-version.txt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt new file mode 100644 index 00000000000..92cc446cfe0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt @@ -0,0 +1,3 @@ +package module1 + +class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 new file mode 100644 index 00000000000..5bf5052e9e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 @@ -0,0 +1,5 @@ +package module1 + +class A + +inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 new file mode 100644 index 00000000000..5bf5052e9e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 @@ -0,0 +1,5 @@ +package module1 + +class A + +inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt new file mode 100644 index 00000000000..fbf512b4fa3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt @@ -0,0 +1,3 @@ +package module1 + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java new file mode 100644 index 00000000000..0f61b4f1a9b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java @@ -0,0 +1,5 @@ +class B { + void f() { + new module1.A(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt new file mode 100644 index 00000000000..c7cd3fc4b22 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt @@ -0,0 +1,3 @@ +package module3 + +fun c() {} \ No newline at end of file From aa029d211353346ee32a089de34d481e02ab569e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 23 Sep 2015 14:48:37 +0300 Subject: [PATCH 0519/1557] Clean all storages if incremental compilation is off Original commit: 7ef23da289e455cfa5250b64d099dac4841d8438 --- .../kotlin/jps/build/KotlinBuilder.kt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index c7b0ddaf97f..50e458a4355 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -134,13 +134,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val dataManager = projectDescriptor.dataManager - if (IncrementalCompilation.isEnabled() && - chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() } - ) { - LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) - val incrementalCaches = getIncrementalCaches(chunk, context) - incrementalCaches.values().forEach(StorageOwner::clean) - return CHUNK_REBUILD_REQUIRED + if (!IncrementalCompilation.isEnabled()) { + dataManager.clean() + dataManager.flush(true) + } + else { + if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) { + LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) + val incrementalCaches = getIncrementalCaches(chunk, context) + incrementalCaches.values().forEach(StorageOwner::clean) + return CHUNK_REBUILD_REQUIRED + } } if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles() From 5b4101ee0ddd061ae6a678f886e76cd01596ddbf Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 23 Sep 2015 16:20:48 +0300 Subject: [PATCH 0520/1557] Fix recompilation of dependent modules on cache/abi version change New cache version was written to dependent targets, when they have not been compiled yet #KT-9190 Fixed Original commit: c7f66a1585fb561f4fabafff4be2b2e2851bcc0c --- .../kotlin/jps/build/KotlinBuilder.kt | 17 ++++++---- .../IncrementalCacheVersionChangedTest.kt | 15 ++++++--- .../cacheVersionChangedModule1/build.log | 31 +++++++++++++++++++ .../dependencies.txt | 5 +++ .../module1_a.kt | 2 +- .../module1_a.kt.new | 6 ++++ .../cacheVersionChangedModule1/module2_b.kt | 8 +++++ .../cacheVersionChangedModule1/module3_c.kt | 7 +++++ .../cacheVersionChangedModule1/module4_d.kt | 3 ++ .../cacheVersionChangedModule1/module5_E.java | 3 ++ .../build.log | 10 +++--- .../dependencies.txt | 0 .../cacheVersionChangedModule2/module1_a.kt | 6 ++++ .../cacheVersionChangedModule2/module2_b.kt | 7 +++++ .../module2_b.kt.new | 7 +++++ .../module2_b.kt | 5 --- .../module2_b.kt.new | 5 --- .../class/expected-kotlin-caches.txt | 3 +- .../constant/expected-kotlin-caches.txt | 3 +- .../function/expected-kotlin-caches.txt | 3 +- .../incrementalCompilationOff/build.log | 3 ++ .../incrementalCompilationOffOn/build.log | 24 +++++--------- .../expected-kotlin-caches.txt | 5 +-- .../expected-kotlin-caches.txt | 3 +- .../expected-kotlin-caches.txt | 3 +- 25 files changed, 126 insertions(+), 58 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/dependencies.txt rename jps/jps-plugin/testData/incremental/custom/{cacheVersionChangedMultiModule => cacheVersionChangedModule1}/module1_a.kt (57%) create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module3_c.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module4_d.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module5_E.java rename jps/jps-plugin/testData/incremental/custom/{cacheVersionChangedMultiModule => cacheVersionChangedModule2}/build.log (54%) rename jps/jps-plugin/testData/incremental/custom/{cacheVersionChangedMultiModule => cacheVersionChangedModule2}/dependencies.txt (100%) create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt delete mode 100644 jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt.new diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 50e458a4355..a738daa1641 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -30,7 +30,10 @@ import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.jps.incremental.* -import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* +import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.ABORT +import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.ADDITIONAL_PASS_REQUIRED +import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.NOTHING_DONE +import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.OK import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage @@ -143,7 +146,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) val incrementalCaches = getIncrementalCaches(chunk, context) incrementalCaches.values().forEach(StorageOwner::clean) - return CHUNK_REBUILD_REQUIRED + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) + return ADDITIONAL_PASS_REQUIRED } } @@ -205,7 +209,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR isJsModule -> ChangesInfo.NO_CHANGES else -> { val generatedClasses = generatedFiles.filterIsInstance() - val info = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles) + val info = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles, chunk) updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) info } @@ -264,7 +268,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun recompileEverything() { allCompiledFiles.clear() - FSOperations.markDirtyRecursively(context, chunk) + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) } private fun recompileOtherAndDependents() { @@ -449,13 +453,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun updateKotlinIncrementalCache( compilationErrors: Boolean, incrementalCaches: Map, - generatedFiles: List + generatedFiles: List, + chunk: ModuleChunk ): ChangesInfo { if (!IncrementalCompilation.isEnabled()) { return ChangesInfo.NO_CHANGES } - incrementalCaches.values().forEach { it.saveCacheFormatVersion() } + chunk.targets.forEach { incrementalCaches[it]!!.saveCacheFormatVersion() } var changesInfo = ChangesInfo.NO_CHANGES for (generatedFile in generatedFiles) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt index 82cc117936a..560e85bedf7 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.kotlin.jps.incremental.getKotlinCacheVersion -import kotlin.test.assertTrue public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { fun testCacheVersionChanged() { @@ -28,8 +27,12 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(all doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/") } - fun testCacheVersionChangedMultiModule() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/") + fun testCacheVersionChangedMultiModule1() { + doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/") + } + + fun testCacheVersionChangedMultiModule2() { + doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/") } override fun performAdditionalModifications(modifications: List) { @@ -39,8 +42,10 @@ public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(all for (target in targets) { val cacheVersion = paths.getKotlinCacheVersion(target) val cacheVersionFile = cacheVersion.formatVersionFile - assertTrue(cacheVersionFile.exists(), "Cache version file does not exists: $cacheVersionFile") - cacheVersionFile.writeText("777") + + if (cacheVersionFile.exists()) { + cacheVersionFile.writeText("777") + } } } } diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/build.log new file mode 100644 index 00000000000..784f8dd8873 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/build.log @@ -0,0 +1,31 @@ +Cleaning output files: +out/production/module4/module4/D.class +End of files +Compiling files: +module4/src/module4_d.kt +End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/A.class +out/production/module1/module1/Module1Package.class +out/production/module1/module1/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/module2/Module2Package.class +out/production/module2/module2/Module2_bKt.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module +out/production/module3/module3/Module3Package.class +out/production/module3/module3/Module3_cKt.class +End of files +Compiling files: +module3/src/module3_c.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/dependencies.txt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/dependencies.txt new file mode 100644 index 00000000000..b7b899af80f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/dependencies.txt @@ -0,0 +1,5 @@ +module1-> +module2->module1 +module3->module2 +module4-> +module5-> \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module1_a.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt similarity index 57% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module1_a.kt rename to jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt index a3470c00a84..ae1b119fb6d 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module1_a.kt +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt @@ -1,4 +1,4 @@ -package a +package module1 class A diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt.new b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt.new new file mode 100644 index 00000000000..ae1b119fb6d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt.new @@ -0,0 +1,6 @@ +package module1 + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module2_b.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module2_b.kt new file mode 100644 index 00000000000..413a8224329 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module2_b.kt @@ -0,0 +1,8 @@ +package module2 + +import module1.* + +fun b() { + A() + a() +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module3_c.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module3_c.kt new file mode 100644 index 00000000000..3dfe95ad694 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module3_c.kt @@ -0,0 +1,7 @@ +package module3 + +import module2.* + +fun c() { + b() +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module4_d.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module4_d.kt new file mode 100644 index 00000000000..b0747db7a0f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module4_d.kt @@ -0,0 +1,3 @@ +package module4 + +class D \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module5_E.java b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module5_E.java new file mode 100644 index 00000000000..3f5b139b15a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module5_E.java @@ -0,0 +1,3 @@ +package module5; + +class E {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/build.log similarity index 54% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log rename to jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/build.log index e41875375b3..8c069b7fa2d 100644 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/build.log +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/build.log @@ -1,16 +1,16 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/APackage.class -out/production/module1/a/Module1_aKt.class +out/production/module1/module1/A.class +out/production/module1/module1/Module1Package.class +out/production/module1/module1/Module1_aKt.class End of files Compiling files: module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class -out/production/module2/b/Module2_bKt.class +out/production/module2/module2/Module2Package.class +out/production/module2/module2/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/dependencies.txt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/dependencies.txt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/dependencies.txt rename to jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/dependencies.txt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module1_a.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module1_a.kt new file mode 100644 index 00000000000..ae1b119fb6d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module1_a.kt @@ -0,0 +1,6 @@ +package module1 + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt new file mode 100644 index 00000000000..b7e97d330f4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt @@ -0,0 +1,7 @@ +package module2 + +import module1.* + +fun b(param: A) { + a() +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt.new b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt.new new file mode 100644 index 00000000000..b7e97d330f4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt.new @@ -0,0 +1,7 @@ +package module2 + +import module1.* + +fun b(param: A) { + a() +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt deleted file mode 100644 index 5c19b61add7..00000000000 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt +++ /dev/null @@ -1,5 +0,0 @@ -package b - -fun b(param: a.A) { - a.a() -} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt.new b/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt.new deleted file mode 100644 index 5c19b61add7..00000000000 --- a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedMultiModule/module2_b.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package b - -fun b(param: a.A) { - a.a() -} diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index 6fd1abe9f15..381f7cb3157 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -2,5 +2,4 @@ Module 'module' production format-version.txt proto.tab source-to-classes.tab -Module 'module' tests - format-version.txt \ No newline at end of file +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt index 924694c447e..39231475721 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt @@ -4,5 +4,4 @@ Module 'module' production package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests - format-version.txt \ No newline at end of file +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt index bad440e5bfa..89837f47189 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt @@ -3,5 +3,4 @@ Module 'module' production package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests - format-version.txt \ No newline at end of file +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log index ce877d3eba3..d5edf8c4424 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log @@ -4,4 +4,7 @@ End of files Compiling files: module1/src/module1_a.kt module1/src/module1_other.kt +End of files +Compiling files: +module2/src/module2_B.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log index c151c910c93..74d77ecd7d8 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log @@ -5,30 +5,20 @@ Compiling files: module1/src/module1_a.kt module1/src/module1_other.kt End of files - - -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_aKt.class +Compiling files: +module3/src/module3_c.kt End of files Compiling files: -module1/src/module1_a.kt -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_aKt.class -out/production/module1/module1/Module1_otherKt.class +module2/src/module2_B.java End of files + + Compiling files: module1/src/module1_a.kt module1/src/module1_other.kt End of files -Cleaning output files: -out/production/module2/B.class +Compiling files: +module3/src/module3_c.kt End of files Compiling files: module2/src/module2_B.java diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt index 5e139cc0c51..a6be44610e6 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt @@ -5,14 +5,11 @@ Module 'module1' production proto.tab source-to-classes.tab Module 'module1' tests - format-version.txt Module 'module2' production - format-version.txt Module 'module2' tests Module 'module3' production format-version.txt package-parts.tab proto.tab source-to-classes.tab -Module 'module3' tests - format-version.txt \ No newline at end of file +Module 'module3' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt index 7d660ea18f4..1700c33173a 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt @@ -4,5 +4,4 @@ Module 'module' production package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests - format-version.txt \ No newline at end of file +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt index b21bfa7b4ec..b84a9a7acd0 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt @@ -5,5 +5,4 @@ Module 'module' production package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests - format-version.txt \ No newline at end of file +Module 'module' tests \ No newline at end of file From 4e7cc0b63763448780d7d34a6ce24f22093825a9 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Sep 2015 15:24:23 +0300 Subject: [PATCH 0521/1557] Minor: rename test cases Original commit: 1298d115bde3954687d89ac758a6191eee755081 --- .../build/IncrementalLazyCachesTestGenerated.java | 12 ++++++------ .../build.log | 0 .../expected-kotlin-caches.txt | 0 .../inline.kt | 0 .../inline.kt.new | 0 .../usage.kt | 0 .../build.log | 0 .../expected-kotlin-caches.txt | 0 .../inline.kt | 0 .../inline.kt.new | 0 10 files changed, 6 insertions(+), 6 deletions(-) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionInlined => inlineFunctionWithUsage}/build.log (100%) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionInlined => inlineFunctionWithUsage}/expected-kotlin-caches.txt (100%) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionDeclared => inlineFunctionWithUsage}/inline.kt (100%) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionInlined => inlineFunctionWithUsage}/inline.kt.new (100%) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionInlined => inlineFunctionWithUsage}/usage.kt (100%) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionDeclared => inlineFunctionWithoutUsage}/build.log (100%) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionDeclared => inlineFunctionWithoutUsage}/expected-kotlin-caches.txt (100%) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionInlined => inlineFunctionWithoutUsage}/inline.kt (100%) rename jps/jps-plugin/testData/incremental/lazyKotlinCaches/{inlineFunctionDeclared => inlineFunctionWithoutUsage}/inline.kt.new (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 454ac655c04..de1baab420c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -65,15 +65,15 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC doTest(fileName); } - @TestMetadata("inlineFunctionDeclared") - public void testInlineFunctionDeclared() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/"); + @TestMetadata("inlineFunctionWithUsage") + public void testInlineFunctionWithUsage() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); doTest(fileName); } - @TestMetadata("inlineFunctionInlined") - public void testInlineFunctionInlined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/"); + @TestMetadata("inlineFunctionWithoutUsage") + public void testInlineFunctionWithoutUsage() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/"); doTest(fileName); } diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/build.log rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/expected-kotlin-caches.txt rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt.new rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/inline.kt.new diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/usage.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/usage.kt rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/usage.kt diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/build.log rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/expected-kotlin-caches.txt rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionInlined/inline.kt rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionDeclared/inline.kt.new rename to jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new From 8e27d32a7bfc67d07913afc240ccf07b1f4259ed Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 25 Sep 2015 18:57:26 +0300 Subject: [PATCH 0522/1557] Clean only kotlin caches when incremental compilation is off Original commit: ba330201401363edd234e70d769fa72dd6aa1c81 --- .../kotlin/jps/build/KotlinBuilder.kt | 18 ++++------ .../jps/incremental/CacheFormatVersion.kt | 3 +- .../incrementalCompilationOff/build.log | 16 +++++++++ .../dependencies.txt | 3 +- .../incrementalCompilationOff/module3_c.kt | 3 ++ .../incrementalCompilationOffOn/build.log | 33 +++++++++++++++++-- 6 files changed, 60 insertions(+), 16 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a738daa1641..cede5205b5c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -137,18 +137,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val dataManager = projectDescriptor.dataManager - if (!IncrementalCompilation.isEnabled()) { - dataManager.clean() - dataManager.flush(true) - } - else { - if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) { - LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) - val incrementalCaches = getIncrementalCaches(chunk, context) - incrementalCaches.values().forEach(StorageOwner::clean) - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) - return ADDITIONAL_PASS_REQUIRED - } + if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) { + LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) + val incrementalCaches = getIncrementalCaches(chunk, context) + incrementalCaches.values().forEach(StorageOwner::clean) + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) + return ADDITIONAL_PASS_REQUIRED } if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt index 42233675171..7f2a402cc25 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt @@ -38,9 +38,10 @@ class CacheFormatVersion(targetDataRoot: File) { private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) fun isIncompatible(): Boolean { - assert(IncrementalCompilation.isEnabled()) { "Incremental compilation is not enabled" } if (!file.exists()) return false + if (!IncrementalCompilation.isEnabled()) return true + val versionNumber = file.readText().toInt() if (versionNumber != CACHE_FORMAT_VERSION) { diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log index d5edf8c4424..7cf680292e1 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log @@ -1,10 +1,26 @@ Cleaning output files: out/production/module1/module1/A.class End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/Module1Package.class +out/production/module1/module1/Module1_otherKt.class +End of files Compiling files: module1/src/module1_a.kt module1/src/module1_other.kt End of files +Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module +out/production/module3/module3/Module3Package.class +out/production/module3/module3/Module3_cKt.class +End of files +Compiling files: +module3/src/module3_c.kt +End of files +Cleaning output files: +out/production/module2/B.class +End of files Compiling files: module2/src/module2_B.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt index ec937d3cdd9..42b512b6648 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt @@ -1,2 +1,3 @@ module1-> -module2->module1 \ No newline at end of file +module2->module1 +module3-> \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt new file mode 100644 index 00000000000..c7cd3fc4b22 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt @@ -0,0 +1,3 @@ +package module3 + +fun c() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log index 74d77ecd7d8..d3894733f30 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log @@ -1,24 +1,53 @@ Cleaning output files: out/production/module1/module1/A.class End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/Module1Package.class +out/production/module1/module1/Module1_otherKt.class +End of files Compiling files: module1/src/module1_a.kt module1/src/module1_other.kt End of files +Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module +out/production/module3/module3/Module3Package.class +out/production/module3/module3/Module3_cKt.class +End of files Compiling files: module3/src/module3_c.kt End of files +Cleaning output files: +out/production/module2/B.class +End of files Compiling files: module2/src/module2_B.java End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/A.class +out/production/module1/module1/Module1Package.class +out/production/module1/module1/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/A.class +out/production/module1/module1/Module1Package.class +out/production/module1/module1/Module1_aKt.class +out/production/module1/module1/Module1_otherKt.class +End of files Compiling files: module1/src/module1_a.kt module1/src/module1_other.kt End of files -Compiling files: -module3/src/module3_c.kt +Cleaning output files: +out/production/module2/B.class End of files Compiling files: module2/src/module2_B.java From 81d59de601fc698ccd5abb5111f7be9608ba1140 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Sep 2015 15:45:21 +0300 Subject: [PATCH 0523/1557] Update cache version Original commit: 1002d233cbbb1efda3f40c9fa97051548461f065 --- .../org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt index 7f2a402cc25..ab82093d5cb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt @@ -25,7 +25,7 @@ import java.io.File class CacheFormatVersion(targetDataRoot: File) { companion object { // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 5 + private val INCREMENTAL_CACHE_OWN_VERSION = 6 private val CACHE_FORMAT_VERSION = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + From ae9c86ddd13fe29b925a875a5979ea02dcef3264 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 25 Sep 2015 19:50:10 +0300 Subject: [PATCH 0524/1557] Remove tests on turning incremental on/off temporary Original commit: 743c59331dc0cfe1b894bbae5970cd37519dbd32 --- .../IncrementalLazyCachesTestGenerated.java | 12 ----- .../incrementalCompilationOff/build.log | 26 --------- .../dependencies.txt | 3 -- .../expected-kotlin-caches.txt | 4 -- .../incrementalCompilationOff/module1_a.kt | 3 -- .../module1_a.kt.new | 5 -- .../module1_incremental_compilation_off.new | 0 .../module1_other.kt | 3 -- .../incrementalCompilationOff/module2_B.java | 5 -- .../incrementalCompilationOff/module3_c.kt | 3 -- .../incrementalCompilationOffOn/build.log | 54 ------------------- .../dependencies.txt | 3 -- .../expected-kotlin-caches.txt | 15 ------ .../incrementalCompilationOffOn/module1_a.kt | 3 -- .../module1_a.kt.new.1 | 5 -- .../module1_a.kt.new.2 | 5 -- ...dule1_incremental_compilation_off.delete.2 | 0 .../module1_incremental_compilation_off.new.1 | 0 .../module1_other.kt | 3 -- .../module2_B.java | 5 -- .../incrementalCompilationOffOn/module3_c.kt | 3 -- 21 files changed, 160 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index de1baab420c..2460cccbdca 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -53,18 +53,6 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC doTest(fileName); } - @TestMetadata("incrementalCompilationOff") - public void testIncrementalCompilationOff() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/"); - doTest(fileName); - } - - @TestMetadata("incrementalCompilationOffOn") - public void testIncrementalCompilationOffOn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/"); - doTest(fileName); - } - @TestMetadata("inlineFunctionWithUsage") public void testInlineFunctionWithUsage() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log deleted file mode 100644 index 7cf680292e1..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/build.log +++ /dev/null @@ -1,26 +0,0 @@ -Cleaning output files: -out/production/module1/module1/A.class -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_a.kt -module1/src/module1_other.kt -End of files -Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3Package.class -out/production/module3/module3/Module3_cKt.class -End of files -Compiling files: -module3/src/module3_c.kt -End of files -Cleaning output files: -out/production/module2/B.class -End of files -Compiling files: -module2/src/module2_B.java -End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt deleted file mode 100644 index 42b512b6648..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/dependencies.txt +++ /dev/null @@ -1,3 +0,0 @@ -module1-> -module2->module1 -module3-> \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt deleted file mode 100644 index 469e8d85401..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/expected-kotlin-caches.txt +++ /dev/null @@ -1,4 +0,0 @@ -Module 'module1' production -Module 'module1' tests -Module 'module2' production -Module 'module2' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt deleted file mode 100644 index 92cc446cfe0..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module1 - -class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new deleted file mode 100644 index 5bf5052e9e9..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_a.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package module1 - -class A - -inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_incremental_compilation_off.new deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt deleted file mode 100644 index fbf512b4fa3..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module1_other.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module1 - -fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java deleted file mode 100644 index 0f61b4f1a9b..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module2_B.java +++ /dev/null @@ -1,5 +0,0 @@ -class B { - void f() { - new module1.A(); - } -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt deleted file mode 100644 index c7cd3fc4b22..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOff/module3_c.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module3 - -fun c() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log deleted file mode 100644 index d3894733f30..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/build.log +++ /dev/null @@ -1,54 +0,0 @@ -Cleaning output files: -out/production/module1/module1/A.class -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_a.kt -module1/src/module1_other.kt -End of files -Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3Package.class -out/production/module3/module3/Module3_cKt.class -End of files -Compiling files: -module3/src/module3_c.kt -End of files -Cleaning output files: -out/production/module2/B.class -End of files -Compiling files: -module2/src/module2_B.java -End of files - - -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_aKt.class -End of files -Compiling files: -module1/src/module1_a.kt -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1Package.class -out/production/module1/module1/Module1_aKt.class -out/production/module1/module1/Module1_otherKt.class -End of files -Compiling files: -module1/src/module1_a.kt -module1/src/module1_other.kt -End of files -Cleaning output files: -out/production/module2/B.class -End of files -Compiling files: -module2/src/module2_B.java -End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt deleted file mode 100644 index 42b512b6648..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/dependencies.txt +++ /dev/null @@ -1,3 +0,0 @@ -module1-> -module2->module1 -module3-> \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt deleted file mode 100644 index a6be44610e6..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/expected-kotlin-caches.txt +++ /dev/null @@ -1,15 +0,0 @@ -Module 'module1' production - format-version.txt - inline-functions.tab - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module1' tests -Module 'module2' production -Module 'module2' tests -Module 'module3' production - format-version.txt - package-parts.tab - proto.tab - source-to-classes.tab -Module 'module3' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt deleted file mode 100644 index 92cc446cfe0..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module1 - -class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 deleted file mode 100644 index 5bf5052e9e9..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.1 +++ /dev/null @@ -1,5 +0,0 @@ -package module1 - -class A - -inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 deleted file mode 100644 index 5bf5052e9e9..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_a.kt.new.2 +++ /dev/null @@ -1,5 +0,0 @@ -package module1 - -class A - -inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.delete.2 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_incremental_compilation_off.new.1 deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt deleted file mode 100644 index fbf512b4fa3..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module1_other.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module1 - -fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java deleted file mode 100644 index 0f61b4f1a9b..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module2_B.java +++ /dev/null @@ -1,5 +0,0 @@ -class B { - void f() { - new module1.A(); - } -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt deleted file mode 100644 index c7cd3fc4b22..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/incrementalCompilationOffOn/module3_c.kt +++ /dev/null @@ -1,3 +0,0 @@ -package module3 - -fun c() {} \ No newline at end of file From 8c8a3e549c03983a9d8896942d7d950aa9580725 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 28 Aug 2015 10:47:25 +0300 Subject: [PATCH 0525/1557] remove incremental test: accessPrivateMembers Original commit: 2f9151ec18d3412a1f93417d0431efcdddb3e931 --- .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ------ .../incremental/pureKotlin/accessPrivateMembers/bar.kt | 7 ------- .../pureKotlin/accessPrivateMembers/bar.kt.new | 7 ------- .../pureKotlin/accessPrivateMembers/build.log | 8 -------- .../incremental/pureKotlin/accessPrivateMembers/foo.kt | 9 --------- 5 files changed, 37 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index c728a2802e2..512804ffb8b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -109,12 +109,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJpsTest { - @TestMetadata("accessPrivateMembers") - public void testAccessPrivateMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/"); - doTest(fileName); - } - @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt deleted file mode 100644 index 8c016666552..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt +++ /dev/null @@ -1,7 +0,0 @@ -package test - -fun main(args: Array) { - val x: Foo = Foo() - foo() - c -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new deleted file mode 100644 index 8c016666552..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/bar.kt.new +++ /dev/null @@ -1,7 +0,0 @@ -package test - -fun main(args: Array) { - val x: Foo = Foo() - foo() - c -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log deleted file mode 100644 index 33259938e4a..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/build.log +++ /dev/null @@ -1,8 +0,0 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BarKt.class -out/production/module/test/TestPackage.class -End of files -Compiling files: -src/bar.kt -End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt deleted file mode 100644 index 5f83a146f9d..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessPrivateMembers/foo.kt +++ /dev/null @@ -1,9 +0,0 @@ -package test - -private class Foo - -private fun foo() { - -} - -private val c = 1 \ No newline at end of file From 4755cab74047608f0df917d7bbe14798fbf355be Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Sun, 27 Sep 2015 00:17:19 +0300 Subject: [PATCH 0526/1557] fix check for internal from another module in imports and file level annotations Original commit: 0035bbba7c28cb0de2e0d159f659291b05c9c79b --- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 4 +++- .../testData/general/InternalFromAnotherModule/errors.txt | 7 ++++--- .../InternalFromAnotherModule/module2/src/module2.kt | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index e43df4eb49e..0bcb5bc3135 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -36,6 +36,7 @@ import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.incremental.BuilderRegistry import org.jetbrains.jps.incremental.IncProjectBuilder import org.jetbrains.jps.incremental.messages.BuildMessage +import org.jetbrains.jps.incremental.messages.CompilerMessage import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule @@ -480,7 +481,8 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.assertFailed() val actualErrors = result.getMessages(BuildMessage.Kind.ERROR) - .map { it.messageText }.sorted().joinToString("\n") + .map { it as CompilerMessage } + .map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n") val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) val expectedFile = File(projectRoot, "errors.txt") JetTestUtils.assertEqualsToFile(expectedFile, actualErrors) diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index b1533fc68e8..13cd0c3cbf1 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,3 +1,4 @@ -'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it -Cannot access 'InternalClass1': it is 'internal' in 'test' -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' \ No newline at end of file +'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 11, column 14 +Cannot access 'InternalClass1': it is 'internal' in 'test' at line 3, column 13 +Cannot access 'InternalClass1': it is 'internal' in 'test' at line 6, column 36 +Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 24, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt index e4e4077a9f4..64f4bb6cf1f 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt @@ -1,5 +1,7 @@ package test +import test.InternalClass1 + // InternalClass1, ClassA1, ClassB1 are in module1 class ClassInheritedFromInternal1: InternalClass1() From 7de15ca7d1d49a4930fa9127339b9b37d326e8b3 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 28 Sep 2015 17:35:34 +0300 Subject: [PATCH 0527/1557] Minor. Fix testdata. Original commit: 5a61871d4b33bcacfde9c69c91d1a56768db398c --- .../lookupTracker/conventions/comparison.kt | 8 ++++---- .../lookupTracker/conventions/mathematicalLike.kt | 12 ++++++------ .../incremental/lookupTracker/conventions/other.kt | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index 45124e49c44..215f51de39e 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -6,10 +6,10 @@ package foo.bar na /*c:foo.bar.A(equals)*/== a na /*c:foo.bar.A(equals)*/== null - a /*c:foo.bar.A(compareTo)*/> b - a /*c:foo.bar.A(compareTo)*/< b - a /*c:foo.bar.A(compareTo)*/>= b - a /*c:foo.bar.A(compareTo)*/<= b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= b a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> c a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< c diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 9b9561693ae..2317cc69b42 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -3,22 +3,22 @@ package foo.bar /*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) { var d = a - d/*c:foo.bar.A(inc)*/++ - /*c:foo.bar.A(inc)*/++d + d/*c:foo.bar.A(inc) p:foo.bar(inc)*/++ + /*c:foo.bar.A(inc) p:foo.bar(inc)*/++d d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- /*c:foo.bar.A(dec) p:foo.bar(dec)*/--d - a /*c:foo.bar.A(plus)*/+ b + a /*c:foo.bar.A(plus) p:foo.bar(plus)*/+ b a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- b /*c:foo.bar.A(not) p:foo.bar(not)*/!a // for val - a /*c:foo.bar.A(timesAssign)*/*= b + a /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign)*/*= b a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= b // for var - d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) c:foo.bar.A(plus)*/+= b + d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) c:foo.bar.A(plus) p:foo.bar(plus)*/+= b d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= b - d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times)*/*= b + d /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) c:foo.bar.A(times) p:foo.bar(times)*/*= b d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div)*//= b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index f5fcc5c1b4a..1765cb22d1f 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] + /*c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(get)*/a[2] - b /*c:foo.bar.A(contains)*/in a + b /*c:foo.bar.A(contains) p:foo.bar(contains)*/in a "s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in a - /*c:foo.bar.A(invoke)*/a() + /*c:foo.bar.A(invoke) p:foo.bar(invoke)*/a() /*c:foo.bar.A(invoke) p:foo.bar(invoke)*/a(1) - val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = a; + val (/*c:foo.bar.A(component1) p:foo.bar(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = a; - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1) p:foo.bar(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1) p:foo.bar(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); } From 99bf0fd03f7826f2d06ab5b1d0e7250c94121950 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 16 Sep 2015 16:21:43 +0300 Subject: [PATCH 0528/1557] Delete deprecated Type.Constructor message, advance ABI version Original commit: e749bc262d55d55a827275776a0ccf427bb07d2b --- .../jps/incremental/ProtoCompareGenerated.kt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 5de59380920..cfe371184a4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -232,14 +232,14 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.flexibleUpperBound, new.flexibleUpperBound)) return false } - if (old.hasConstructorClassName() != new.hasConstructorClassName()) return false - if (old.hasConstructorClassName()) { - if (!checkClassIdEquals(old.constructorClassName, new.constructorClassName)) return false + if (old.hasClassName() != new.hasClassName()) return false + if (old.hasClassName()) { + if (!checkClassIdEquals(old.className, new.className)) return false } - if (old.hasConstructorTypeParameter() != new.hasConstructorTypeParameter()) return false - if (old.hasConstructorTypeParameter()) { - if (old.constructorTypeParameter != new.constructorTypeParameter) return false + if (old.hasTypeParameter() != new.hasTypeParameter()) return false + if (old.hasTypeParameter()) { + if (old.typeParameter != new.typeParameter) return false } if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false @@ -746,12 +746,12 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I hashCode = 31 * hashCode + flexibleUpperBound.hashCode(stringIndexes, fqNameIndexes) } - if (hasConstructorClassName()) { - hashCode = 31 * hashCode + fqNameIndexes(constructorClassName) + if (hasClassName()) { + hashCode = 31 * hashCode + fqNameIndexes(className) } - if (hasConstructorTypeParameter()) { - hashCode = 31 * hashCode + constructorTypeParameter + if (hasTypeParameter()) { + hashCode = 31 * hashCode + typeParameter } for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { From 7e24eb8d9158887c55dfa634e7aa3e4c86016657 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 19 Sep 2015 03:16:02 +0300 Subject: [PATCH 0529/1557] Simplify storage of JVM signatures in binary metadata Store the whole method & field descriptor strings. Moving these strings to separate annotation arguments later will allow to reuse them with the ones in the constant pool, presumably allowing to save lots of space (up to 10%) Original commit: 7d5bd3cf50e9dcf3287fea5df82041d358248023 --- .../jps/incremental/ProtoCompareGenerated.kt | 61 ++----------------- 1 file changed, 4 insertions(+), 57 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index cfe371184a4..e067cae4397 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -299,9 +299,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi open fun checkEquals(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { if (!checkStringEquals(old.name, new.name)) return false - if (!checkEquals(old.returnType, new.returnType)) return false - - if (!checkEqualsJvmMethodSignatureParameterType(old, new)) return false + if (!checkStringEquals(old.desc, new.desc)) return false return true } @@ -352,29 +350,10 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - open fun checkEquals(old: JvmProtoBuf.JvmType, new: JvmProtoBuf.JvmType): Boolean { - if (old.hasPrimitiveType() != new.hasPrimitiveType()) return false - if (old.hasPrimitiveType()) { - if (old.primitiveType != new.primitiveType) return false - } - - if (old.hasClassFqName() != new.hasClassFqName()) return false - if (old.hasClassFqName()) { - if (!checkClassIdEquals(old.classFqName, new.classFqName)) return false - } - - if (old.hasArrayDimension() != new.hasArrayDimension()) return false - if (old.hasArrayDimension()) { - if (old.arrayDimension != new.arrayDimension) return false - } - - return true - } - open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { if (!checkStringEquals(old.name, new.name)) return false - if (!checkEquals(old.type, new.type)) return false + if (!checkStringEquals(old.desc, new.desc)) return false if (old.hasIsStaticInOuter() != new.hasIsStaticInOuter()) return false if (old.hasIsStaticInOuter()) { @@ -550,16 +529,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - open fun checkEqualsJvmMethodSignatureParameterType(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { - if (old.parameterTypeCount != new.parameterTypeCount) return false - - for(i in 0..old.parameterTypeCount - 1) { - if (!checkEquals(old.getParameterType(i), new.getParameterType(i))) return false - } - - return true - } - open fun checkEqualsAnnotationArgumentValueArrayElement(old: ProtoBuf.Annotation.Argument.Value, new: ProtoBuf.Annotation.Argument.Value): Boolean { if (old.arrayElementCount != new.arrayElementCount) return false @@ -814,11 +783,7 @@ public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, hashCode = 31 * hashCode + stringIndexes(name) - hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) - - for(i in 0..parameterTypeCount - 1) { - hashCode = 31 * hashCode + getParameterType(i).hashCode(stringIndexes, fqNameIndexes) - } + hashCode = 31 * hashCode + stringIndexes(desc) return hashCode } @@ -869,30 +834,12 @@ public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fq return hashCode } -public fun JvmProtoBuf.JvmType.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasPrimitiveType()) { - hashCode = 31 * hashCode + primitiveType.hashCode() - } - - if (hasClassFqName()) { - hashCode = 31 * hashCode + fqNameIndexes(classFqName) - } - - if (hasArrayDimension()) { - hashCode = 31 * hashCode + arrayDimension - } - - return hashCode -} - public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 hashCode = 31 * hashCode + stringIndexes(name) - hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) + hashCode = 31 * hashCode + stringIndexes(desc) if (hasIsStaticInOuter()) { hashCode = 31 * hashCode + isStaticInOuter.hashCode() From 1e2cb13c0728daaf940920b6aa615aeab21ec9f8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 19 Sep 2015 15:59:45 +0300 Subject: [PATCH 0530/1557] Remove NameResolver#getFqName, replace with getClassId Original commit: 89fe54c95199424faad6b0777d10c5a05fe3b622 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index e067cae4397..07f99c5ca12 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf @@ -33,10 +32,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi public val oldClassIdIndexesMap: MutableMap = hashMapOf() public val newClassIdIndexesMap: MutableMap = hashMapOf() - private val fqNames = Interner() private val classIds = Interner() - open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { if (!checkEqualsPackageMember(old, new)) return false @@ -556,7 +553,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi public fun getIndexOfClassId(index: Int, map: MutableMap, nameResolver: NameResolver): Int { map[index]?.let { return it } - val result = fqNames.intern(nameResolver.getFqName(index)) + val result = classIds.intern(nameResolver.getClassId(index)) map[index] = result return result } From 46f1add2f3b7c6931a7e6f4c137f99da4a98d3c4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 21 Sep 2015 18:22:14 +0300 Subject: [PATCH 0531/1557] Introduce infrastructure to separate string table from metadata on JVM Nothing especially helpful happens here, this is only a big refactoring introducing a separate string array for the string table, which is currently always empty, but will contain actual strings soon Original commit: 6a8d0fbd75715bfb7c0706961ce752ba80983db1 --- .../jps/incremental/IncrementalCacheImpl.kt | 41 ++++++++++++------- .../jps/incremental/protoDifferenceUtils.kt | 10 ++--- .../AbstractProtoComparisonTest.kt | 11 +++-- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 8bfa18534b3..b9f97d84ddc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -41,6 +41,7 @@ import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache +import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName import org.jetbrains.kotlin.serialization.jvm.BitEncoding @@ -167,7 +168,7 @@ public class IncrementalCacheImpl( public fun saveModuleMappingToCache(sourceFiles: Collection, file: File): ChangesInfo { val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME) - protoMap.process(jvmClassName, file.readBytes(), isPackage = false, checkChangesIsOpenPart = false) + protoMap.process(jvmClassName, file.readBytes(), emptyArray(), isPackage = false, checkChangesIsOpenPart = false) dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME) sourceFiles.forEach { sourceToClassesMap.add(it, jvmClassName) } return ChangesInfo.NO_CHANGES @@ -249,8 +250,10 @@ public class IncrementalCacheImpl( return obsoletePackageParts } - override fun getPackagePartData(fqName: String): ByteArray? { - return protoMap[JvmClassName.byInternalName(fqName)]?.bytes + override fun getPackagePartData(fqName: String): JvmPackagePartProto? { + return protoMap[JvmClassName.byInternalName(fqName)]?.let { value -> + JvmPackagePartProto(value.bytes, value.strings) + } } override fun getModuleMappingData(): ByteArray? { @@ -275,19 +278,24 @@ public class IncrementalCacheImpl( public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): ChangesInfo { val header = kotlinClass.classHeader val bytes = BitEncoding.decodeBytes(header.annotationData!!) - return put(kotlinClass.className, bytes, isPackage, checkChangesIsOpenPart) + return put(kotlinClass.className, bytes, header.strings!!, isPackage, checkChangesIsOpenPart) } - public fun process(className: JvmClassName, data: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { - return put(className, data, isPackage, checkChangesIsOpenPart) + public fun process(className: JvmClassName, data: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { + return put(className, data, strings, isPackage, checkChangesIsOpenPart) } - private fun put(className: JvmClassName, bytes: ByteArray, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { + private fun put( + className: JvmClassName, bytes: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean + ): ChangesInfo { val key = className.internalName val oldData = storage[key] - val data = ProtoMapValue(isPackage, bytes) + val data = ProtoMapValue(isPackage, bytes, strings) - if (oldData == null || !Arrays.equals(bytes, oldData.bytes) || isPackage != oldData.isPackageFacade) { + if (oldData == null || + !Arrays.equals(bytes, oldData.bytes) || + !Arrays.equals(strings, oldData.strings) || + isPackage != oldData.isPackageFacade) { storage[key] = data } @@ -757,14 +765,19 @@ private object ProtoMapValueExternalizer : DataExternalizer { out.writeBoolean(value.isPackageFacade) out.writeInt(value.bytes.size()) out.write(value.bytes) + out.writeInt(value.strings.size()) + for (string in value.strings) { + out.writeUTF(string) + } } override fun read(`in`: DataInput): ProtoMapValue { val isPackageFacade = `in`.readBoolean() - val length = `in`.readInt() - val buf = ByteArray(length) - `in`.readFully(buf) - return ProtoMapValue(isPackageFacade, buf) + val bytesLength = `in`.readInt() + val bytes = ByteArray(bytesLength) + `in`.readFully(bytes, 0, bytesLength) + val stringsLength = `in`.readInt() + val strings = Array(stringsLength) { `in`.readUTF() } + return ProtoMapValue(isPackageFacade, bytes, strings) } } - diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 7bc06f13708..4a1508b3c38 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -31,7 +31,7 @@ public sealed class DifferenceKind() { public class MEMBERS(val names: Collection): DifferenceKind() } -data class ProtoMapValue(val isPackageFacade: Boolean, val bytes: ByteArray) +data class ProtoMapValue(val isPackageFacade: Boolean, val bytes: ByteArray, val strings: Array) public fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): DifferenceKind { if (oldData.isPackageFacade != newData.isPackageFacade) return DifferenceKind.CLASS_SIGNATURE @@ -127,8 +127,8 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot ) } - val oldClassData = JvmProtoBufUtil.readClassDataFrom(oldData.bytes) - val newClassData = JvmProtoBufUtil.readClassDataFrom(newData.bytes) + val oldClassData = JvmProtoBufUtil.readClassDataFrom(oldData.bytes, oldData.strings) + val newClassData = JvmProtoBufUtil.readClassDataFrom(newData.bytes, newData.strings) val oldProto = oldClassData.classProto val newProto = newClassData.classProto @@ -217,8 +217,8 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot } private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { - val oldPackageData = JvmProtoBufUtil.readPackageDataFrom(oldData.bytes) - val newPackageData = JvmProtoBufUtil.readPackageDataFrom(newData.bytes) + val oldPackageData = JvmProtoBufUtil.readPackageDataFrom(oldData.bytes, oldData.strings) + val newPackageData = JvmProtoBufUtil.readPackageDataFrom(newData.bytes, newData.strings) val oldProto = oldPackageData.packageProto val newProto = newPackageData.packageProto diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 027be2715da..ce42b21f41b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -26,7 +26,6 @@ import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.Printer import java.io.File -import kotlin.test.assertEquals public abstract class AbstractProtoComparisonTest : UsefulTestCase() { @@ -85,8 +84,14 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { val oldProtoBytes = BitEncoding.decodeBytes(oldClassHeader.annotationData!!) val newProtoBytes = BitEncoding.decodeBytes(newClassHeader.annotationData!!) - val oldProto = ProtoMapValue(oldClassHeader.isCompatiblePackageFacadeKind() || oldClassHeader.isCompatibleFileFacadeKind(), oldProtoBytes) - val newProto = ProtoMapValue(newClassHeader.isCompatiblePackageFacadeKind() || newClassHeader.isCompatibleFileFacadeKind(), newProtoBytes) + val oldProto = ProtoMapValue( + oldClassHeader.isCompatiblePackageFacadeKind() || oldClassHeader.isCompatibleFileFacadeKind(), + oldProtoBytes, oldClassHeader.strings!! + ) + val newProto = ProtoMapValue( + newClassHeader.isCompatiblePackageFacadeKind() || newClassHeader.isCompatibleFileFacadeKind(), + newProtoBytes, newClassHeader.strings!! + ) val diff = when { newClassHeader.isCompatiblePackageFacadeKind(), newClassHeader.isCompatibleClassKind(), newClassHeader.isCompatibleFileFacadeKind() -> From 68e17044fe9c9b0514af08b07946eb9e6ecf7fc5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 21 Sep 2015 20:35:27 +0300 Subject: [PATCH 0532/1557] Introduce new string table optimized for JVM class files This format of the string table allows to reduce the size of the Kotlin metadata in JVM class files by reusing constants already present in the constant pool. Currently the string table produced by JvmStringTable is not fully optimized in serialization (in particular, the 'substring' operation which will be used to extract type names out of generic signature, is not used at all), but the format and its complete support in the deserialization (JvmNameResolver) allows future improvement without changing the binary version Original commit: 1036506b25d0ce0dcbcb90206e38a26fd1d6b409 --- .../classFilesComparison.kt | 35 +++++++++---------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index 4155f6742ca..03aacad2200 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -16,28 +16,28 @@ package org.jetbrains.kotlin.jps.build.classFilesComparison -import java.io.File -import org.junit.Assert.* -import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor -import java.io.PrintWriter -import org.jetbrains.org.objectweb.asm.ClassReader -import java.io.StringWriter -import org.jetbrains.kotlin.utils.Printer -import com.google.common.io.Files -import com.google.common.hash.Hashing -import com.intellij.openapi.util.io.FileUtil import com.google.common.collect.Sets -import java.util.HashSet -import org.jetbrains.kotlin.serialization.jvm.BitEncoding -import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf +import com.google.common.hash.Hashing +import com.google.common.io.Files import com.google.protobuf.ExtensionRegistry -import java.io.ByteArrayInputStream -import org.jetbrains.kotlin.serialization.DebugProtoBuf -import java.util.Arrays +import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.serialization.DebugProtoBuf +import org.jetbrains.kotlin.serialization.jvm.BitEncoding +import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf +import org.jetbrains.kotlin.utils.Printer +import org.jetbrains.org.objectweb.asm.ClassReader +import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNotNull +import java.io.ByteArrayInputStream +import java.io.File +import java.io.PrintWriter +import java.io.StringWriter +import java.util.* // Set this to true if you want to dump all bytecode (test will fail in this case) val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" @@ -139,8 +139,7 @@ fun classFileToString(classFile: File): String { ByteArrayInputStream(BitEncoding.decodeBytes(annotationDataEncoded)).use { input -> - out.write("\n------ simpleNames proto -----\n${DebugProtoBuf.StringTable.parseDelimitedFrom(input)}") - out.write("\n------ qualifiedNames proto -----\n${DebugProtoBuf.QualifiedNameTable.parseDelimitedFrom(input)}") + out.write("\n------ string table types proto -----\n${DebugJvmProtoBuf.StringTableTypes.parseDelimitedFrom(input)}") when { classHeader!!.isCompatiblePackageFacadeKind() -> From 05f074ac4c172da8786bd6dace3bbc47a01ea57b Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 29 Sep 2015 14:59:07 +0300 Subject: [PATCH 0533/1557] KotlinBuilder: improve logging Original commit: 0eac238f9b1cb9383fa3539d644550411d0e9aec --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index cede5205b5c..0658069ddef 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -91,9 +91,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR override fun getCompilableFileExtensions() = arrayListOf("kt") override fun buildStarted(context: CompileContext) { + LOG.info("is Kotlin incremental compilation enabled: ${IncrementalCompilation.isEnabled()}") + val historyLabel = context.getBuilderParameter("history label") if (historyLabel != null) { - LOG.debug("Label in local history: $historyLabel") + LOG.info("Label in local history: $historyLabel") } } From db78429e2dcfcad3d4414130cc9395908540d40b Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 24 Sep 2015 19:08:57 +0300 Subject: [PATCH 0534/1557] Change INTERFACE_IMPL_CLASS_NAME: $TImpl -> DefaultImpls Original commit: a101fffd9aacd17154432a78e79d4bb608755481 --- .../pureKotlin/traitClassObjectConstantChanged/build.log | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 673b3dfee4c..3ea22bfaba3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -1,18 +1,18 @@ Cleaning output files: -out/production/module/test/Trait$$TImpl.class out/production/module/test/Trait$Companion.class +out/production/module/test/Trait$DefaultImpls.class out/production/module/test/Trait.class End of files Compiling files: src/const.kt End of files Cleaning output files: -out/production/module/test/Trait$$TImpl.class out/production/module/test/Trait$Companion.class +out/production/module/test/Trait$DefaultImpls.class out/production/module/test/Trait.class out/production/module/test/Usage.class End of files Compiling files: src/const.kt src/usage.kt -End of files +End of files \ No newline at end of file From aef84701962ae7d4e05d8adffaed8bf8d4010b6b Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 23 Sep 2015 17:10:42 +0300 Subject: [PATCH 0535/1557] Incremental compilation support for multifile classes. Original commit: 3dfe9951efe4f972ea7efb75dc6dd3bca01dc071 --- .../jps/incremental/IncrementalCacheImpl.kt | 121 +++++++++++++++--- .../build/IncrementalJpsTestGenerated.java | 48 +++++++ .../classFilesComparison.kt | 6 +- .../pureKotlin/multifileClassFileAdded/a.kt | 4 + .../multifileClassFileAdded/b.kt.new | 4 + .../multifileClassFileAdded/build.log | 23 ++++ .../pureKotlin/multifileClassFileChanged/a.kt | 4 + .../pureKotlin/multifileClassFileChanged/b.kt | 4 + .../multifileClassFileChanged/b.kt.new | 4 + .../multifileClassFileChanged/build.log | 9 ++ .../a.kt | 4 + .../b.kt | 4 + .../b.kt.new | 4 + .../build.log | 18 +++ .../multifileClassInlineFunction/build.log | 8 ++ .../multifileClassInlineFunction/inline.kt | 7 + .../inlineOther.kt | 7 + .../multifileClassInlineFunction/usage.kt | 6 + .../multifileClassInlineFunction/usage.kt.new | 6 + .../build.log | 8 ++ .../inline.kt | 9 ++ .../inlineOther.kt | 9 ++ .../usage.kt | 6 + .../usage.kt.new | 6 + .../pureKotlin/multifileClassRecreated/a.kt | 4 + .../multifileClassRecreated/a.kt.delete.1 | 1 + .../multifileClassRecreated/b.kt.new.2 | 4 + .../multifileClassRecreated/build.log | 13 ++ .../multifileClassRecreatedAfterRenaming/a.kt | 4 + .../a.kt.new.1 | 4 + .../b.kt.new.2 | 4 + .../build.log | 23 ++++ .../pureKotlin/multifileClassRemoved/a.kt | 4 + .../multifileClassRemoved/a.kt.delete | 0 .../pureKotlin/multifileClassRemoved/b.kt | 4 + .../multifileClassRemoved/b.kt.delete | 0 .../multifileClassRemoved/build.log | 11 ++ 37 files changed, 387 insertions(+), 18 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inlineOther.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inlineOther.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/b.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/b.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index b9f97d84ddc..6b64149885a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -17,10 +17,7 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.openapi.util.io.FileUtil -import com.intellij.util.io.BooleanDataDescriptor -import com.intellij.util.io.DataExternalizer -import com.intellij.util.io.IOUtil -import com.intellij.util.io.KeyDescriptor +import com.intellij.util.io.* import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.BuildTarget @@ -35,12 +32,12 @@ import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.BasicMap import org.jetbrains.kotlin.jps.incremental.storage.BasicStringMap import org.jetbrains.kotlin.load.java.JvmAnnotationNames +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.PackageClassUtils -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName @@ -68,14 +65,17 @@ public class IncrementalCacheImpl( companion object { val CACHE_EXTENSION = "tab" - private val PROTO_MAP = "proto" - private val CONSTANTS_MAP = "constants" - private val INLINE_FUNCTIONS = "inline-functions" - private val PACKAGE_PARTS = "package-parts" - private val SOURCE_TO_CLASSES = "source-to-classes" - private val DIRTY_OUTPUT_CLASSES = "dirty-output-classes" - private val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions" - private val INLINED_TO = "inlined-to" + val PROTO_MAP = "proto" + val CONSTANTS_MAP = "constants" + val INLINE_FUNCTIONS = "inline-functions" + val PACKAGE_PARTS = "package-parts" + val MULTIFILE_CLASS_FACADES = "multifile-class-facades" + val MULTIFILE_CLASS_PARTS = "multifile-class-parts" + val SOURCE_TO_CLASSES = "source-to-classes" + val CLASS_TO_SOURCES = "class-to-sources" + val DIRTY_OUTPUT_CLASSES = "dirty-output-classes" + val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions" + val INLINED_TO = "inlined-to" private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } @@ -95,6 +95,8 @@ public class IncrementalCacheImpl( private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile)) + private val multifileClassFacadeMap = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile)) + private val multifileClassPartMap = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile)) private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile)) private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile)) // TODO: can be removed? @@ -196,6 +198,24 @@ public class IncrementalCacheImpl( constantsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass) } + header.isCompatibleMultifileClassKind() -> { + val partNames = getFullNamesOfMultifileClassParts(kotlinClass) + multifileClassFacadeMap.add(className, partNames) + + // TODO NO_CHANGES? (delegates only, see package facade) + constantsMap.process(kotlinClass) + + inlineFunctionsMap.process(kotlinClass) + } + header.isCompatibleMultifileClassPartKind() -> { + assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" } + packagePartMap.addPackagePart(className) + val facadeClassName = getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass, header.multifileClassName!!) + multifileClassPartMap.add(className.internalName, facadeClassName) + + protoMap.process(kotlinClass, isPackage = true) + + constantsMap.process(kotlinClass) + + inlineFunctionsMap.process(kotlinClass) + } header.isCompatibleClassKind() && JvmAnnotationNames.KotlinClass.Kind.CLASS == header.classKind -> protoMap.process(kotlinClass, isPackage = false) + constantsMap.process(kotlinClass) + @@ -236,6 +256,8 @@ public class IncrementalCacheImpl( dirtyClasses.forEach { protoMap.remove(it) packagePartMap.remove(it) + multifileClassFacadeMap.remove(it) + multifileClassPartMap.remove(it) constantsMap.remove(it) inlineFunctionsMap.remove(it) } @@ -256,6 +278,25 @@ public class IncrementalCacheImpl( } } + override fun getObsoleteMultifileClasses(): Collection { + val obsoleteMultifileClasses = linkedSetOf() + for (dirtyClass in dirtyOutputClassesMap.getDirtyOutputClasses()) { + val dirtyFacade = multifileClassPartMap.getFacadeName(dirtyClass) ?: continue + obsoleteMultifileClasses.add(dirtyFacade) + } + KotlinBuilder.LOG.debug("Obsolete multifile class facades: $obsoleteMultifileClasses") + return obsoleteMultifileClasses + } + + override fun getStableMultifileFacadeParts(facadeInternalName: String): Collection? { + val partNames = multifileClassFacadeMap.getMultifileClassParts(facadeInternalName) ?: return null + return partNames.filter { !dirtyOutputClassesMap.isDirty(it) } + } + + override fun getMultifileFacade(partInternalName: String): String? { + return multifileClassPartMap.getFacadeName(partInternalName) + } + override fun getModuleMappingData(): ByteArray? { return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)]?.bytes } @@ -516,6 +557,36 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } + private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { + public fun add(facadeName: JvmClassName, partNames: List) { + storage.put(facadeName.internalName, partNames) + } + + public fun getMultifileClassParts(facadeName: String): List? = storage[facadeName] + + public fun remove(className: JvmClassName) { + storage.remove(className.internalName) + } + + override fun dumpValue(value: List): String = value.toString() + } + + private inner class MultifileClassPartMap(storageFile: File) : BasicStringMap(storageFile, EnumeratorStringDescriptor.INSTANCE) { + public fun add(partName: String, facadeName: String) { + storage.put(partName, facadeName) + } + + public fun getFacadeName(partName: String): String? { + return storage.get(partName) + } + + public fun remove(className: JvmClassName) { + storage.remove(className.internalName) + } + + override fun dumpValue(value: String): String = value + } + private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringListExternalizer) { public fun clearOutputsForSource(sourceFile: File) { storage.remove(sourceFile.absolutePath) @@ -543,6 +614,8 @@ public class IncrementalCacheImpl( public fun getDirtyOutputClasses(): Collection = storage.keys + public fun isDirty(className: String): Boolean = storage.containsMapping(className) + override fun dumpValue(value: Boolean) = "" } @@ -631,6 +704,21 @@ private fun ByteArray.md5(): Long { ) } +private fun getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass: KotlinJvmBinaryClass, simpleName: String): String { + val classFqName = kotlinClass.classId.packageFqName.child(Name.identifier(simpleName)) + return JvmClassName.byFqNameWithoutInnerClasses(classFqName).internalName +} + +private fun getFullNamesOfMultifileClassParts(kotlinClass: LocalFileKotlinClass): List { + val classHeader = kotlinClass.classHeader + val partClassNames = classHeader.filePartClassNames ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}") + val fullNames = arrayListOf() + for (shortName in partClassNames) { + fullNames.add(getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass, shortName)) + } + return fullNames +} + private abstract class StringMapExternalizer : DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size()) @@ -698,6 +786,9 @@ private object PathCollectionExternalizer : DataExternalizer> } } +private val File.normalizedPath: String + get() = FileUtil.toSystemIndependentName(canonicalPath) + @TestOnly private fun , V> Map.dumpMap(dumpValue: (V)->String): String = StringBuilder { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 512804ffb8b..d2f1a958083 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -347,6 +347,54 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("multifileClassFileAdded") + public void testMultifileClassFileAdded() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileChanged") + public void testMultifileClassFileChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") + public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); + doTest(fileName); + } + + @TestMetadata("multifileClassInlineFunction") + public void testMultifileClassInlineFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); + doTest(fileName); + } + + @TestMetadata("multifileClassInlineFunctionAccessingField") + public void testMultifileClassInlineFunctionAccessingField() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRecreated") + public void testMultifileClassRecreated() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRecreatedAfterRenaming") + public void testMultifileClassRecreatedAfterRenaming() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRemoved") + public void testMultifileClassRemoved() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); + doTest(fileName); + } + @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index 03aacad2200..f62eca04266 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -22,9 +22,7 @@ import com.google.common.io.Files import com.google.protobuf.ExtensionRegistry import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.serialization.DebugProtoBuf import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf @@ -148,6 +146,8 @@ fun classFileToString(classFile: File): String { out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") classHeader.isCompatibleClassKind() -> out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") + classHeader.isCompatibleMultifileClassPartKind() -> + out.write("\n------ multi-file part proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") else -> throw IllegalStateException() } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/a.kt new file mode 100644 index 00000000000..63a63e173a0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/a.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/b.kt.new new file mode 100644 index 00000000000..cb1f3f58a0a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/b.kt.new @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log new file mode 100644 index 00000000000..50ccb081084 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log @@ -0,0 +1,23 @@ +Compiling files: +src/b.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/TestPackage.class +out/production/module/test/Test__AKt.class +out/production/module/test/Test__BKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/TestPackage.class +out/production/module/test/Test__AKt.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/a.kt new file mode 100644 index 00000000000..63a63e173a0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/a.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt new file mode 100644 index 00000000000..cb1f3f58a0a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt.new new file mode 100644 index 00000000000..6ce025497fc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/b.kt.new @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "bcd" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log new file mode 100644 index 00000000000..82b2f80c31e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log @@ -0,0 +1,9 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/TestPackage.class +out/production/module/test/Test__BKt.class +End of files +Compiling files: +src/b.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/a.kt new file mode 100644 index 00000000000..63a63e173a0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/a.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt new file mode 100644 index 00000000000..cb1f3f58a0a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt.new new file mode 100644 index 00000000000..5099c5bae8a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/b.kt.new @@ -0,0 +1,4 @@ +@file:[JvmName("Test1") JvmMultifileClass] +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log new file mode 100644 index 00000000000..8366c68cc13 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/TestPackage.class +out/production/module/test/Test__BKt.class +End of files +Compiling files: +src/b.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/TestPackage.class +out/production/module/test/Test__AKt.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log new file mode 100644 index 00000000000..64f2485efca --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/TestPackage.class +out/production/module/test/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inline.kt new file mode 100644 index 00000000000..f4fa4554f73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inline.kt @@ -0,0 +1,7 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +inline fun f(body: () -> Unit) { + println("i'm inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inlineOther.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inlineOther.kt new file mode 100644 index 00000000000..38501b19b1f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/inlineOther.kt @@ -0,0 +1,7 @@ +@file:[JvmName("Test") JvmMultifileClass] +package other + +inline fun f(body: () -> Unit) { + println("i'm other inline function") + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt new file mode 100644 index 00000000000..e5bb1ff5213 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt @@ -0,0 +1,6 @@ +package test + +fun main(args: Array) { + f { println("to be inlined") } + other.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new new file mode 100644 index 00000000000..e5bb1ff5213 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new @@ -0,0 +1,6 @@ +package test + +fun main(args: Array) { + f { println("to be inlined") } + other.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log new file mode 100644 index 00000000000..64f2485efca --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/TestPackage.class +out/production/module/test/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inline.kt new file mode 100644 index 00000000000..cd2c740e29d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inline.kt @@ -0,0 +1,9 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +val property = ":)" + +inline fun f(body: () -> Unit) { + println("i'm inline function" + property) + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inlineOther.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inlineOther.kt new file mode 100644 index 00000000000..693cebd353a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/inlineOther.kt @@ -0,0 +1,9 @@ +@file:[JvmName("Test") JvmMultifileClass] +package other + +val property = ":)" + +inline fun f(body: () -> Unit) { + println("i'm inline function" + property) + body() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt new file mode 100644 index 00000000000..e5bb1ff5213 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt @@ -0,0 +1,6 @@ +package test + +fun main(args: Array) { + f { println("to be inlined") } + other.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new new file mode 100644 index 00000000000..e5bb1ff5213 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new @@ -0,0 +1,6 @@ +package test + +fun main(args: Array) { + f { println("to be inlined") } + other.f { println("to be inlined") } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt new file mode 100644 index 00000000000..63a63e173a0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt.delete.1 b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt.delete.1 new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/a.kt.delete.1 @@ -0,0 +1 @@ + diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/b.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/b.kt.new.2 new file mode 100644 index 00000000000..cb1f3f58a0a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/b.kt.new.2 @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log new file mode 100644 index 00000000000..f920f7c94b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/TestPackage.class +out/production/module/test/Test__AKt.class +End of files +Compiling files: +End of files + + +Compiling files: +src/b.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt new file mode 100644 index 00000000000..63a63e173a0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt.new.1 new file mode 100644 index 00000000000..1d3ad0fe2c4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/a.kt.new.1 @@ -0,0 +1,4 @@ +@file:[JvmName("Test2") JvmMultifileClass] +package test2 + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/b.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/b.kt.new.2 new file mode 100644 index 00000000000..cb1f3f58a0a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/b.kt.new.2 @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log new file mode 100644 index 00000000000..9e245d73c4a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/TestPackage.class +out/production/module/test/Test__AKt.class +End of files +Compiling files: +src/a.kt +End of files + + +Compiling files: +src/b.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test2/Test2.class +out/production/module/test2/Test2Package.class +out/production/module/test2/Test2__AKt.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt new file mode 100644 index 00000000000..63a63e173a0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/a.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt new file mode 100644 index 00000000000..cb1f3f58a0a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "b" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/b.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log new file mode 100644 index 00000000000..663b207d00c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/TestPackage.class +out/production/module/test/Test__AKt.class +End of files +Cleaning output files: +out/production/module/test/Test__BKt.class +End of files +Compiling files: +End of files \ No newline at end of file From 44f754521a18284514960fe83d80431fbee45037 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 28 Sep 2015 18:40:24 +0300 Subject: [PATCH 0536/1557] Migrate to new storage API. Remove IncrementalPackageFragment::getMultifileFacade. Original commit: 9a41ee41d7c8a1dc31bac03056b98b916e48b823 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 6b64149885a..d5d72746ecd 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -559,7 +559,7 @@ public class IncrementalCacheImpl( private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { public fun add(facadeName: JvmClassName, partNames: List) { - storage.put(facadeName.internalName, partNames) + storage[facadeName.internalName] = partNames } public fun getMultifileClassParts(facadeName: String): List? = storage[facadeName] @@ -573,7 +573,7 @@ public class IncrementalCacheImpl( private inner class MultifileClassPartMap(storageFile: File) : BasicStringMap(storageFile, EnumeratorStringDescriptor.INSTANCE) { public fun add(partName: String, facadeName: String) { - storage.put(partName, facadeName) + storage[partName] = facadeName } public fun getFacadeName(partName: String): String? { @@ -614,7 +614,8 @@ public class IncrementalCacheImpl( public fun getDirtyOutputClasses(): Collection = storage.keys - public fun isDirty(className: String): Boolean = storage.containsMapping(className) + public fun isDirty(className: String): Boolean = + storage.contains(className) override fun dumpValue(value: Boolean) = "" } From eb1f04c29dacc35c26e5284ef582e24b4419d77d Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 30 Sep 2015 23:06:16 +0300 Subject: [PATCH 0537/1557] Move visibility check for toplevel private declarations to Visibilities.PRIVATE and fix it. Original commit: a36e4abf4d2ea6cbbf0840ce8d774591c1388c99 --- .../build/IncrementalJpsTestGenerated.java | 6 ++++++ .../topLevelPrivateValUsageAdded/build.log | 19 +++++++++++++++++++ .../topLevelPrivateValUsageAdded/foo.kt | 3 +++ .../topLevelPrivateValUsageAdded/usage.kt | 4 ++++ .../usage.kt.new.1 | 5 +++++ .../usage.kt.new.2 | 4 ++++ 6 files changed, 41 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2 diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index d2f1a958083..53efe232f9d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -599,6 +599,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("topLevelPrivateValUsageAdded") + public void testTopLevelPrivateValUsageAdded() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/"); + doTest(fileName); + } + @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log new file mode 100644 index 00000000000..992db6b386d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log @@ -0,0 +1,19 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/TestPackage.class +out/production/module/test/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Cannot access 'foo': it is 'private' in file + + +Cleaning output files: +out/production/module/test/FooKt.class +End of files +Compiling files: +src/foo.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt new file mode 100644 index 00000000000..5715a620ced --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/foo.kt @@ -0,0 +1,3 @@ +package test + +private fun foo() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt new file mode 100644 index 00000000000..6bdc11105c7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt @@ -0,0 +1,4 @@ +package test + +fun usage() { +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1 new file mode 100644 index 00000000000..e62a20dd934 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.1 @@ -0,0 +1,5 @@ +package test + +fun usage() { + println(foo()) +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2 new file mode 100644 index 00000000000..6bdc11105c7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/usage.kt.new.2 @@ -0,0 +1,4 @@ +package test + +fun usage() { +} From bacc14b4c46e4511caf423a396abbf54b593212c Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 25 Sep 2015 16:27:47 +0300 Subject: [PATCH 0538/1557] fix KT-8977 Ignore non-public API changes for packages in incremental compilation #KT-8977 Fixed Original commit: c7b52bfdc15fa95891ab20e0276512c89111a2c4 --- .../kotlin/jps/incremental/protoDifferenceUtils.kt | 8 ++++---- .../jps/incremental/ProtoComparisonTestGenerated.java | 6 ++++++ .../packageFacadeDifference/new.kt | 10 ++++++---- .../packageFacadeDifference/old.kt | 10 ++++++---- .../packageFacadeDifference/new.kt | 11 +++++++++++ .../packageFacadeDifference/old.kt | 11 +++++++++++ .../packageFacadeDifference/result.out | 2 ++ 7 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/result.out diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 4a1508b3c38..d123201c3e4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -112,6 +112,9 @@ private abstract class DifferenceCalculator() { val newNames = newList.map { compareObject.newNameResolver.getString(it) }.toSet() return HashSetUtil.symmetricDifference(oldNames, newNames) } + + protected val ProtoBuf.Callable.isPrivate: Boolean + get() = Visibilities.isPrivate(Deserialization.visibility(Flags.VISIBILITY.get(flags))) } private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { @@ -211,9 +214,6 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot return if (primaryConstructor?.data?.isPrivate ?: false) null else primaryConstructor } - - private val ProtoBuf.Callable.isPrivate: Boolean - get() = Visibilities.isPrivate(Deserialization.visibility(Flags.VISIBILITY.get(flags))) } private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { @@ -240,7 +240,7 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa for (kind in diff) { when (kind!!) { ProtoCompareGenerated.ProtoBufPackageKind.MEMBER_LIST -> - names.addAll(calcDifferenceForMembers(oldProto.memberList, newProto.memberList)) + names.addAll(calcDifferenceForMembers(oldProto.memberList.filter { !it.isPrivate }, newProto.memberList.filter { !it.isPrivate })) else -> throw IllegalArgumentException("Unsupported kind: $kind") } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 079ab425bd0..0452cdf8273 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -113,6 +113,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } + @TestMetadata("packageFacadeDifference") + public void testPackageFacadeDifference() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/"); + doTest(fileName); + } + } @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged") diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt index 9f98bc5a4b9..e8d2d04161e 100644 --- a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt @@ -2,10 +2,12 @@ package test public fun unchangedFun() {} -private fun addedFun(): Int = 10 +public fun addedFun(): Int = 10 -private val addedVal: String = "A" +public val addedVal: String = "A" -private val changedVal: String = "" +public val changedVal: String = "" -private fun changedFun(arg: String) {} +internal fun changedFun(arg: String) {} + +private fun privateAddedFun() {} diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt index d84e45cd33e..70876015aa5 100644 --- a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt @@ -2,10 +2,12 @@ package test public fun unchangedFun() {} -private fun removedFun(): Int = 10 +public fun removedFun(): Int = 10 -private val removedVal: String = "A" +public val removedVal: String = "A" -private val changedVal: Int = 20 +public val changedVal: Int = 20 -private fun changedFun(arg: Int) {} +internal fun changedFun(arg: Int) {} + +private fun privateRemovedFun() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/new.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/new.kt new file mode 100644 index 00000000000..9f98bc5a4b9 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/new.kt @@ -0,0 +1,11 @@ +package test + +public fun unchangedFun() {} + +private fun addedFun(): Int = 10 + +private val addedVal: String = "A" + +private val changedVal: String = "" + +private fun changedFun(arg: String) {} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/old.kt b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/old.kt new file mode 100644 index 00000000000..d84e45cd33e --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/old.kt @@ -0,0 +1,11 @@ +package test + +public fun unchangedFun() {} + +private fun removedFun(): Int = 10 + +private val removedVal: String = "A" + +private val changedVal: Int = 20 + +private fun changedFun(arg: Int) {} diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/result.out b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/result.out new file mode 100644 index 00000000000..2b72c17b8c9 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/result.out @@ -0,0 +1,2 @@ +changes in test/MainKt: NONE +changes in test/TestPackage: NONE From ac20dbf7804a1b9add05d8f403c0ac561a1dc0f4 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Fri, 25 Sep 2015 16:24:24 +0300 Subject: [PATCH 0539/1557] add tests for comparison of package members Original commit: bc6746b9e659195dcd0ea7c05384a1fb2ac49d73 --- .../AbstractProtoComparisonTest.kt | 32 ++++++++++------- .../ProtoComparisonTestGenerated.java | 34 ++++++++++++++----- .../new1.kt | 15 ++++++++ .../new2.kt | 13 +++++++ .../old1.kt | 13 +++++++ .../old2.kt | 13 +++++++ .../result.out | 5 +++ .../packageFacadePrivateOnlyChanges}/new.kt | 0 .../packageFacadePrivateOnlyChanges}/old.kt | 0 .../result.out | 0 .../packageFacadePublicChanges}/new.kt | 0 .../packageFacadePublicChanges}/old.kt | 0 .../packageFacadePublicChanges}/result.out | 0 13 files changed, 104 insertions(+), 21 deletions(-) create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new1.kt create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new2.kt create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old1.kt create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old2.kt create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out rename jps/jps-plugin/testData/comparison/{classPrivateOnlyChange/packageFacadeDifference => packageMembers/packageFacadePrivateOnlyChanges}/new.kt (100%) rename jps/jps-plugin/testData/comparison/{classPrivateOnlyChange/packageFacadeDifference => packageMembers/packageFacadePrivateOnlyChanges}/old.kt (100%) rename jps/jps-plugin/testData/comparison/{classPrivateOnlyChange/packageFacadeDifference => packageMembers/packageFacadePrivateOnlyChanges}/result.out (100%) rename jps/jps-plugin/testData/comparison/{classMembersOnlyChanged/packageFacadeDifference => packageMembers/packageFacadePublicChanges}/new.kt (100%) rename jps/jps-plugin/testData/comparison/{classMembersOnlyChanged/packageFacadeDifference => packageMembers/packageFacadePublicChanges}/old.kt (100%) rename jps/jps-plugin/testData/comparison/{classMembersOnlyChanged/packageFacadeDifference => packageMembers/packageFacadePublicChanges}/result.out (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index ce42b21f41b..b407aecbd46 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -18,9 +18,7 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil @@ -32,8 +30,8 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { public fun doTest(testDataPath: String) { val testDir = JetTestUtils.tmpDir("testDirectory") - val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old.kt") - val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new.kt") + val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old") + val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new") val oldClassMap = oldClassFiles.toMap { it.name } val newClassMap = newClassFiles.toMap { it.name } @@ -63,12 +61,14 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { JetTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()); } - private fun compileFileAndGetClasses(testPath: String, testDir: File, fileName: String): List { - + private fun compileFileAndGetClasses(testPath: String, testDir: File, prefix: String): List { + val files = File(testPath).listFiles { it.name.startsWith(prefix) }!! val sourcesDirectory = testDir.createSubDirectory("sources") - val classesDirectory = testDir.createSubDirectory("$fileName.src") + val classesDirectory = testDir.createSubDirectory("$prefix.src") - FileUtil.copy(File(testPath, fileName), File(sourcesDirectory, "main.kt")) + files.forEach { file -> + FileUtil.copy(file, File(sourcesDirectory, file.name.replaceFirst(prefix, "main"))) + } MockLibraryUtil.compileKotlin(sourcesDirectory.path, classesDirectory) return File(classesDirectory, "test").listFiles() { it.name.endsWith(".class") }?.sortedBy { it.name }!! @@ -81,20 +81,28 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { val oldClassHeader = oldLocalFileKotlinClass.classHeader val newClassHeader = newLocalFileKotlinClass.classHeader + if (oldClassHeader.annotationData == null || newClassHeader.annotationData == null) { + println("skip ${oldLocalFileKotlinClass.classId}") + return + } + val oldProtoBytes = BitEncoding.decodeBytes(oldClassHeader.annotationData!!) val newProtoBytes = BitEncoding.decodeBytes(newClassHeader.annotationData!!) val oldProto = ProtoMapValue( - oldClassHeader.isCompatiblePackageFacadeKind() || oldClassHeader.isCompatibleFileFacadeKind(), + oldClassHeader.isCompatiblePackageFacadeKind() || oldClassHeader.isCompatibleFileFacadeKind() || oldClassHeader.isCompatibleMultifileClassPartKind(), oldProtoBytes, oldClassHeader.strings!! ) val newProto = ProtoMapValue( - newClassHeader.isCompatiblePackageFacadeKind() || newClassHeader.isCompatibleFileFacadeKind(), + newClassHeader.isCompatiblePackageFacadeKind() || newClassHeader.isCompatibleFileFacadeKind() || newClassHeader.isCompatibleMultifileClassPartKind(), newProtoBytes, newClassHeader.strings!! ) val diff = when { - newClassHeader.isCompatiblePackageFacadeKind(), newClassHeader.isCompatibleClassKind(), newClassHeader.isCompatibleFileFacadeKind() -> + newClassHeader.isCompatiblePackageFacadeKind(), + newClassHeader.isCompatibleClassKind(), + newClassHeader.isCompatibleFileFacadeKind(), + newClassHeader.isCompatibleMultifileClassPartKind() -> difference(oldProto, newProto) else -> { println("ignore ${oldLocalFileKotlinClass.classId}") diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 0452cdf8273..fca9885dc30 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -113,12 +113,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } - @TestMetadata("packageFacadeDifference") - public void testPackageFacadeDifference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/"); - doTest(fileName); - } - } @TestMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged") @@ -159,9 +153,31 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } - @TestMetadata("packageFacadeDifference") - public void testPackageFacadeDifference() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/"); + } + + @TestMetadata("jps-plugin/testData/comparison/packageMembers") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class PackageMembers extends AbstractProtoComparisonTest { + public void testAllFilesPresentInPackageMembers() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("packageFacadeMultifileClassChanged") + public void testPackageFacadeMultifileClassChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/"); + doTest(fileName); + } + + @TestMetadata("packageFacadePrivateOnlyChanges") + public void testPackageFacadePrivateOnlyChanges() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/"); + doTest(fileName); + } + + @TestMetadata("packageFacadePublicChanges") + public void testPackageFacadePublicChanges() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/"); doTest(fileName); } diff --git a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new1.kt b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new1.kt new file mode 100644 index 00000000000..22064b47da0 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new1.kt @@ -0,0 +1,15 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +public fun unchangedFun1() {} + +public fun publicAddedFun1() {} + +private fun addedFun1(): Int = 10 + +private val addedVal1: String = "A" + +private val changedVal1: String = "" + +private fun changedFun1(arg: String) {} diff --git a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new2.kt b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new2.kt new file mode 100644 index 00000000000..dc7dce42888 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/new2.kt @@ -0,0 +1,13 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +public fun unchangedFun2() {} + +private fun addedFun2(): Int = 10 + +private val addedVal2: String = "A" + +private val changedVal2: String = "" + +private fun changedFun2(arg: String) {} diff --git a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old1.kt b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old1.kt new file mode 100644 index 00000000000..11fff787118 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old1.kt @@ -0,0 +1,13 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +public fun unchangedFun1() {} + +private fun removedFun1(): Int = 10 + +private val removedVal1: String = "A" + +private val changedVal1: Int = 20 + +private fun changedFun1(arg: Int) {} diff --git a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old2.kt b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old2.kt new file mode 100644 index 00000000000..2c794b1fbe0 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/old2.kt @@ -0,0 +1,13 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +public fun unchangedFun2() {} + +private fun removedFun2(): Int = 10 + +private val removedVal2: String = "A" + +private val changedVal2: Int = 20 + +private fun changedFun2(arg: Int) {} diff --git a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out new file mode 100644 index 00000000000..7868fd3e24c --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out @@ -0,0 +1,5 @@ +changes in test/TestPackage: NONE +skip test/Utils +changes in test/Utils__Main1Kt: MEMBERS + [publicAddedFun1] +changes in test/Utils__Main2Kt: NONE diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/new.kt b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/new.kt similarity index 100% rename from jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/new.kt rename to jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/new.kt diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/old.kt b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/old.kt similarity index 100% rename from jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/old.kt rename to jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/old.kt diff --git a/jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/result.out b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out similarity index 100% rename from jps/jps-plugin/testData/comparison/classPrivateOnlyChange/packageFacadeDifference/result.out rename to jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/new.kt similarity index 100% rename from jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/new.kt rename to jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/new.kt diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/old.kt similarity index 100% rename from jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/old.kt rename to jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/old.kt diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/result.out b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out similarity index 100% rename from jps/jps-plugin/testData/comparison/classMembersOnlyChanged/packageFacadeDifference/result.out rename to jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out From d3d256e70975a22efa3744d2da7ad1788a0a9784 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 28 Sep 2015 14:43:39 +0300 Subject: [PATCH 0540/1557] incremental compilation: do not recompile on changes in private static final values. Original commit: 8557e540fc9f196b93173ce4f15772caa209a427 --- .../jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../pureKotlin/privateConstantsChanged/build.log | 11 +++++++++++ .../pureKotlin/privateConstantsChanged/const.kt | 15 +++++++++++++++ .../privateConstantsChanged/const.kt.new | 15 +++++++++++++++ .../pureKotlin/privateConstantsChanged/usage.kt | 4 ++++ 6 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index d5d72746ecd..bcebe353b7a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -366,8 +366,8 @@ public class IncrementalCacheImpl( ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? { - val staticFinal = Opcodes.ACC_STATIC or Opcodes.ACC_FINAL - if (value != null && access and staticFinal == staticFinal) { + val staticFinal = Opcodes.ACC_STATIC or Opcodes.ACC_FINAL or Opcodes.ACC_PRIVATE + if (value != null && access and staticFinal == Opcodes.ACC_STATIC or Opcodes.ACC_FINAL) { result[name] = value } return null diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 53efe232f9d..c7cd780f232 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -485,6 +485,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("privateConstantsChanged") + public void testPrivateConstantsChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/"); + doTest(fileName); + } + @TestMetadata("privateMethodAdded") public void testPrivateMethodAdded() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log new file mode 100644 index 00000000000..453becd76c1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/ConstKt.class +out/production/module/test/Klass$Companion.class +out/production/module/test/Klass.class +out/production/module/test/Obj.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/const.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt new file mode 100644 index 00000000000..7f64be02734 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt @@ -0,0 +1,15 @@ +package test + +val CONST = "foo" + +class Klass { + companion object { + private val CHANGED = "old" + public val UNCHANGED = 100 + } +} + +object Obj : Any() { + private val CHANGED = "old:Obj" + public val UNCHANGED = 200 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new new file mode 100644 index 00000000000..569acca03d0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new @@ -0,0 +1,15 @@ +package test + +val CONST = "foo" + +class Klass { + companion object { + private val CHANGED = "new" + public val UNCHANGED = 100 + } +} + +object Obj : Any() { + private val CHANGED = "new:Obj" + public val UNCHANGED = 200 +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt new file mode 100644 index 00000000000..0804182a1b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/usage.kt @@ -0,0 +1,4 @@ +package test + +@Deprecated(CONST + Klass.UNCHANGED) +class Usage From e654254c9fb8afdad68eb5633977060fb3fb8a07 Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 28 Sep 2015 14:59:29 +0300 Subject: [PATCH 0541/1557] add tests for incremental compilation: package members Original commit: 0de9e8295a35a233857a231a27f5e1ece650f48a --- .../jps/build/IncrementalJpsTestGenerated.java | 18 ++++++++++++++++++ .../build.log | 17 +++++++++++++++++ .../pkg1.kt | 12 ++++++++++++ .../pkg1.kt.new | 12 ++++++++++++ .../pkg2.kt | 14 ++++++++++++++ .../pkg2.kt.new | 14 ++++++++++++++ .../usage.kt | 8 ++++++++ .../build.log | 11 +++++++++++ .../pkg1.kt | 12 ++++++++++++ .../pkg1.kt.new | 12 ++++++++++++ .../pkg2.kt | 12 ++++++++++++ .../pkg2.kt.new | 12 ++++++++++++ .../usage.kt | 8 ++++++++ .../packagePrivateOnlyChanged/build.log | 8 ++++++++ .../packagePrivateOnlyChanged/pkg.kt | 10 ++++++++++ .../packagePrivateOnlyChanged/pkg.kt.new | 10 ++++++++++ .../packagePrivateOnlyChanged/usage.kt | 7 +++++++ 17 files changed, 197 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index c7cd780f232..00730fed6a4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -467,6 +467,24 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("packageMultifileClassOneFileWithPublicChanges") + public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); + doTest(fileName); + } + + @TestMetadata("packageMultifileClassPrivateOnlyChanged") + public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); + doTest(fileName); + } + + @TestMetadata("packagePrivateOnlyChanged") + public void testPackagePrivateOnlyChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); + doTest(fileName); + } + @TestMetadata("packageRecreated") public void testPackageRecreated() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log new file mode 100644 index 00000000000..a9c8fe4ddc2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/TestPackage.class +out/production/module/test/Utils.class +out/production/module/test/Utils__Pkg1Kt.class +out/production/module/test/Utils__Pkg2Kt.class +End of files +Compiling files: +src/pkg1.kt +src/pkg2.kt +End of files +Cleaning output files: +out/production/module/test/Usage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt new file mode 100644 index 00000000000..0dc1be70318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt @@ -0,0 +1,12 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +fun commonFun1() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val deletedVal1: Int = 20 + +private fun deletedFun1(): Int = 10 + +private fun changedFun1(arg: Int) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new new file mode 100644 index 00000000000..1aafd0fd8f0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new @@ -0,0 +1,12 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +fun commonFun1() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val addedVal1: Int = 20 + +private fun addedFun1(): Int = 50 + +private fun changedFun1(arg: String) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt new file mode 100644 index 00000000000..fb983eec742 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt @@ -0,0 +1,14 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +fun commonFun2() {} + +fun publicDeletedFun2() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val deletedVal2: Int = 20 + +private fun deletedFun2(): Int = 10 + +private fun changedFun2(arg: Int) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new new file mode 100644 index 00000000000..a7dcc9a42f8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new @@ -0,0 +1,14 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +fun commonFun2() {} + +fun publicAddedFun2() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val addedVal2: Int = 20 + +private fun addedFun2(): Int = 50 + +private fun changedFun2(arg: String) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/usage.kt new file mode 100644 index 00000000000..95078b37afe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/usage.kt @@ -0,0 +1,8 @@ +package test + +class Usage { + fun f() { + commonFun1() + commonFun2() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log new file mode 100644 index 00000000000..4c132408b65 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log @@ -0,0 +1,11 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/TestPackage.class +out/production/module/test/Utils.class +out/production/module/test/Utils__Pkg1Kt.class +out/production/module/test/Utils__Pkg2Kt.class +End of files +Compiling files: +src/pkg1.kt +src/pkg2.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt new file mode 100644 index 00000000000..0dc1be70318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt @@ -0,0 +1,12 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +fun commonFun1() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val deletedVal1: Int = 20 + +private fun deletedFun1(): Int = 10 + +private fun changedFun1(arg: Int) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new new file mode 100644 index 00000000000..1aafd0fd8f0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new @@ -0,0 +1,12 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +fun commonFun1() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val addedVal1: Int = 20 + +private fun addedFun1(): Int = 50 + +private fun changedFun1(arg: String) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt new file mode 100644 index 00000000000..421a66fe21b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt @@ -0,0 +1,12 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +fun commonFun2() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val deletedVal2: Int = 20 + +private fun deletedFun2(): Int = 10 + +private fun changedFun2(arg: Int) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new new file mode 100644 index 00000000000..2921e042103 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new @@ -0,0 +1,12 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass +package test + +fun commonFun2() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val addedVal2: Int = 20 + +private fun addedFun2(): Int = 50 + +private fun changedFun2(arg: String) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/usage.kt new file mode 100644 index 00000000000..95078b37afe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/usage.kt @@ -0,0 +1,8 @@ +package test + +class Usage { + fun f() { + commonFun1() + commonFun2() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log new file mode 100644 index 00000000000..ed1502ec2a6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/PkgKt.class +out/production/module/test/TestPackage.class +End of files +Compiling files: +src/pkg.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt new file mode 100644 index 00000000000..7dd67f6b538 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt @@ -0,0 +1,10 @@ +package test + +fun commonFun() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val deletedVal: Int = 20 + +private fun deletedFun(): Int = 10 + +private fun changedFun(arg: Int) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new new file mode 100644 index 00000000000..b8d74bb235b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new @@ -0,0 +1,10 @@ +package test + +fun commonFun() {} + +// TODO uncomment when generated value will also be private in bytecode +//private val addedVal: Int = 20 + +private fun addedFun(): Int = 50 + +private fun changedFun(arg: String) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt new file mode 100644 index 00000000000..137dc6be553 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/usage.kt @@ -0,0 +1,7 @@ +package test + +class Usage { + fun f() { + commonFun() + } +} From 962d233e1ae9172ae4730ec89feeecd3b41b38f6 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 24 Sep 2015 15:21:30 +0300 Subject: [PATCH 0542/1557] 'descriptors' module exports 'deserialization', not the other way around Also remove some of redundantly specified dependencies Original commit: 0ae842a05d2ee429045d132ade6dad00bdd00fec --- jps/jps-plugin/jps-plugin.iml | 1 - 1 file changed, 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index e092109dfa7..cceadef5599 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -16,7 +16,6 @@ - From 8550ed6cecceebd33217833841782d6dd4f25b97 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 29 Sep 2015 18:37:00 +0300 Subject: [PATCH 0543/1557] Cleanup descriptors.proto, regenerate - move enums and messages nested in Callable to top level, since they're likely to be reused in other messages soon - delete obsolete comments: some did not any value, some became obsolete with custom options ("id in StringTable" -> name_id_in_table) Original commit: e4090d3f30186405b11bb16657e6e199c12c2013 --- .../jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 07f99c5ca12..2b7e42dfdc8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -270,7 +270,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - open fun checkEquals(old: ProtoBuf.Callable.ValueParameter, new: ProtoBuf.Callable.ValueParameter): Boolean { + open fun checkEquals(old: ProtoBuf.ValueParameter, new: ProtoBuf.ValueParameter): Boolean { if (old.hasFlags() != new.hasFlags()) return false if (old.hasFlags()) { if (old.flags != new.flags) return false @@ -753,7 +753,7 @@ public fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndex return hashCode } -public fun ProtoBuf.Callable.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { From feabc81e3a173cbaafd37f5aed7c19faad1f9591 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 1 Oct 2015 18:13:52 +0300 Subject: [PATCH 0544/1557] Deprecate and don't write KotlinSyntheticClass$Kind, to be removed later Original commit: 056bb3f83375a76ffd2afa1e62ddacd7fac70887 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index bcebe353b7a..6a1573694f0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -37,8 +37,8 @@ import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto +import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName import org.jetbrains.kotlin.serialization.jvm.BitEncoding @@ -220,13 +220,6 @@ public class IncrementalCacheImpl( protoMap.process(kotlinClass, isPackage = false) + constantsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass) - header.syntheticClassKind == JvmAnnotationNames.KotlinSyntheticClass.Kind.PACKAGE_PART -> { - assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } - packagePartMap.addPackagePart(className) - - constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass) - } else -> ChangesInfo.NO_CHANGES } From 72b39ee233771f8c832c85fb1ed4c964c4502c87 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 1 Oct 2015 19:12:07 +0300 Subject: [PATCH 0545/1557] Deprecate and don't write KotlinClass$Kind, to be removed later Original commit: 041af28166c270b29b51f5f42fb3269c2dbe1159 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 6a1573694f0..093349ccec1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -31,7 +31,6 @@ import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.BasicMap import org.jetbrains.kotlin.jps.incremental.storage.BasicStringMap -import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.PackageClassUtils @@ -216,10 +215,11 @@ public class IncrementalCacheImpl( constantsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass) } - header.isCompatibleClassKind() && JvmAnnotationNames.KotlinClass.Kind.CLASS == header.classKind -> + header.isCompatibleClassKind() && !header.isLocalClass -> { protoMap.process(kotlinClass, isPackage = false) + constantsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass) + } else -> ChangesInfo.NO_CHANGES } From ba87e98243be6f36b8a49361a4ce3d168461544d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 30 Sep 2015 16:41:12 +0300 Subject: [PATCH 0546/1557] Split ProtoBuf.Callable to three messages: constructor, function, property Serialize both at the moment, will drop the old one after bootstrap Original commit: ad735cd7885d978288e2800b47fa7fdc3bca5f71 --- .../jps/incremental/ProtoCompareGenerated.kt | 298 +++++++++++++++++- .../jps/incremental/protoDifferenceUtils.kt | 133 +++++--- 2 files changed, 394 insertions(+), 37 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 2b7e42dfdc8..f6ae431add2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -37,10 +37,19 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { if (!checkEqualsPackageMember(old, new)) return false + if (!checkEqualsPackageConstructor(old, new)) return false + + if (!checkEqualsPackageFunction(old, new)) return false + + if (!checkEqualsPackageProperty(old, new)) return false + return true } public enum class ProtoBufPackageKind { - MEMBER_LIST + MEMBER_LIST, + CONSTRUCTOR_LIST, + FUNCTION_LIST, + PROPERTY_LIST } public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { @@ -48,6 +57,12 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsPackageMember(old, new)) result.add(ProtoBufPackageKind.MEMBER_LIST) + if (!checkEqualsPackageConstructor(old, new)) result.add(ProtoBufPackageKind.CONSTRUCTOR_LIST) + + if (!checkEqualsPackageFunction(old, new)) result.add(ProtoBufPackageKind.FUNCTION_LIST) + + if (!checkEqualsPackageProperty(old, new)) result.add(ProtoBufPackageKind.PROPERTY_LIST) + return result } @@ -70,6 +85,12 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassNestedClassName(old, new)) return false + if (!checkEqualsClassConstructor(old, new)) return false + + if (!checkEqualsClassFunction(old, new)) return false + + if (!checkEqualsClassProperty(old, new)) return false + if (!checkEqualsClassMember(old, new)) return false if (!checkEqualsClassEnumEntry(old, new)) return false @@ -96,6 +117,9 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi TYPE_PARAMETER_LIST, SUPERTYPE_LIST, NESTED_CLASS_NAME_LIST, + CONSTRUCTOR_LIST, + FUNCTION_LIST, + PROPERTY_LIST, MEMBER_LIST, ENUM_ENTRY_LIST, PRIMARY_CONSTRUCTOR, @@ -124,6 +148,12 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassNestedClassName(old, new)) result.add(ProtoBufClassKind.NESTED_CLASS_NAME_LIST) + if (!checkEqualsClassConstructor(old, new)) result.add(ProtoBufClassKind.CONSTRUCTOR_LIST) + + if (!checkEqualsClassFunction(old, new)) result.add(ProtoBufClassKind.FUNCTION_LIST) + + if (!checkEqualsClassProperty(old, new)) result.add(ProtoBufClassKind.PROPERTY_LIST) + if (!checkEqualsClassMember(old, new)) result.add(ProtoBufClassKind.MEMBER_LIST) if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST) @@ -191,6 +221,74 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEquals(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean { + if (old.hasFlags() != new.hasFlags()) return false + if (old.hasFlags()) { + if (old.flags != new.flags) return false + } + + if (!checkEqualsConstructorValueParameter(old, new)) return false + + return true + } + + open fun checkEquals(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean { + if (old.hasFlags() != new.hasFlags()) return false + if (old.hasFlags()) { + if (old.flags != new.flags) return false + } + + if (!checkStringEquals(old.name, new.name)) return false + + if (!checkEquals(old.returnType, new.returnType)) return false + + if (!checkEqualsFunctionTypeParameter(old, new)) return false + + if (old.hasReceiverType() != new.hasReceiverType()) return false + if (old.hasReceiverType()) { + if (!checkEquals(old.receiverType, new.receiverType)) return false + } + + if (!checkEqualsFunctionValueParameter(old, new)) return false + + return true + } + + open fun checkEquals(old: ProtoBuf.Property, new: ProtoBuf.Property): Boolean { + if (old.hasFlags() != new.hasFlags()) return false + if (old.hasFlags()) { + if (old.flags != new.flags) return false + } + + if (!checkStringEquals(old.name, new.name)) return false + + if (!checkEquals(old.returnType, new.returnType)) return false + + if (!checkEqualsPropertyTypeParameter(old, new)) return false + + if (old.hasReceiverType() != new.hasReceiverType()) return false + if (old.hasReceiverType()) { + if (!checkEquals(old.receiverType, new.receiverType)) return false + } + + if (old.hasSetterValueParameter() != new.hasSetterValueParameter()) return false + if (old.hasSetterValueParameter()) { + if (!checkEquals(old.setterValueParameter, new.setterValueParameter)) return false + } + + if (old.hasGetterFlags() != new.hasGetterFlags()) return false + if (old.hasGetterFlags()) { + if (old.getterFlags != new.getterFlags) return false + } + + if (old.hasSetterFlags() != new.hasSetterFlags()) return false + if (old.hasSetterFlags()) { + if (old.setterFlags != new.setterFlags) return false + } + + return true + } + open fun checkEquals(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { if (old.id != new.id) return false @@ -416,6 +514,36 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEqualsPackageConstructor(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { + if (old.constructorCount != new.constructorCount) return false + + for(i in 0..old.constructorCount - 1) { + if (!checkEquals(old.getConstructor(i), new.getConstructor(i))) return false + } + + return true + } + + open fun checkEqualsPackageFunction(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { + if (old.functionCount != new.functionCount) return false + + for(i in 0..old.functionCount - 1) { + if (!checkEquals(old.getFunction(i), new.getFunction(i))) return false + } + + return true + } + + open fun checkEqualsPackageProperty(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { + if (old.propertyCount != new.propertyCount) return false + + for(i in 0..old.propertyCount - 1) { + if (!checkEquals(old.getProperty(i), new.getProperty(i))) return false + } + + return true + } + open fun checkEqualsClassTypeParameter(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { if (old.typeParameterCount != new.typeParameterCount) return false @@ -446,6 +574,36 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEqualsClassConstructor(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.constructorCount != new.constructorCount) return false + + for(i in 0..old.constructorCount - 1) { + if (!checkEquals(old.getConstructor(i), new.getConstructor(i))) return false + } + + return true + } + + open fun checkEqualsClassFunction(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.functionCount != new.functionCount) return false + + for(i in 0..old.functionCount - 1) { + if (!checkEquals(old.getFunction(i), new.getFunction(i))) return false + } + + return true + } + + open fun checkEqualsClassProperty(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.propertyCount != new.propertyCount) return false + + for(i in 0..old.propertyCount - 1) { + if (!checkEquals(old.getProperty(i), new.getProperty(i))) return false + } + + return true + } + open fun checkEqualsClassMember(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { if (old.memberCount != new.memberCount) return false @@ -496,6 +654,46 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEqualsConstructorValueParameter(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean { + if (old.valueParameterCount != new.valueParameterCount) return false + + for(i in 0..old.valueParameterCount - 1) { + if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false + } + + return true + } + + open fun checkEqualsFunctionTypeParameter(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean { + if (old.typeParameterCount != new.typeParameterCount) return false + + for(i in 0..old.typeParameterCount - 1) { + if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false + } + + return true + } + + open fun checkEqualsFunctionValueParameter(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean { + if (old.valueParameterCount != new.valueParameterCount) return false + + for(i in 0..old.valueParameterCount - 1) { + if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false + } + + return true + } + + open fun checkEqualsPropertyTypeParameter(old: ProtoBuf.Property, new: ProtoBuf.Property): Boolean { + if (old.typeParameterCount != new.typeParameterCount) return false + + for(i in 0..old.typeParameterCount - 1) { + if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false + } + + return true + } + open fun checkEqualsTypeParameterUpperBound(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { if (old.upperBoundCount != new.upperBoundCount) return false @@ -574,6 +772,18 @@ public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: hashCode = 31 * hashCode + getMember(i).hashCode(stringIndexes, fqNameIndexes) } + for(i in 0..constructorCount - 1) { + hashCode = 31 * hashCode + getConstructor(i).hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..functionCount - 1) { + hashCode = 31 * hashCode + getFunction(i).hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..propertyCount - 1) { + hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes) + } + return hashCode } @@ -602,6 +812,18 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: ( hashCode = 31 * hashCode + stringIndexes(getNestedClassName(i)) } + for(i in 0..constructorCount - 1) { + hashCode = 31 * hashCode + getConstructor(i).hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..functionCount - 1) { + hashCode = 31 * hashCode + getFunction(i).hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..propertyCount - 1) { + hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes) + } + for(i in 0..memberCount - 1) { hashCode = 31 * hashCode + getMember(i).hashCode(stringIndexes, fqNameIndexes) } @@ -671,6 +893,80 @@ public fun ProtoBuf.Callable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes return hashCode } +public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { + var hashCode = 1 + + if (hasFlags()) { + hashCode = 31 * hashCode + flags + } + + for(i in 0..valueParameterCount - 1) { + hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { + var hashCode = 1 + + if (hasFlags()) { + hashCode = 31 * hashCode + flags + } + + hashCode = 31 * hashCode + stringIndexes(name) + + hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) + + for(i in 0..typeParameterCount - 1) { + hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasReceiverType()) { + hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) + } + + for(i in 0..valueParameterCount - 1) { + hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + +public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { + var hashCode = 1 + + if (hasFlags()) { + hashCode = 31 * hashCode + flags + } + + hashCode = 31 * hashCode + stringIndexes(name) + + hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) + + for(i in 0..typeParameterCount - 1) { + hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasReceiverType()) { + hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasSetterValueParameter()) { + hashCode = 31 * hashCode + setterValueParameter.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasGetterFlags()) { + hashCode = 31 * hashCode + getterFlags + } + + if (hasSetterFlags()) { + hashCode = 31 * hashCode + setterFlags + } + + return hashCode +} + public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index d123201c3e4..33b4b30916f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -16,7 +16,10 @@ package org.jetbrains.kotlin.jps.incremental +import com.google.protobuf.MessageLite import org.jetbrains.kotlin.descriptors.Visibilities +import org.jetbrains.kotlin.jps.incremental.ProtoCompareGenerated.ProtoBufClassKind +import org.jetbrains.kotlin.jps.incremental.ProtoCompareGenerated.ProtoBufPackageKind import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.Deserialization @@ -52,17 +55,16 @@ private abstract class DifferenceCalculator() { protected fun membersOrNone(names: Collection): DifferenceKind = if (names.isEmpty()) DifferenceKind.NONE else DifferenceKind.MEMBERS(names) - protected fun calcDifferenceForMembers( - oldList: List, - newList: List - ): Collection { + protected fun calcDifferenceForMembers(oldList: List, newList: List): Collection { val result = hashSetOf() - val oldMap = oldList.groupBy { it.hashCode({ compareObject.oldGetIndexOfString(it) }, { compareObject.oldGetIndexOfClassId(it) } )} - val newMap = newList.groupBy { it.hashCode({ compareObject.newGetIndexOfString(it) }, { compareObject.newGetIndexOfClassId(it) } )} + fun List.names(nameResolver: NameResolver): List = + map { it.name(nameResolver) } - fun List.names(nameResolver: NameResolver): List = - map { nameResolver.getString(it.name) } + val oldMap = + oldList.groupBy { it.getHashCode({ compareObject.oldGetIndexOfString(it) }, { compareObject.oldGetIndexOfClassId(it) }) } + val newMap = + newList.groupBy { it.getHashCode({ compareObject.newGetIndexOfString(it) }, { compareObject.newGetIndexOfClassId(it) }) } val hashes = oldMap.keySet() + newMap.keySet() for (hash in hashes) { @@ -81,8 +83,8 @@ private abstract class DifferenceCalculator() { } private fun calcDifferenceForEqualHashes( - oldList: List, - newList: List + oldList: List, + newList: List ): Collection { val result = hashSetOf() val newSet = HashSet(newList) @@ -93,12 +95,12 @@ private abstract class DifferenceCalculator() { newSet.remove(newMember) } else { - result.add(compareObject.oldNameResolver.getString(oldMember.name)) + result.add(oldMember.name(compareObject.oldNameResolver)) } } newSet.forEach { newMember -> - result.add(compareObject.newNameResolver.getString(newMember.name)) + result.add(newMember.name(compareObject.newNameResolver)) } return result @@ -113,8 +115,45 @@ private abstract class DifferenceCalculator() { return HashSetUtil.symmetricDifference(oldNames, newNames) } - protected val ProtoBuf.Callable.isPrivate: Boolean - get() = Visibilities.isPrivate(Deserialization.visibility(Flags.VISIBILITY.get(flags))) + protected val MessageLite.isPrivate: Boolean + get() = Visibilities.isPrivate(Deserialization.visibility( + when (this) { + is ProtoBuf.Callable -> Flags.VISIBILITY.get(flags) + is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags) + is ProtoBuf.Function -> Flags.VISIBILITY.get(flags) + is ProtoBuf.Property -> Flags.VISIBILITY.get(flags) + else -> error("Unknown message: $this") + })) + + private fun MessageLite.getHashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { + return when (this) { + is ProtoBuf.Callable -> hashCode(stringIndexes, fqNameIndexes) + is ProtoBuf.Constructor -> hashCode(stringIndexes, fqNameIndexes) + is ProtoBuf.Function -> hashCode(stringIndexes, fqNameIndexes) + is ProtoBuf.Property -> hashCode(stringIndexes, fqNameIndexes) + else -> error("Unknown message: $this") + } + } + + private fun MessageLite.name(nameResolver: NameResolver): String { + return when (this) { + is ProtoBuf.Callable -> nameResolver.getString(name) + is ProtoBuf.Constructor -> "" + is ProtoBuf.Function -> nameResolver.getString(name) + is ProtoBuf.Property -> nameResolver.getString(name) + else -> error("Unknown message: $this") + } + } + + private fun ProtoCompareGenerated.checkEquals(old: MessageLite, new: MessageLite): Boolean { + return when { + old is ProtoBuf.Callable && new is ProtoBuf.Callable -> checkEquals(old, new) + old is ProtoBuf.Constructor && new is ProtoBuf.Constructor -> checkEquals(old, new) + old is ProtoBuf.Function && new is ProtoBuf.Function -> checkEquals(old, new) + old is ProtoBuf.Property && new is ProtoBuf.Property -> checkEquals(old, new) + else -> error("Unknown message: $this") + } + } } private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { @@ -122,11 +161,11 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot private val CONSTRUCTOR = "" private val CLASS_SIGNATURE_ENUMS = EnumSet.of( - ProtoCompareGenerated.ProtoBufClassKind.FLAGS, - ProtoCompareGenerated.ProtoBufClassKind.FQ_NAME, - ProtoCompareGenerated.ProtoBufClassKind.TYPE_PARAMETER_LIST, - ProtoCompareGenerated.ProtoBufClassKind.SUPERTYPE_LIST, - ProtoCompareGenerated.ProtoBufClassKind.CLASS_ANNOTATION_LIST + ProtoBufClassKind.FLAGS, + ProtoBufClassKind.FQ_NAME, + ProtoBufClassKind.TYPE_PARAMETER_LIST, + ProtoBufClassKind.SUPERTYPE_LIST, + ProtoBufClassKind.CLASS_ANNOTATION_LIST ) } @@ -155,34 +194,43 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot fun Int.oldToNames() = names.add(oldNameResolver.getString(this)) fun Int.newToNames() = names.add(newNameResolver.getString(this)) + fun calcDifferenceForNonPrivateMembers(members: (ProtoBuf.Class) -> List): Collection { + val oldMembers = members(oldProto).filterNot { it.isPrivate } + val newMembers = members(newProto).filterNot { it.isPrivate } + return calcDifferenceForMembers(oldMembers, newMembers) + } + for (kind in diff) { when (kind!!) { - ProtoCompareGenerated.ProtoBufClassKind.COMPANION_OBJECT_NAME -> { + ProtoBufClassKind.COMPANION_OBJECT_NAME -> { if (oldProto.hasCompanionObjectName()) oldProto.companionObjectName.oldToNames() if (newProto.hasCompanionObjectName()) newProto.companionObjectName.newToNames() } - ProtoCompareGenerated.ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> + ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> names.addAll(calcDifferenceForNames(oldProto.nestedClassNameList, newProto.nestedClassNameList)) - ProtoCompareGenerated.ProtoBufClassKind.MEMBER_LIST -> { - val oldMembers = oldProto.memberList.filter { !it.isPrivate } - val newMembers = newProto.memberList.filter { !it.isPrivate } - names.addAll(calcDifferenceForMembers(oldMembers, newMembers)) - } - ProtoCompareGenerated.ProtoBufClassKind.ENUM_ENTRY_LIST -> + ProtoBufClassKind.CONSTRUCTOR_LIST -> + names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getConstructorList)) + ProtoBufClassKind.FUNCTION_LIST -> + names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList)) + ProtoBufClassKind.PROPERTY_LIST -> + names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList)) + ProtoBufClassKind.MEMBER_LIST -> + names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getMemberList)) + ProtoBufClassKind.ENUM_ENTRY_LIST -> names.addAll(calcDifferenceForNames(oldProto.enumEntryList, newProto.enumEntryList)) - ProtoCompareGenerated.ProtoBufClassKind.PRIMARY_CONSTRUCTOR -> + ProtoBufClassKind.PRIMARY_CONSTRUCTOR -> if (areNonPrivatePrimaryConstructorsDifferent()) { names.add(CONSTRUCTOR) } - ProtoCompareGenerated.ProtoBufClassKind.SECONDARY_CONSTRUCTOR_LIST -> + ProtoBufClassKind.SECONDARY_CONSTRUCTOR_LIST -> if (areNonPrivateSecondaryConstructorsDifferent()) { names.add(CONSTRUCTOR) } - ProtoCompareGenerated.ProtoBufClassKind.FLAGS, - ProtoCompareGenerated.ProtoBufClassKind.FQ_NAME, - ProtoCompareGenerated.ProtoBufClassKind.TYPE_PARAMETER_LIST, - ProtoCompareGenerated.ProtoBufClassKind.SUPERTYPE_LIST, - ProtoCompareGenerated.ProtoBufClassKind.CLASS_ANNOTATION_LIST -> + ProtoBufClassKind.FLAGS, + ProtoBufClassKind.FQ_NAME, + ProtoBufClassKind.TYPE_PARAMETER_LIST, + ProtoBufClassKind.SUPERTYPE_LIST, + ProtoBufClassKind.CLASS_ANNOTATION_LIST -> throw IllegalArgumentException("Unexpected kind: $kind") else -> throw IllegalArgumentException("Unsupported kind: $kind") @@ -237,14 +285,27 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa private fun getChangedMembersNames(): Set { val names = hashSetOf() + fun calcDifferenceForNonPrivateMembers(members: (ProtoBuf.Package) -> List): Collection { + val oldMembers = members(oldProto).filterNot { it.isPrivate } + val newMembers = members(newProto).filterNot { it.isPrivate } + return calcDifferenceForMembers(oldMembers, newMembers) + } + for (kind in diff) { when (kind!!) { - ProtoCompareGenerated.ProtoBufPackageKind.MEMBER_LIST -> - names.addAll(calcDifferenceForMembers(oldProto.memberList.filter { !it.isPrivate }, newProto.memberList.filter { !it.isPrivate })) + ProtoBufPackageKind.CONSTRUCTOR_LIST -> + names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getConstructorList)) + ProtoBufPackageKind.FUNCTION_LIST -> + names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getFunctionList)) + ProtoBufPackageKind.PROPERTY_LIST -> + names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getPropertyList)) + ProtoBufPackageKind.MEMBER_LIST -> + names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getMemberList)) else -> throw IllegalArgumentException("Unsupported kind: $kind") } } + return names } } From bdd8b3825b664be46917ace2e1cdab261e3fd46d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 30 Sep 2015 18:58:29 +0300 Subject: [PATCH 0547/1557] Write JVM signatures to new protobuf messages Original commit: 8c0a86617a9cd8f13f490a27ddc9e16afb5db61a --- .../jps/incremental/ProtoCompareGenerated.kt | 75 +++++++++++++++---- 1 file changed, 60 insertions(+), 15 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index f6ae431add2..2448adb56ba 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -203,19 +203,19 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.returnType, new.returnType)) return false - if (old.hasExtension(JvmProtoBuf.methodSignature) != new.hasExtension(JvmProtoBuf.methodSignature)) return false - if (old.hasExtension(JvmProtoBuf.methodSignature)) { - if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false + if (old.hasExtension(JvmProtoBuf.oldMethodSignature) != new.hasExtension(JvmProtoBuf.oldMethodSignature)) return false + if (old.hasExtension(JvmProtoBuf.oldMethodSignature)) { + if (!checkEquals(old.getExtension(JvmProtoBuf.oldMethodSignature), new.getExtension(JvmProtoBuf.oldMethodSignature))) return false } - if (old.hasExtension(JvmProtoBuf.propertySignature) != new.hasExtension(JvmProtoBuf.propertySignature)) return false - if (old.hasExtension(JvmProtoBuf.propertySignature)) { - if (!checkEquals(old.getExtension(JvmProtoBuf.propertySignature), new.getExtension(JvmProtoBuf.propertySignature))) return false + if (old.hasExtension(JvmProtoBuf.oldPropertySignature) != new.hasExtension(JvmProtoBuf.oldPropertySignature)) return false + if (old.hasExtension(JvmProtoBuf.oldPropertySignature)) { + if (!checkEquals(old.getExtension(JvmProtoBuf.oldPropertySignature), new.getExtension(JvmProtoBuf.oldPropertySignature))) return false } - if (old.hasExtension(JvmProtoBuf.implClassName) != new.hasExtension(JvmProtoBuf.implClassName)) return false - if (old.hasExtension(JvmProtoBuf.implClassName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.implClassName), new.getExtension(JvmProtoBuf.implClassName))) return false + if (old.hasExtension(JvmProtoBuf.oldImplClassName) != new.hasExtension(JvmProtoBuf.oldImplClassName)) return false + if (old.hasExtension(JvmProtoBuf.oldImplClassName)) { + if (!checkStringEquals(old.getExtension(JvmProtoBuf.oldImplClassName), new.getExtension(JvmProtoBuf.oldImplClassName))) return false } return true @@ -229,6 +229,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsConstructorValueParameter(old, new)) return false + if (old.hasExtension(JvmProtoBuf.constructorSignature) != new.hasExtension(JvmProtoBuf.constructorSignature)) return false + if (old.hasExtension(JvmProtoBuf.constructorSignature)) { + if (!checkEquals(old.getExtension(JvmProtoBuf.constructorSignature), new.getExtension(JvmProtoBuf.constructorSignature))) return false + } + return true } @@ -251,6 +256,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsFunctionValueParameter(old, new)) return false + if (old.hasExtension(JvmProtoBuf.methodSignature) != new.hasExtension(JvmProtoBuf.methodSignature)) return false + if (old.hasExtension(JvmProtoBuf.methodSignature)) { + if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false + } + + if (old.hasExtension(JvmProtoBuf.methodImplClassName) != new.hasExtension(JvmProtoBuf.methodImplClassName)) return false + if (old.hasExtension(JvmProtoBuf.methodImplClassName)) { + if (!checkStringEquals(old.getExtension(JvmProtoBuf.methodImplClassName), new.getExtension(JvmProtoBuf.methodImplClassName))) return false + } + return true } @@ -286,6 +301,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.setterFlags != new.setterFlags) return false } + if (old.hasExtension(JvmProtoBuf.propertySignature) != new.hasExtension(JvmProtoBuf.propertySignature)) return false + if (old.hasExtension(JvmProtoBuf.propertySignature)) { + if (!checkEquals(old.getExtension(JvmProtoBuf.propertySignature), new.getExtension(JvmProtoBuf.propertySignature))) return false + } + + if (old.hasExtension(JvmProtoBuf.propertyImplClassName) != new.hasExtension(JvmProtoBuf.propertyImplClassName)) return false + if (old.hasExtension(JvmProtoBuf.propertyImplClassName)) { + if (!checkStringEquals(old.getExtension(JvmProtoBuf.propertyImplClassName), new.getExtension(JvmProtoBuf.propertyImplClassName))) return false + } + return true } @@ -878,16 +903,16 @@ public fun ProtoBuf.Callable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) - if (hasExtension(JvmProtoBuf.methodSignature)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes) + if (hasExtension(JvmProtoBuf.oldMethodSignature)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.oldMethodSignature).hashCode(stringIndexes, fqNameIndexes) } - if (hasExtension(JvmProtoBuf.propertySignature)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.propertySignature).hashCode(stringIndexes, fqNameIndexes) + if (hasExtension(JvmProtoBuf.oldPropertySignature)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.oldPropertySignature).hashCode(stringIndexes, fqNameIndexes) } - if (hasExtension(JvmProtoBuf.implClassName)) { - hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.implClassName)) + if (hasExtension(JvmProtoBuf.oldImplClassName)) { + hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.oldImplClassName)) } return hashCode @@ -904,6 +929,10 @@ public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameInde hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) } + if (hasExtension(JvmProtoBuf.constructorSignature)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.constructorSignature).hashCode(stringIndexes, fqNameIndexes) + } + return hashCode } @@ -930,6 +959,14 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) } + if (hasExtension(JvmProtoBuf.methodSignature)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasExtension(JvmProtoBuf.methodImplClassName)) { + hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.methodImplClassName)) + } + return hashCode } @@ -964,6 +1001,14 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + setterFlags } + if (hasExtension(JvmProtoBuf.propertySignature)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.propertySignature).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasExtension(JvmProtoBuf.propertyImplClassName)) { + hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.propertyImplClassName)) + } + return hashCode } From 97b4d89f0b596f34566086c76a6bcde8d2aed599 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 1 Oct 2015 20:59:56 +0300 Subject: [PATCH 0548/1557] Use internal names in multifile class metadata To reuse the strings already existing in the constant pool of the class file Original commit: bdd69d9e4601a734b9cd6f7aed1968d9924bd42a --- .../jps/incremental/IncrementalCacheImpl.kt | 21 +++---------------- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 093349ccec1..ff37c5b5d2a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -198,7 +198,8 @@ public class IncrementalCacheImpl( inlineFunctionsMap.process(kotlinClass) } header.isCompatibleMultifileClassKind() -> { - val partNames = getFullNamesOfMultifileClassParts(kotlinClass) + val partNames = kotlinClass.classHeader.filePartClassNames?.toList() + ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}") multifileClassFacadeMap.add(className, partNames) // TODO NO_CHANGES? (delegates only, see package facade) @@ -208,8 +209,7 @@ public class IncrementalCacheImpl( header.isCompatibleMultifileClassPartKind() -> { assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) - val facadeClassName = getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass, header.multifileClassName!!) - multifileClassPartMap.add(className.internalName, facadeClassName) + multifileClassPartMap.add(className.internalName, header.multifileClassName!!) protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + @@ -698,21 +698,6 @@ private fun ByteArray.md5(): Long { ) } -private fun getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass: KotlinJvmBinaryClass, simpleName: String): String { - val classFqName = kotlinClass.classId.packageFqName.child(Name.identifier(simpleName)) - return JvmClassName.byFqNameWithoutInnerClasses(classFqName).internalName -} - -private fun getFullNamesOfMultifileClassParts(kotlinClass: LocalFileKotlinClass): List { - val classHeader = kotlinClass.classHeader - val partClassNames = classHeader.filePartClassNames ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}") - val fullNames = arrayListOf() - for (shortName in partClassNames) { - fullNames.add(getInternalNameOfTopLevelClassInTheSamePackage(kotlinClass, shortName)) - } - return fullNames -} - private abstract class StringMapExternalizer : DataExternalizer> { override fun save(out: DataOutput, map: Map?) { out.writeInt(map!!.size()) From 3721b5fbe901549a192d46fc816238528a11408b Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 7 Oct 2015 13:04:13 +0200 Subject: [PATCH 0549/1557] Extracting performance measuring utils into mini-framework, implement measurements of the rpc time, adding more measurements to performance logging, minor refactorings Original commit: be66c244674e86bff642b00aae46eb123c3d69b4 --- .../compilerRunner/KotlinCompilerRunner.kt | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 0dd541b1b9a..5e69b53f678 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -16,10 +16,6 @@ package org.jetbrains.kotlin.compilerRunner -import com.intellij.openapi.util.text.StringUtil -import com.intellij.util.ArrayUtil -import com.intellij.util.Function -import com.intellij.util.containers.ContainerUtil import com.intellij.util.xmlb.XmlSerializerUtil import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments @@ -34,16 +30,13 @@ import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil import org.jetbrains.kotlin.config.CompilerSettings import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.rmi.CompilerId -import org.jetbrains.kotlin.rmi.configureDaemonJVMOptions -import org.jetbrains.kotlin.rmi.configureDaemonOptions -import org.jetbrains.kotlin.rmi.isDaemonEnabled +import org.jetbrains.kotlin.rmi.* import org.jetbrains.kotlin.rmi.kotlinr.* -import org.jetbrains.kotlin.utils.rethrow import java.io.* import java.lang.reflect.Field import java.lang.reflect.Modifier import java.util.* +import java.util.concurrent.TimeUnit public object KotlinCompilerRunner { private val K2JVM_COMPILER = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" @@ -150,14 +143,9 @@ public object KotlinCompilerRunner { val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) for (msg in daemonReportMessages) { - if (msg.category === DaemonReportCategory.EXCEPTION && daemon == null) { - messageCollector.report(CompilerMessageSeverity.INFO, - "Falling back to compilation without daemon due to error: " + msg.message, - CompilerMessageLocation.NO_LOCATION) - } - else { - messageCollector.report(CompilerMessageSeverity.INFO, msg.message, CompilerMessageLocation.NO_LOCATION) - } + messageCollector.report(CompilerMessageSeverity.INFO, + (if (msg.category == DaemonReportCategory.EXCEPTION && daemon == null) "Falling back to compilation without daemon due to error: " else "") + msg.message, + CompilerMessageLocation.NO_LOCATION) } if (daemon != null) { @@ -168,12 +156,21 @@ public object KotlinCompilerRunner { incrementalCompilationComponents = environment.services.get(IncrementalCompilationComponents::class.java), compilationCanceledStatus = environment.services.get(CompilationCanceledStatus::class.java)) - val res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, services, compilerOut, daemonOut) + val profiler = if (daemonOptions.reportPerf) WallAndThreadTotalProfiler() else DummyProfiler() + + val res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, services, compilerOut, daemonOut, profiler) processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { messageCollector.report(CompilerMessageSeverity.INFO, it, CompilerMessageLocation.NO_LOCATION) } + if (daemonOptions.reportPerf) { + fun Long.ms() = TimeUnit.NANOSECONDS.toMillis(this) + val counters = profiler.getTotalCounters() + messageCollector.report(CompilerMessageSeverity.INFO, + "PERF: Daemon call total ${counters.time.ms()} ms, thread ${counters.threadTime.ms()}", + CompilerMessageLocation.NO_LOCATION) + } return true } } From 3756988fd4bc70e49cfbfb2cc6c4af0483210a1c Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 7 Oct 2015 12:28:33 +0200 Subject: [PATCH 0550/1557] Adding support for JS compilation on daemon Original commit: 99b638a58b30d2b34693deac993c0dbe7a603b92 --- .../kotlin/compilerRunner/KotlinCompilerRunner.kt | 15 ++++++++++----- .../kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 5e69b53f678..ece6f5bdd3d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -105,7 +105,7 @@ public object KotlinCompilerRunner { val argsArray = argumentsList.toTypedArray() - if (!tryCompileWithDaemon(messageCollector, collector, environment, argsArray)) { + if (!tryCompileWithDaemon(compilerClassName, argsArray, environment, messageCollector, collector)) { // otherwise fallback to in-process val stream = ByteArrayOutputStream() @@ -125,10 +125,10 @@ public object KotlinCompilerRunner { } - private fun tryCompileWithDaemon(messageCollector: MessageCollector, - collector: OutputItemsCollector, + private fun tryCompileWithDaemon(compilerClassName: String, + argsArray: Array, environment: CompilerEnvironment, - argsArray: Array): Boolean { + messageCollector: MessageCollector, collector: OutputItemsCollector): Boolean { if (isDaemonEnabled()) { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) @@ -158,7 +158,12 @@ public object KotlinCompilerRunner { val profiler = if (daemonOptions.reportPerf) WallAndThreadTotalProfiler() else DummyProfiler() - val res = KotlinCompilerClient.incrementalCompile(daemon, argsArray, services, compilerOut, daemonOut, profiler) + val targetPlatform = when (compilerClassName) { + K2JVM_COMPILER -> CompileService.TargetPlatform.JVM + K2JS_COMPILER -> CompileService.TargetPlatform.JS + else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName") + } + val res = KotlinCompilerClient.incrementalCompile(daemon, targetPlatform, argsArray, services, compilerOut, daemonOut, profiler) processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index f32820d9b48..920df5bb0b2 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -67,6 +67,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { rebuildAll() } + // TODO: add JS tests public fun testDaemon() { System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"") System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "") From fff380ee81e14dc8d91e8055bc3e1b7c271e2a0f Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 7 Oct 2015 13:10:52 +0200 Subject: [PATCH 0551/1557] Caching daemon connection in JPS, additional logging and minor perf measurements refactoring # Conflicts: # jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt Original commit: e27abe2f0351eaeea1bd1a440fde8d3c25b6f0e0 --- .../compilerRunner/KotlinCompilerRunner.kt | 76 ++++++++++++------- 1 file changed, 49 insertions(+), 27 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index ece6f5bdd3d..4e1eb3db364 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -125,30 +125,51 @@ public object KotlinCompilerRunner { } + internal class DaemonConnection(public val daemon: CompileService?) + + internal object getDaemonConnection { + private var connection: DaemonConnection? = null + + operator fun invoke(environment: CompilerEnvironment, messageCollector: MessageCollector): DaemonConnection? { + if (connection == null) { + val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) + val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) + val daemonOptions = configureDaemonOptions() + val daemonJVMOptions = configureDaemonJVMOptions(true) + + val daemonReportMessages = ArrayList() + + val profiler = if (daemonOptions.reportPerf) WallAndThreadAndMemoryTotalProfiler(withGC = false) else DummyProfiler() + + profiler.withMeasure(null) { + connection = DaemonConnection( + KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) + ) + } + + for (msg in daemonReportMessages) { + messageCollector.report(CompilerMessageSeverity.INFO, + (if (msg.category == DaemonReportCategory.EXCEPTION && connection?.daemon == null) "Falling back to compilation without daemon due to error: " else "") + msg.message, + CompilerMessageLocation.NO_LOCATION) + } + + reportTotalAndThreadPerf("Daemon connect", daemonOptions, messageCollector, profiler) + } + return connection + } + } + private fun tryCompileWithDaemon(compilerClassName: String, argsArray: Array, environment: CompilerEnvironment, - messageCollector: MessageCollector, collector: OutputItemsCollector): Boolean { + messageCollector: MessageCollector, + collector: OutputItemsCollector): Boolean { if (isDaemonEnabled()) { - val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) - // TODO: it may be a good idea to cache the compilerId, since making it means calculating digest over jar(s) and if \\ - // the lifetime of JPS process is small anyway, we can neglect the probability of changed compiler - val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) - val daemonOptions = configureDaemonOptions() - val daemonJVMOptions = configureDaemonJVMOptions(true) - val daemonReportMessages = ArrayList() + val connection = getDaemonConnection(environment, messageCollector) - val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) - - for (msg in daemonReportMessages) { - messageCollector.report(CompilerMessageSeverity.INFO, - (if (msg.category == DaemonReportCategory.EXCEPTION && daemon == null) "Falling back to compilation without daemon due to error: " else "") + msg.message, - CompilerMessageLocation.NO_LOCATION) - } - - if (daemon != null) { + if (connection?.daemon != null) { val compilerOut = ByteArrayOutputStream() val daemonOut = ByteArrayOutputStream() @@ -156,32 +177,33 @@ public object KotlinCompilerRunner { incrementalCompilationComponents = environment.services.get(IncrementalCompilationComponents::class.java), compilationCanceledStatus = environment.services.get(CompilationCanceledStatus::class.java)) - val profiler = if (daemonOptions.reportPerf) WallAndThreadTotalProfiler() else DummyProfiler() - val targetPlatform = when (compilerClassName) { K2JVM_COMPILER -> CompileService.TargetPlatform.JVM K2JS_COMPILER -> CompileService.TargetPlatform.JS else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName") } - val res = KotlinCompilerClient.incrementalCompile(daemon, targetPlatform, argsArray, services, compilerOut, daemonOut, profiler) + val res = KotlinCompilerClient.incrementalCompile(connection!!.daemon!!, targetPlatform, argsArray, services, compilerOut, daemonOut) processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { messageCollector.report(CompilerMessageSeverity.INFO, it, CompilerMessageLocation.NO_LOCATION) } - if (daemonOptions.reportPerf) { - fun Long.ms() = TimeUnit.NANOSECONDS.toMillis(this) - val counters = profiler.getTotalCounters() - messageCollector.report(CompilerMessageSeverity.INFO, - "PERF: Daemon call total ${counters.time.ms()} ms, thread ${counters.threadTime.ms()}", - CompilerMessageLocation.NO_LOCATION) - } return true } } return false } + private fun reportTotalAndThreadPerf(message: String, daemonOptions: DaemonOptions, messageCollector: MessageCollector, profiler: Profiler) { + if (daemonOptions.reportPerf) { + fun Long.ms() = TimeUnit.NANOSECONDS.toMillis(this) + val counters = profiler.getTotalCounters() + messageCollector.report(INFO, + "PERF: $message ${counters.time.ms()} ms, thread ${counters.threadTime.ms()}", + CompilerMessageLocation.NO_LOCATION) + } + } + private fun getReturnCodeFromObject(rc: Any?): String { when { rc == null -> return INTERNAL_ERROR From c651a58e692b8b43a4accd40695a06905811879c Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 30 Sep 2015 21:27:31 +0300 Subject: [PATCH 0552/1557] Replace sort with sorted. Original commit: 37a0347669ccf15e95b1f833a499f24e292da3d4 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- .../jps/build/classFilesComparison/classFilesComparison.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 2da6fb54ed7..4ccda971bda 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -314,7 +314,7 @@ public abstract class AbstractIncrementalJpsTest( val mapping = project.dataManager.getSourceToOutputMap(target) mapping.sources.forEach { - val outputs = mapping.getOutputs(it)!!.sort() + val outputs = mapping.getOutputs(it)!!.sorted() if (outputs.isNotEmpty()) { result.println("source $it -> $outputs") } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 0bcb5bc3135..c41e3a5e127 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -640,7 +640,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { """Classpath entry points to a non-existent location: TEST_PATH/some/test.class"""), warnings.map { it.messageText.replace(File("").absolutePath, "TEST_PATH").replace("\\", "/") - }.sort().toTypedArray() + }.sorted().toTypedArray() ) } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index f62eca04266..edaa010f617 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -53,7 +53,7 @@ fun getDirectoryString(dir: File, interestingPaths: List): String { val listFiles = dir.listFiles() assertNotNull(listFiles) - val children = listFiles!!.toList().sortBy { it.getName() }.sortBy { it.isDirectory() } + val children = listFiles!!.toList().sortedBy { it.getName() }.sortedBy { it.isDirectory() } for (child in children) { if (child.isDirectory()) { p.println(child.name) @@ -101,7 +101,7 @@ fun assertEqualDirectories(expected: File, actual: File, forgiveExtraFiles: Bool val commonPaths = Sets.intersection(pathsInExpected, pathsInActual) val changedPaths = commonPaths .filter { DUMP_ALL || !Arrays.equals(File(expected, it).readBytes(), File(actual, it).readBytes()) } - .sort() + .sorted() val expectedString = getDirectoryString(expected, changedPaths) val actualString = getDirectoryString(actual, changedPaths) From 3f0f62fccd4eb8de6b80ace3ca25ab7b2f2b066b Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 1 Oct 2015 20:13:34 +0300 Subject: [PATCH 0553/1557] Replace assert with lazy assert, times with repeat. Original commit: 3106458cc4dc79edf0221186a1277f268e3a098f --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 0658069ddef..5905b0899f6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -158,7 +158,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val lookupTracker = project.container.getChild(LOOKUP_TRACKER)?.let { - assert("true".equals(System.getProperty("kotlin.jps.tests"), ignoreCase = true), "LOOKUP_TRACKER allowed only for jps tests") + assert("true".equals(System.getProperty("kotlin.jps.tests"), ignoreCase = true)) { "LOOKUP_TRACKER allowed only for jps tests" } it.data } ?: LookupTracker.DO_NOTHING diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index c41e3a5e127..3adf53cfde1 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -549,7 +549,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val result = HashSet() for (file in files) { val relativePath = FileUtil.getRelativePath(baseDir, file) - assert(relativePath != null, "relativePath should not be null") + assert(relativePath != null) { "relativePath should not be null" } result.add(toSystemIndependentName(relativePath!!)) } return result @@ -581,7 +581,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertCanceled(buildResult) buildResult.assertSuccessful() - assert(interval < 8000, "expected time for canceled compilation < 8000 ms, but $interval") + assert(interval < 8000) { "expected time for canceled compilation < 8000 ms, but $interval" } val module = myProject.getModules().get(0) assertFilesNotExistInOutput(module, "foo/Foo.class") From fea6e227fbc041d3bd791a2033c3df990b36446a Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 1 Oct 2015 22:31:17 +0300 Subject: [PATCH 0554/1557] Replace KotlinPackage legacy facade with corresponding package parts. Original commit: 90e5ee8a7ed58189893e29ae1d8b33ad984b79ba --- .../kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 4b55b5d3572..9403b29609b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -21,7 +21,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; -import kotlin.KotlinPackage; +import kotlin.CollectionsKt; import kotlin.io.IoPackage; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -173,7 +173,7 @@ public class KotlinBuilderModuleScriptGenerator { } } - return KotlinPackage.toList(annotationRootFiles); + return CollectionsKt.toList(annotationRootFiles); } @NotNull From f63d5e372ccbf7d202f990eafa74fbbce01ace90 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 1 Oct 2015 22:42:14 +0300 Subject: [PATCH 0555/1557] Replace IoPackage legacy facade with corresponding package parts. Original commit: fa491c8f1fcbf60c4f0a87a2542bc1d15f6d6b30 --- .../kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 9403b29609b..507cd7f90a3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -22,7 +22,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; import kotlin.CollectionsKt; -import kotlin.io.IoPackage; +import kotlin.io.FilesKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.ModuleChunk; @@ -123,7 +123,7 @@ public class KotlinBuilderModuleScriptGenerator { @Override public boolean value(File file) { if (!file.exists()) { - String extension = IoPackage.getExtension(file); + String extension = FilesKt.getExtension(file); // Don't filter out files, we want to report warnings about absence through the common place if (!(extension.equals("class") || extension.equals("jar"))) { From eec9d11a8642871c1497116f2e8bd1160fd91545 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 6 Oct 2015 22:00:01 +0300 Subject: [PATCH 0556/1557] Do not sort twice Original commit: 17fc1d95624fe69fd0e53362c5ec7b0ac676ac83 --- .../jps/build/classFilesComparison/classFilesComparison.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index edaa010f617..4025ae926fd 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -53,7 +53,7 @@ fun getDirectoryString(dir: File, interestingPaths: List): String { val listFiles = dir.listFiles() assertNotNull(listFiles) - val children = listFiles!!.toList().sortedBy { it.getName() }.sortedBy { it.isDirectory() } + val children = listFiles!!.sortedWith(compareBy ({ it.directory }, { it.name } )) for (child in children) { if (child.isDirectory()) { p.println(child.name) From 1dcc772f45c177027c2c3b75f41b0fdec1a68e1c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 24 Apr 2015 19:22:37 +0300 Subject: [PATCH 0557/1557] Drop external annotations support in build tools External annotations will only be considered in the IDE for additional inspections based on more precise types in Java libraries Original commit: 13c54a2678ee26efd594285644c8ac9b3d6b5b1a --- .../KotlinBuilderModuleScriptGenerator.java | 36 ------------------- .../modules/KotlinModuleXmlBuilder.java | 9 ----- .../build/AbstractKotlinJpsBuildTestCase.java | 2 -- .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 1 - .../modules/KotlinModuleXmlGeneratorTest.java | 4 --- 5 files changed, 52 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 507cd7f90a3..5da0e4c8c64 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -33,14 +33,6 @@ import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.ProjectBuildException; -import org.jetbrains.jps.model.java.JpsAnnotationRootType; -import org.jetbrains.jps.model.java.JpsJavaSdkType; -import org.jetbrains.jps.model.library.JpsLibrary; -import org.jetbrains.jps.model.library.sdk.JpsSdk; -import org.jetbrains.jps.model.library.sdk.JpsSdkType; -import org.jetbrains.jps.model.module.JpsDependencyElement; -import org.jetbrains.jps.model.module.JpsModule; -import org.jetbrains.jps.model.module.JpsSdkDependency; import org.jetbrains.kotlin.config.IncrementalCompilation; import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder; @@ -92,7 +84,6 @@ public class KotlinBuilderModuleScriptGenerator { moduleSources, findSourceRoots(context, target), findClassPathRoots(target), - findAnnotationRoots(target), (JavaModuleBuildTargetType) targetType, // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs @@ -149,33 +140,6 @@ public class KotlinBuilderModuleScriptGenerator { return result; } - @NotNull - private static List findAnnotationRoots(@NotNull ModuleBuildTarget target) { - LinkedHashSet annotationRootFiles = new LinkedHashSet(); - - JpsModule module = target.getModule(); - JpsSdk sdk = module.getSdk(getSdkType(module)); - if (sdk != null) { - annotationRootFiles.addAll(sdk.getParent().getFiles(JpsAnnotationRootType.INSTANCE)); - } - - for (JpsLibrary library : getAllDependencies(target).getLibraries()) { - annotationRootFiles.addAll(library.getFiles(JpsAnnotationRootType.INSTANCE)); - } - - // JDK is stored locally on user's machine, so its configuration, including external annotation paths - // is not available on TeamCity. When running on TeamCity, one has to provide extra path to JDK annotations - String extraAnnotationsPaths = System.getProperty("jps.kotlin.extra.annotation.paths"); - if (extraAnnotationsPaths != null) { - String[] paths = extraAnnotationsPaths.split(";"); - for (String path : paths) { - annotationRootFiles.add(new File(path)); - } - } - - return CollectionsKt.toList(annotationRootFiles); - } - @NotNull private static JpsSdkType getSdkType(@NotNull JpsModule module) { for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java index 1df8e11addd..a74c1a2f29b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java @@ -45,7 +45,6 @@ public class KotlinModuleXmlBuilder { List sourceFiles, List javaSourceRoots, Collection classpathRoots, - List annotationRoots, JavaModuleBuildTargetType targetType, Set directoriesToFilterOut ) { @@ -71,7 +70,6 @@ public class KotlinModuleXmlBuilder { processJavaSourceRoots(javaSourceRoots); processClasspath(classpathRoots, directoriesToFilterOut); - processAnnotationRoots(annotationRoots); closeTag(p, MODULE); return this; @@ -102,13 +100,6 @@ public class KotlinModuleXmlBuilder { } } - private void processAnnotationRoots(@NotNull List files) { - p.println(""); - for (File file : files) { - p.println("<", EXTERNAL_ANNOTATIONS, " ", PATH, "=\"", getEscapedPath(file), "\"/>"); - } - } - private void processJavaSourceRoots(@NotNull List files) { p.println(""); for (File file : files) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index c72a724e30f..b633b033098 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -22,7 +22,6 @@ import org.jetbrains.jps.builders.JpsBuildTestCase; import org.jetbrains.jps.model.JpsDummyElement; import org.jetbrains.jps.model.JpsModuleRootModificationUtil; import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.java.JpsAnnotationRootType; import org.jetbrains.jps.model.java.JpsJavaDependencyScope; import org.jetbrains.jps.model.java.JpsJavaLibraryType; import org.jetbrains.jps.model.java.JpsJavaSdkType; @@ -73,7 +72,6 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { String versionString = System.getProperty("java.version"); JpsTypedLibrary> jdk = myModel.getGlobal().addSdk(name, homePath, versionString, JpsJavaSdkType.INSTANCE); jdk.addRoot(JpsPathUtil.pathToUrl(path), JpsOrderRootType.COMPILED); - jdk.addRoot(JpsPathUtil.pathToUrl(PathUtil.getKotlinPathsForDistDirectory().getJdkAnnotationsPath().getAbsolutePath()), JpsAnnotationRootType.INSTANCE); return jdk.getProperties(); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 0a22bde715a..ccc56bb75a3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -45,7 +45,6 @@ public class ClasspathOrderTest : TestCaseWithTmpdir() { listOf(sourceDir), listOf(sourceDir), listOf(PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()), - listOf(), JavaModuleBuildTargetType.PRODUCTION, setOf() ).asText().toString() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index 0e40545b642..8c53fb95d41 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -32,7 +32,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.singletonList(new File("java")), Arrays.asList(new File("cp1"), new File("cp2")), - Arrays.asList(new File("a1/f1"), new File("a2")), JavaModuleBuildTargetType.PRODUCTION, Collections.emptySet() ).asText().toString(); @@ -46,7 +45,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), - Arrays.asList(new File("a1/f1"), new File("a2")), JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) ).asText().toString(); @@ -61,7 +59,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), - Arrays.asList(new File("a1/f1"), new File("a2")), JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) ); @@ -71,7 +68,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s12"), new File("s22")), Collections.emptyList(), Arrays.asList(new File("cp12"), new File("cp22")), - Arrays.asList(new File("a12/f12"), new File("a22")), JavaModuleBuildTargetType.TEST, Collections.singleton(new File("cp12")) ); From 6bbf3aaf66be17bf1f2840e684ed59afdde848a5 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 8 Oct 2015 13:55:39 +0200 Subject: [PATCH 0558/1557] restore compilation after rebase of dropping external annotations; fix affected tests Original commit: 7e2c2ef6784940adfe376b1cdaebc09afa8b9f0d --- .../kotlin/compilerRunner/KotlinCompilerRunner.kt | 1 - .../jps/build/KotlinBuilderModuleScriptGenerator.java | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 4e1eb3db364..8c6da3b0209 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -246,7 +246,6 @@ public object KotlinCompilerRunner { with(settings) { module = moduleFile.absolutePath noStdlib = true - noJdkAnnotations = true noJdk = true } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 5da0e4c8c64..3425490f7c7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -21,7 +21,6 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.MultiMap; -import kotlin.CollectionsKt; import kotlin.io.FilesKt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -140,15 +139,5 @@ public class KotlinBuilderModuleScriptGenerator { return result; } - @NotNull - private static JpsSdkType getSdkType(@NotNull JpsModule module) { - for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) { - if (dependency instanceof JpsSdkDependency) { - return ((JpsSdkDependency) dependency).getSdkType(); - } - } - return JpsJavaSdkType.INSTANCE; - } - private KotlinBuilderModuleScriptGenerator() {} } From 1ebdbd18dcc8aa2a805472bb2f4b431f555ff168 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 7 Oct 2015 18:02:02 +0300 Subject: [PATCH 0559/1557] Copy to interface just companion object public const properties Original commit: 12afbffb09bd6de654678636b1f6e2372334614b --- .../pureKotlin/traitClassObjectConstantChanged/const.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt index 6d7566e3856..0fe79d3540c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt @@ -3,6 +3,6 @@ package test interface Trait { companion object { // Old and new constant values are different, but their hashes are the same - val CONST = "BF" + const val CONST = "BF" } } From 533a26ef9d39777ab50cb3e08696c61edc10d6f6 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 8 Oct 2015 19:51:02 +0300 Subject: [PATCH 0560/1557] Old backing field with dollar is now forbidden Original commit: 6914d09297f678bd5b8fed9c22c67729592bc9ed --- .../incremental/lookupTracker/classifierMembers/foo.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index a909d94a91a..1c11f0893af 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -10,8 +10,8 @@ import bar.* get() = /*c:foo.A*/b var d: /*c:foo.A c:foo.A.Companion p:foo*/String = "ddd" - get() = /*c:foo.A*/$d - set(v) { /*c:foo.A*/$d = v } + get() = field + set(v) { field = v } fun foo() { /*c:foo.A*/a From adda2782987dd1d6fd6c64d4400df29b53048f97 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 8 Oct 2015 20:06:26 +0300 Subject: [PATCH 0561/1557] Local interfaces are forbidden now Original commit: 2fee9d362ceae7a0b42d887c18cf687c7c76f460 --- .../incremental/lookupTracker/localDeclarations/locals.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index 534ee1d4fc3..4de42a1547a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -10,12 +10,12 @@ import bar.* fun localFun() = b fun /*p:local.declarations*/Int.localExtFun() = localFun() - interface LocalI { - var a: /*p:local.declarations*/Int - fun foo() + abstract class LocalI { + abstract var a: /*p:local.declarations*/Int + abstract fun foo() } - class LocalC : LocalI { + class LocalC : LocalI() { override var a = 1 override fun foo() {} From 6e19e8c05549cb50f91f88115eafa35f331b8378 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Mon, 5 Oct 2015 20:18:58 +0300 Subject: [PATCH 0562/1557] Replace get() and set() to getValue() and setValue() (property delegates) Original commit: 1f2b4e20fe9c628427fba15e57d556b95c528ba9 --- .../lookupTracker/conventions/delegateProperty.kt | 12 ++++++------ .../inlineGet.kt | 2 +- .../inlineGet.kt.new.1 | 2 +- .../inlineSet.kt | 2 +- .../inlineSet.kt.new.2 | 2 +- .../delegatedPropertyInlineMethodAccessor/inline.kt | 4 ++-- .../inline.kt.new.1 | 4 ++-- .../inline.kt.new.2 | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 073c7bfbcb7..b6595d9bbbb 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -18,11 +18,11 @@ package foo.bar } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(get) c:foo.bar.D1(set) p:foo.bar(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(get) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(set) p:foo.bar(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(setValue) p:foo.bar(setValue) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(setValue) p:foo.bar(setValue) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt index 405ef2eef20..1277c339dca 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt @@ -1,5 +1,5 @@ package inline -inline fun Inline.get(receiver: Any?, prop: PropertyMetadata): Int { +inline fun Inline.getValue(receiver: Any?, prop: PropertyMetadata): Int { return 0 } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 index efc57e7afd9..3ed00a5f3b1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 @@ -1,5 +1,5 @@ package inline -inline fun Inline.get(receiver: Any?, prop: PropertyMetadata): Int { +inline fun Inline.getValue(receiver: Any?, prop: PropertyMetadata): Int { return 1 } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt index ffebce91d6a..0a9a76e7be4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt @@ -1,5 +1,5 @@ package inline -inline fun Inline.set(receiver: Any?, prop: PropertyMetadata, value: Int) { +inline fun Inline.setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value) } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 index 4eda0b9b94e..446a5ad574c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 @@ -1,5 +1,5 @@ package inline -inline fun Inline.set(receiver: Any?, prop: PropertyMetadata, value: Int) { +inline fun Inline.setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value * 2) } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt index 5840d17a8a3..470f1f47d05 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt @@ -1,11 +1,11 @@ package inline class Inline { - inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { return 0 } - inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value) } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 index bb80da599b8..49af798d65d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 @@ -1,11 +1,11 @@ package inline class Inline { - inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { return 1 } - inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value) } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 index 17180968e7a..d0a03b3014f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 @@ -1,11 +1,11 @@ package inline class Inline { - inline fun get(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { return 1 } - inline fun set(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { println(value * 2) } } \ No newline at end of file From 739cdb5c29d0595fd26ca933427ff36f4657b331 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 5 Oct 2015 11:18:06 +0300 Subject: [PATCH 0563/1557] Drop Callable and primary/secondary constructor proto messages Original commit: e4efa27b76facabfb091e3af03cbfde51ca8cb47 --- .../jps/incremental/ProtoCompareGenerated.kt | 287 ++---------------- .../jps/incremental/protoDifferenceUtils.kt | 44 --- 2 files changed, 32 insertions(+), 299 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 2448adb56ba..da4adbf258f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -35,10 +35,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi private val classIds = Interner() open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { - if (!checkEqualsPackageMember(old, new)) return false - - if (!checkEqualsPackageConstructor(old, new)) return false - if (!checkEqualsPackageFunction(old, new)) return false if (!checkEqualsPackageProperty(old, new)) return false @@ -46,8 +42,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } public enum class ProtoBufPackageKind { - MEMBER_LIST, - CONSTRUCTOR_LIST, FUNCTION_LIST, PROPERTY_LIST } @@ -55,10 +49,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { val result = EnumSet.noneOf(ProtoBufPackageKind::class.java) - if (!checkEqualsPackageMember(old, new)) result.add(ProtoBufPackageKind.MEMBER_LIST) - - if (!checkEqualsPackageConstructor(old, new)) result.add(ProtoBufPackageKind.CONSTRUCTOR_LIST) - if (!checkEqualsPackageFunction(old, new)) result.add(ProtoBufPackageKind.FUNCTION_LIST) if (!checkEqualsPackageProperty(old, new)) result.add(ProtoBufPackageKind.PROPERTY_LIST) @@ -91,17 +81,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassProperty(old, new)) return false - if (!checkEqualsClassMember(old, new)) return false - if (!checkEqualsClassEnumEntry(old, new)) return false - if (old.hasPrimaryConstructor() != new.hasPrimaryConstructor()) return false - if (old.hasPrimaryConstructor()) { - if (!checkEquals(old.primaryConstructor, new.primaryConstructor)) return false - } - - if (!checkEqualsClassSecondaryConstructor(old, new)) return false - if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) return false for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { @@ -120,10 +101,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi CONSTRUCTOR_LIST, FUNCTION_LIST, PROPERTY_LIST, - MEMBER_LIST, ENUM_ENTRY_LIST, - PRIMARY_CONSTRUCTOR, - SECONDARY_CONSTRUCTOR_LIST, CLASS_ANNOTATION_LIST } @@ -154,17 +132,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassProperty(old, new)) result.add(ProtoBufClassKind.PROPERTY_LIST) - if (!checkEqualsClassMember(old, new)) result.add(ProtoBufClassKind.MEMBER_LIST) - if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST) - if (old.hasPrimaryConstructor() != new.hasPrimaryConstructor()) result.add(ProtoBufClassKind.PRIMARY_CONSTRUCTOR) - if (old.hasPrimaryConstructor()) { - if (!checkEquals(old.primaryConstructor, new.primaryConstructor)) result.add(ProtoBufClassKind.PRIMARY_CONSTRUCTOR) - } - - if (!checkEqualsClassSecondaryConstructor(old, new)) result.add(ProtoBufClassKind.SECONDARY_CONSTRUCTOR_LIST) - if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST) for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { @@ -174,69 +143,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return result } - open fun checkEquals(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean { - if (old.hasFlags() != new.hasFlags()) return false - if (old.hasFlags()) { - if (old.flags != new.flags) return false - } - - if (old.hasGetterFlags() != new.hasGetterFlags()) return false - if (old.hasGetterFlags()) { - if (old.getterFlags != new.getterFlags) return false - } - - if (old.hasSetterFlags() != new.hasSetterFlags()) return false - if (old.hasSetterFlags()) { - if (old.setterFlags != new.setterFlags) return false - } - - if (!checkEqualsCallableTypeParameter(old, new)) return false - - if (old.hasReceiverType() != new.hasReceiverType()) return false - if (old.hasReceiverType()) { - if (!checkEquals(old.receiverType, new.receiverType)) return false - } - - if (!checkStringEquals(old.name, new.name)) return false - - if (!checkEqualsCallableValueParameter(old, new)) return false - - if (!checkEquals(old.returnType, new.returnType)) return false - - if (old.hasExtension(JvmProtoBuf.oldMethodSignature) != new.hasExtension(JvmProtoBuf.oldMethodSignature)) return false - if (old.hasExtension(JvmProtoBuf.oldMethodSignature)) { - if (!checkEquals(old.getExtension(JvmProtoBuf.oldMethodSignature), new.getExtension(JvmProtoBuf.oldMethodSignature))) return false - } - - if (old.hasExtension(JvmProtoBuf.oldPropertySignature) != new.hasExtension(JvmProtoBuf.oldPropertySignature)) return false - if (old.hasExtension(JvmProtoBuf.oldPropertySignature)) { - if (!checkEquals(old.getExtension(JvmProtoBuf.oldPropertySignature), new.getExtension(JvmProtoBuf.oldPropertySignature))) return false - } - - if (old.hasExtension(JvmProtoBuf.oldImplClassName) != new.hasExtension(JvmProtoBuf.oldImplClassName)) return false - if (old.hasExtension(JvmProtoBuf.oldImplClassName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.oldImplClassName), new.getExtension(JvmProtoBuf.oldImplClassName))) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean { - if (old.hasFlags() != new.hasFlags()) return false - if (old.hasFlags()) { - if (old.flags != new.flags) return false - } - - if (!checkEqualsConstructorValueParameter(old, new)) return false - - if (old.hasExtension(JvmProtoBuf.constructorSignature) != new.hasExtension(JvmProtoBuf.constructorSignature)) return false - if (old.hasExtension(JvmProtoBuf.constructorSignature)) { - if (!checkEquals(old.getExtension(JvmProtoBuf.constructorSignature), new.getExtension(JvmProtoBuf.constructorSignature))) return false - } - - return true - } - open fun checkEquals(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean { if (old.hasFlags() != new.hasFlags()) return false if (old.hasFlags()) { @@ -376,10 +282,17 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - open fun checkEquals(old: ProtoBuf.Class.PrimaryConstructor, new: ProtoBuf.Class.PrimaryConstructor): Boolean { - if (old.hasData() != new.hasData()) return false - if (old.hasData()) { - if (!checkEquals(old.data, new.data)) return false + open fun checkEquals(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean { + if (old.hasFlags() != new.hasFlags()) return false + if (old.hasFlags()) { + if (old.flags != new.flags) return false + } + + if (!checkEqualsConstructorValueParameter(old, new)) return false + + if (old.hasExtension(JvmProtoBuf.constructorSignature) != new.hasExtension(JvmProtoBuf.constructorSignature)) return false + if (old.hasExtension(JvmProtoBuf.constructorSignature)) { + if (!checkEquals(old.getExtension(JvmProtoBuf.constructorSignature), new.getExtension(JvmProtoBuf.constructorSignature))) return false } return true @@ -529,26 +442,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - open fun checkEqualsPackageMember(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { - if (old.memberCount != new.memberCount) return false - - for(i in 0..old.memberCount - 1) { - if (!checkEquals(old.getMember(i), new.getMember(i))) return false - } - - return true - } - - open fun checkEqualsPackageConstructor(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { - if (old.constructorCount != new.constructorCount) return false - - for(i in 0..old.constructorCount - 1) { - if (!checkEquals(old.getConstructor(i), new.getConstructor(i))) return false - } - - return true - } - open fun checkEqualsPackageFunction(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { if (old.functionCount != new.functionCount) return false @@ -629,16 +522,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - open fun checkEqualsClassMember(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.memberCount != new.memberCount) return false - - for(i in 0..old.memberCount - 1) { - if (!checkEquals(old.getMember(i), new.getMember(i))) return false - } - - return true - } - open fun checkEqualsClassEnumEntry(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { if (old.enumEntryCount != new.enumEntryCount) return false @@ -649,46 +532,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - open fun checkEqualsClassSecondaryConstructor(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.secondaryConstructorCount != new.secondaryConstructorCount) return false - - for(i in 0..old.secondaryConstructorCount - 1) { - if (!checkEquals(old.getSecondaryConstructor(i), new.getSecondaryConstructor(i))) return false - } - - return true - } - - open fun checkEqualsCallableTypeParameter(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean { - if (old.typeParameterCount != new.typeParameterCount) return false - - for(i in 0..old.typeParameterCount - 1) { - if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false - } - - return true - } - - open fun checkEqualsCallableValueParameter(old: ProtoBuf.Callable, new: ProtoBuf.Callable): Boolean { - if (old.valueParameterCount != new.valueParameterCount) return false - - for(i in 0..old.valueParameterCount - 1) { - if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false - } - - return true - } - - open fun checkEqualsConstructorValueParameter(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean { - if (old.valueParameterCount != new.valueParameterCount) return false - - for(i in 0..old.valueParameterCount - 1) { - if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false - } - - return true - } - open fun checkEqualsFunctionTypeParameter(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean { if (old.typeParameterCount != new.typeParameterCount) return false @@ -739,6 +582,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEqualsConstructorValueParameter(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean { + if (old.valueParameterCount != new.valueParameterCount) return false + + for(i in 0..old.valueParameterCount - 1) { + if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false + } + + return true + } + open fun checkEqualsAnnotationArgument(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { if (old.argumentCount != new.argumentCount) return false @@ -793,14 +646,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 - for(i in 0..memberCount - 1) { - hashCode = 31 * hashCode + getMember(i).hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..constructorCount - 1) { - hashCode = 31 * hashCode + getConstructor(i).hashCode(stringIndexes, fqNameIndexes) - } - for(i in 0..functionCount - 1) { hashCode = 31 * hashCode + getFunction(i).hashCode(stringIndexes, fqNameIndexes) } @@ -849,22 +694,10 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: ( hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes) } - for(i in 0..memberCount - 1) { - hashCode = 31 * hashCode + getMember(i).hashCode(stringIndexes, fqNameIndexes) - } - for(i in 0..enumEntryCount - 1) { hashCode = 31 * hashCode + stringIndexes(getEnumEntry(i)) } - if (hasPrimaryConstructor()) { - hashCode = 31 * hashCode + primaryConstructor.hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..secondaryConstructorCount - 1) { - hashCode = 31 * hashCode + getSecondaryConstructor(i).hashCode(stringIndexes, fqNameIndexes) - } - for(i in 0..getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes) } @@ -872,70 +705,6 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: ( return hashCode } -public fun ProtoBuf.Callable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasFlags()) { - hashCode = 31 * hashCode + flags - } - - if (hasGetterFlags()) { - hashCode = 31 * hashCode + getterFlags - } - - if (hasSetterFlags()) { - hashCode = 31 * hashCode + setterFlags - } - - for(i in 0..typeParameterCount - 1) { - hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasReceiverType()) { - hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) - } - - hashCode = 31 * hashCode + stringIndexes(name) - - for(i in 0..valueParameterCount - 1) { - hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) - } - - hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) - - if (hasExtension(JvmProtoBuf.oldMethodSignature)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.oldMethodSignature).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasExtension(JvmProtoBuf.oldPropertySignature)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.oldPropertySignature).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasExtension(JvmProtoBuf.oldImplClassName)) { - hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.oldImplClassName)) - } - - return hashCode -} - -public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasFlags()) { - hashCode = 31 * hashCode + flags - } - - for(i in 0..valueParameterCount - 1) { - hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasExtension(JvmProtoBuf.constructorSignature)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.constructorSignature).hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} - public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 @@ -1072,11 +841,19 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I return hashCode } -public fun ProtoBuf.Class.PrimaryConstructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 - if (hasData()) { - hashCode = 31 * hashCode + data.hashCode(stringIndexes, fqNameIndexes) + if (hasFlags()) { + hashCode = 31 * hashCode + flags + } + + for(i in 0..valueParameterCount - 1) { + hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasExtension(JvmProtoBuf.constructorSignature)) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.constructorSignature).hashCode(stringIndexes, fqNameIndexes) } return hashCode diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 33b4b30916f..f80ba52a0cf 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -118,7 +118,6 @@ private abstract class DifferenceCalculator() { protected val MessageLite.isPrivate: Boolean get() = Visibilities.isPrivate(Deserialization.visibility( when (this) { - is ProtoBuf.Callable -> Flags.VISIBILITY.get(flags) is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags) is ProtoBuf.Function -> Flags.VISIBILITY.get(flags) is ProtoBuf.Property -> Flags.VISIBILITY.get(flags) @@ -127,7 +126,6 @@ private abstract class DifferenceCalculator() { private fun MessageLite.getHashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { return when (this) { - is ProtoBuf.Callable -> hashCode(stringIndexes, fqNameIndexes) is ProtoBuf.Constructor -> hashCode(stringIndexes, fqNameIndexes) is ProtoBuf.Function -> hashCode(stringIndexes, fqNameIndexes) is ProtoBuf.Property -> hashCode(stringIndexes, fqNameIndexes) @@ -137,7 +135,6 @@ private abstract class DifferenceCalculator() { private fun MessageLite.name(nameResolver: NameResolver): String { return when (this) { - is ProtoBuf.Callable -> nameResolver.getString(name) is ProtoBuf.Constructor -> "" is ProtoBuf.Function -> nameResolver.getString(name) is ProtoBuf.Property -> nameResolver.getString(name) @@ -147,7 +144,6 @@ private abstract class DifferenceCalculator() { private fun ProtoCompareGenerated.checkEquals(old: MessageLite, new: MessageLite): Boolean { return when { - old is ProtoBuf.Callable && new is ProtoBuf.Callable -> checkEquals(old, new) old is ProtoBuf.Constructor && new is ProtoBuf.Constructor -> checkEquals(old, new) old is ProtoBuf.Function && new is ProtoBuf.Function -> checkEquals(old, new) old is ProtoBuf.Property && new is ProtoBuf.Property -> checkEquals(old, new) @@ -158,8 +154,6 @@ private abstract class DifferenceCalculator() { private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { companion object { - private val CONSTRUCTOR = "" - private val CLASS_SIGNATURE_ENUMS = EnumSet.of( ProtoBufClassKind.FLAGS, ProtoBufClassKind.FQ_NAME, @@ -214,18 +208,8 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList)) ProtoBufClassKind.PROPERTY_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList)) - ProtoBufClassKind.MEMBER_LIST -> - names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getMemberList)) ProtoBufClassKind.ENUM_ENTRY_LIST -> names.addAll(calcDifferenceForNames(oldProto.enumEntryList, newProto.enumEntryList)) - ProtoBufClassKind.PRIMARY_CONSTRUCTOR -> - if (areNonPrivatePrimaryConstructorsDifferent()) { - names.add(CONSTRUCTOR) - } - ProtoBufClassKind.SECONDARY_CONSTRUCTOR_LIST -> - if (areNonPrivateSecondaryConstructorsDifferent()) { - names.add(CONSTRUCTOR) - } ProtoBufClassKind.FLAGS, ProtoBufClassKind.FQ_NAME, ProtoBufClassKind.TYPE_PARAMETER_LIST, @@ -238,30 +222,6 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot } return names } - - private fun areNonPrivatePrimaryConstructorsDifferent(): Boolean { - val oldPrimaryConstructor = oldProto.getNonPrivatePrimaryConstructor - val newPrimaryConstructor = newProto.getNonPrivatePrimaryConstructor - if (oldPrimaryConstructor == null && newPrimaryConstructor == null) return false - - if (oldPrimaryConstructor == null || newPrimaryConstructor == null) return true - - return !compareObject.checkEquals(oldPrimaryConstructor, newPrimaryConstructor) - } - - private fun areNonPrivateSecondaryConstructorsDifferent(): Boolean { - val oldSecondaryConstructors = oldProto.secondaryConstructorList.filter { !it.isPrivate } - val newSecondaryConstructors = newProto.secondaryConstructorList.filter { !it.isPrivate } - return (oldSecondaryConstructors.size() != newSecondaryConstructors.size() || - oldSecondaryConstructors.indices.any { !compareObject.checkEquals(oldSecondaryConstructors[it], newSecondaryConstructors[it]) }) - } - - private val ProtoBuf.Class.getNonPrivatePrimaryConstructor: ProtoBuf.Class.PrimaryConstructor? - get() { - if (!hasPrimaryConstructor()) return null - - return if (primaryConstructor?.data?.isPrivate ?: false) null else primaryConstructor - } } private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { @@ -293,14 +253,10 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa for (kind in diff) { when (kind!!) { - ProtoBufPackageKind.CONSTRUCTOR_LIST -> - names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getConstructorList)) ProtoBufPackageKind.FUNCTION_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getFunctionList)) ProtoBufPackageKind.PROPERTY_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getPropertyList)) - ProtoBufPackageKind.MEMBER_LIST -> - names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getMemberList)) else -> throw IllegalArgumentException("Unsupported kind: $kind") } From 66961715dddc76f12e0da68ca20845fe65006fbf Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 7 Oct 2015 15:36:03 +0300 Subject: [PATCH 0564/1557] Don't always write JVM method signatures to metadata When the trivial type mapping (implemented in JvmProtoBufUtil) from ProtoBuf.Type instances works fine, don't write the signature since it can be loaded by exactly the same trivial type mapping Original commit: 864926ee2e7a4b44012a5c2f9c68bd490dd7b0f6 --- .../jps/incremental/ProtoCompareGenerated.kt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index da4adbf258f..fb2c9754a14 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -330,9 +330,15 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } open fun checkEquals(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { - if (!checkStringEquals(old.name, new.name)) return false + if (old.hasName() != new.hasName()) return false + if (old.hasName()) { + if (!checkStringEquals(old.name, new.name)) return false + } - if (!checkStringEquals(old.desc, new.desc)) return false + if (old.hasDesc() != new.hasDesc()) return false + if (old.hasDesc()) { + if (!checkStringEquals(old.desc, new.desc)) return false + } return true } @@ -896,9 +902,13 @@ public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameI public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 - hashCode = 31 * hashCode + stringIndexes(name) + if (hasName()) { + hashCode = 31 * hashCode + stringIndexes(name) + } - hashCode = 31 * hashCode + stringIndexes(desc) + if (hasDesc()) { + hashCode = 31 * hashCode + stringIndexes(desc) + } return hashCode } From cfad31bba1ff822158359d52bf44c5d131b8fad5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 7 Oct 2015 19:42:35 +0300 Subject: [PATCH 0565/1557] Don't write field signatures when not necessary Original commit: 934ffed94412ef38b310a580cd41896da87f5c4f --- .../jps/incremental/ProtoCompareGenerated.kt | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index fb2c9754a14..597ba7dcbfb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -390,9 +390,15 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { - if (!checkStringEquals(old.name, new.name)) return false + if (old.hasName() != new.hasName()) return false + if (old.hasName()) { + if (!checkStringEquals(old.name, new.name)) return false + } - if (!checkStringEquals(old.desc, new.desc)) return false + if (old.hasDesc() != new.hasDesc()) return false + if (old.hasDesc()) { + if (!checkStringEquals(old.desc, new.desc)) return false + } if (old.hasIsStaticInOuter() != new.hasIsStaticInOuter()) return false if (old.hasIsStaticInOuter()) { @@ -962,9 +968,13 @@ public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fq public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 - hashCode = 31 * hashCode + stringIndexes(name) + if (hasName()) { + hashCode = 31 * hashCode + stringIndexes(name) + } - hashCode = 31 * hashCode + stringIndexes(desc) + if (hasDesc()) { + hashCode = 31 * hashCode + stringIndexes(desc) + } if (hasIsStaticInOuter()) { hashCode = 31 * hashCode + isStaticInOuter.hashCode() From 00ca2c8bad1be4f14d98f5fd8dc1064e91a81ab0 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 6 Oct 2015 21:55:49 +0300 Subject: [PATCH 0566/1557] Don't create KClass and KPackage instances in This proved to be a fragile technique, which probably doesn't even improve performance in most cases but has lots of unexpected problems: unconditional initialization of reflection classes, increasing the size of the bytecode, bugs with in annotations on JVM 6, inability to support conversion of a class from Kotlin to Java without recompiling clients which use it reflectively, etc. Original commit: a4732b442dff58684cb5d8f921fa39c9f5b04c24 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 3adf53cfde1..5c807b2c89c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -468,8 +468,8 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { // Check that outputs are located properly val facadeWithA = findFileInOutputDir(findModule("module1"), "test/TestPackage.class") val facadeWithB = findFileInOutputDir(findModule("module2"), "test/TestPackage.class") - UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "getA") - UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "getB", "setB") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "a", "getA") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "b", "getB", "setB") checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage")) checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) From 9d7712fdf666f8c0c33db699e1240c37d337497a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 6 Oct 2015 22:49:49 +0300 Subject: [PATCH 0567/1557] Make test generated Original commit: af3f7dfafcdf844f4b60ede1af2fac9067f57f23 --- ...ractIncrementalCacheVersionChangedTest.kt} | 18 +----- ...entalCacheVersionChangedTestGenerated.java | 62 +++++++++++++++++++ .../module1Modified}/build.log | 0 .../module1Modified}/dependencies.txt | 0 .../module1Modified}/module1_a.kt | 0 .../module1Modified}/module1_a.kt.new | 0 .../module1Modified}/module2_b.kt | 0 .../module1Modified}/module3_c.kt | 0 .../module1Modified}/module4_d.kt | 0 .../module1Modified}/module5_E.java | 0 .../module2Modified}/build.log | 0 .../module2Modified}/dependencies.txt | 0 .../module2Modified}/module1_a.kt | 0 .../module2Modified}/module2_b.kt | 0 .../module2Modified}/module2_b.kt.new | 0 .../touchedFile}/a.kt | 0 .../touchedFile}/b.kt | 0 .../touchedFile}/b.kt.new | 0 .../touchedFile}/build.log | 0 .../touchedFile}/other.kt | 0 .../untouchedFiles}/a.kt | 0 .../untouchedFiles}/b.kt | 0 .../untouchedFiles}/build.log | 0 23 files changed, 63 insertions(+), 17 deletions(-) rename jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/{IncrementalCacheVersionChangedTest.kt => AbstractIncrementalCacheVersionChangedTest.kt} (64%) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/build.log (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/dependencies.txt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module1_a.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module1_a.kt.new (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module2_b.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module3_c.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module4_d.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule1 => cacheVersionChanged/module1Modified}/module5_E.java (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/build.log (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/dependencies.txt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/module1_a.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/module2_b.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedModule2 => cacheVersionChanged/module2Modified}/module2_b.kt.new (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/a.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/b.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/b.kt.new (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/build.log (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChangedAndFileModified => cacheVersionChanged/touchedFile}/other.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChanged => cacheVersionChanged/untouchedFiles}/a.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChanged => cacheVersionChanged/untouchedFiles}/b.kt (100%) rename jps/jps-plugin/testData/incremental/{custom/cacheVersionChanged => cacheVersionChanged/untouchedFiles}/build.log (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt similarity index 64% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt rename to jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index 560e85bedf7..715775892dd 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -18,23 +18,7 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.kotlin.jps.incremental.getKotlinCacheVersion -public class IncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { - fun testCacheVersionChanged() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChanged/") - } - - fun testCacheVersionChangedAndFileModified() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/") - } - - fun testCacheVersionChangedMultiModule1() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/") - } - - fun testCacheVersionChangedMultiModule2() { - doTest("jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/") - } - +abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { override fun performAdditionalModifications(modifications: List) { val targets = projectDescriptor.allModuleTargets val paths = projectDescriptor.dataManager.dataPaths diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java new file mode 100644 index 00000000000..84a96d9ec60 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncrementalCacheVersionChangedTest { + public void testAllFilesPresentInCacheVersionChanged() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("module1Modified") + public void testModule1Modified() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); + doTest(fileName); + } + + @TestMetadata("module2Modified") + public void testModule2Modified() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/"); + doTest(fileName); + } + + @TestMetadata("touchedFile") + public void testTouchedFile() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); + doTest(fileName); + } + + @TestMetadata("untouchedFiles") + public void testUntouchedFiles() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); + doTest(fileName); + } + +} diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/build.log rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/dependencies.txt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/dependencies.txt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module1_a.kt.new rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module2_b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module2_b.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module3_c.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module3_c.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_c.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module4_d.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module4_d.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_d.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module5_E.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule1/module5_E.java rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module5_E.java diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/build.log rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/dependencies.txt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/dependencies.txt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module1_a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module1_a.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module1_a.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedModule2/module2_b.kt.new rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/a.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/a.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/b.kt.new rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/build.log rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/other.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/other.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChangedAndFileModified/other.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/other.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/a.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/a.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/b.kt rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/b.kt diff --git a/jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/custom/cacheVersionChanged/build.log rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log From c8f50089a88965fefbfd743f6b3c0d84e7afbac5 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 6 Oct 2015 22:52:18 +0300 Subject: [PATCH 0568/1557] Fix issues with incremental cache version change #KT-9360 fixed Original commit: a564724fa8b00759f16d5e5823f5b023150a0157 --- .../kotlin/jps/build/KotlinBuilder.kt | 49 ++++++------------- .../jps/build/AbstractIncrementalJpsTest.kt | 19 +++++-- ...entalCacheVersionChangedTestGenerated.java | 18 +++++++ .../exportedModule/build.log | 24 +++++++++ .../exportedModule/dependencies.txt | 4 ++ .../exportedModule/module1_A.kt | 3 ++ .../exportedModule/module1_A.kt.new | 3 ++ .../exportedModule/module2_B.kt | 7 +++ .../exportedModule/module3_C.kt | 7 +++ .../exportedModule/module4_D.kt | 7 +++ .../moduleWithConstantModified/build.log | 18 +++++++ .../dependencies.txt | 2 + .../moduleWithConstantModified/module1_A.kt | 3 ++ .../module1_A.kt.new | 3 ++ .../moduleWithConstantModified/module2_B.kt | 5 ++ .../moduleWithConstantModified/module2_C.java | 7 +++ .../moduleWithInlineModified/build.log | 21 ++++++++ .../moduleWithInlineModified/dependencies.txt | 2 + .../moduleWithInlineModified/module1_A.kt | 7 +++ .../moduleWithInlineModified/module1_A.kt.new | 7 +++ .../moduleWithInlineModified/module2_B.kt | 7 +++ .../moduleWithInlineModified/module2_C.java | 7 +++ 22 files changed, 191 insertions(+), 39 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 5905b0899f6..e7d99df6db9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -30,15 +30,11 @@ import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.jps.incremental.* -import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.ABORT -import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.ADDITIONAL_PASS_REQUIRED -import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.NOTHING_DONE -import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.OK +import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage -import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.JpsSimpleElement import org.jetbrains.jps.model.ex.JpsElementChildRoleBase @@ -141,10 +137,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) { LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) - val incrementalCaches = getIncrementalCaches(chunk, context) - incrementalCaches.values().forEach(StorageOwner::clean) - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) - return ADDITIONAL_PASS_REQUIRED + chunk.targets.forEach { dataManager.getKotlinCache(it).clean() } + return CHUNK_REBUILD_REQUIRED } if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles() @@ -238,13 +232,22 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } private fun ChangesInfo.doProcessChanges() { + fun isKotlin(file: File) = KotlinSourceFileCollector.isKotlinSourceFile(file) + fun isNotCompiled(file: File) = file !in allCompiledFiles + when { inlineAdded -> { - recompileEverything() + allCompiledFiles.clear() + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, ::isKotlin) return } - constantsChanged -> recompileOtherAndDependents() - protoChanged -> recompileOtherKotlinInChunk() + constantsChanged -> { + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, ::isNotCompiled) + return + } + protoChanged -> { + FSOperations.markDirty(context, CompilationRound.NEXT, chunk, { isKotlin(it) && isNotCompiled(it) }) + } } if (inlineChanged) { @@ -261,28 +264,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } } - - private fun recompileEverything() { - allCompiledFiles.clear() - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) - } - - private fun recompileOtherAndDependents() { - // Workaround for IDEA 14.0-14.0.2: extended version of markDirtyRecursively is not available - try { - Class.forName("org.jetbrains.jps.incremental.fs.CompilationRound") - - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, { file -> file !in allCompiledFiles }) - } catch (e: ClassNotFoundException) { - recompileEverything() - } - } - - private fun recompileOtherKotlinInChunk() { - FSOperations.markDirty(context, chunk, { file -> - KotlinSourceFileCollector.isKotlinSourceFile(file) && file !in allCompiledFiles - }) - } } private fun doCompileModuleChunk( diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 4ccda971bda..c47e195ec9e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -40,6 +40,7 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.model.JpsElementFactory import org.jetbrains.jps.model.JpsModuleRootModificationUtil +import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.incremental.components.LookupTracker @@ -249,18 +250,17 @@ public abstract class AbstractIncrementalJpsTest( rebuildAndCheckOutput(makeOverallResult) } - private fun readModuleDependencies(): Map>? { + private fun readModuleDependencies(): Map>? { val dependenciesTxt = File(testDataDir, "dependencies.txt") if (!dependenciesTxt.exists()) return null - val result = HashMap>() + val result = HashMap>() for (line in dependenciesTxt.readLines()) { val split = line.split("->") val module = split[0] val dependencies = if (split.size() > 1) split[1] else "" val dependencyList = dependencies.split(",").filterNot { it.isEmpty() } - - result[module] = dependencyList + result[module] = dependencyList.map(::parseDependency) } return result @@ -377,8 +377,10 @@ public abstract class AbstractIncrementalJpsTest( for ((moduleName, dependencies) in moduleDependencies) { val module = nameToModule[moduleName]!! + for (dependency in dependencies) { - JpsModuleRootModificationUtil.addDependency(module, nameToModule[dependency]) + JpsModuleRootModificationUtil.addDependency(module, nameToModule[dependency.name], + JpsJavaDependencyScope.COMPILE, dependency.exported) } } @@ -449,3 +451,10 @@ public abstract class AbstractIncrementalJpsTest( internal val ProjectDescriptor.allModuleTargets: Collection get() = buildTargetIndex.allTargets.filterIsInstance() + +private class DependencyDescriptor(val name: String, val exported: Boolean) + +private fun parseDependency(dependency: String): DependencyDescriptor = + DependencyDescriptor(dependency.removeSuffix(EXPORTED_SUFFIX), dependency.endsWith(EXPORTED_SUFFIX)) + +private val EXPORTED_SUFFIX = "[exported]" diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index 84a96d9ec60..eea8bc8cd4f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -35,6 +35,12 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("exportedModule") + public void testExportedModule() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); + doTest(fileName); + } + @TestMetadata("module1Modified") public void testModule1Modified() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); @@ -47,6 +53,18 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme doTest(fileName); } + @TestMetadata("moduleWithConstantModified") + public void testModuleWithConstantModified() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/"); + doTest(fileName); + } + + @TestMetadata("moduleWithInlineModified") + public void testModuleWithInlineModified() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/"); + doTest(fileName); + } + @TestMetadata("touchedFile") public void testTouchedFile() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log new file mode 100644 index 00000000000..f3a965ea35b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log @@ -0,0 +1,24 @@ +Cleaning output files: +out/production/module1/a/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/b/B.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files +Cleaning output files: +out/production/module3/c/C.class +End of files +Compiling files: +module3/src/module3_C.kt +End of files +Cleaning output files: +out/production/module4/D/D.class +End of files +Compiling files: +module4/src/module4_D.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt new file mode 100644 index 00000000000..f5f92433d7f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/dependencies.txt @@ -0,0 +1,4 @@ +module1-> +module2->module1[exported] +module3->module2 +module4->module3 diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt new file mode 100644 index 00000000000..21df9b5ad05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt @@ -0,0 +1,3 @@ +package a + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new new file mode 100644 index 00000000000..21df9b5ad05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new @@ -0,0 +1,3 @@ +package a + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt new file mode 100644 index 00000000000..48d8f912431 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module2_B.kt @@ -0,0 +1,7 @@ +package b + +import a.A + +open class B { + val a = A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt new file mode 100644 index 00000000000..3ed85781d90 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module3_C.kt @@ -0,0 +1,7 @@ +package c + +import b.B + +open class C { + val b = B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt new file mode 100644 index 00000000000..828f5775eb5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module4_D.kt @@ -0,0 +1,7 @@ +package D + +import c.C + +open class D { + val c = C() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log new file mode 100644 index 00000000000..96b3e5069a8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/APackage.class +out/production/module1/a/Module1_AKt.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/b/B.class +out/production/module2/b/C.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files +Compiling files: +module2/src/module2_C.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt new file mode 100644 index 00000000000..04406896cf1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt @@ -0,0 +1,3 @@ +package a + +val X = 10 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new new file mode 100644 index 00000000000..7702c5904f0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module1_A.kt.new @@ -0,0 +1,3 @@ +package a + +val X = 11 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt new file mode 100644 index 00000000000..fac015d2d49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_B.kt @@ -0,0 +1,5 @@ +package b + +class B { + val x = a.X +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java new file mode 100644 index 00000000000..6eb41bfcd2d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/module2_C.java @@ -0,0 +1,7 @@ +package b; + +class C { + C() { + new B(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log new file mode 100644 index 00000000000..35f17a0b6cc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -0,0 +1,21 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/A.class +out/production/module1/a/APackage.class +out/production/module1/a/Module1_AKt.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/b/B.class +End of files +Cleaning output files: +out/production/module2/b/C.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files +Compiling files: +module2/src/module2_C.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt new file mode 100644 index 00000000000..557b1805d4c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt @@ -0,0 +1,7 @@ +package a + +open class A + +inline fun f(): A { + return A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new new file mode 100644 index 00000000000..557b1805d4c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new @@ -0,0 +1,7 @@ +package a + +open class A + +inline fun f(): A { + return A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt new file mode 100644 index 00000000000..3edc9740e23 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_B.kt @@ -0,0 +1,7 @@ +package b + +import a.* + +open class B { + val a = f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java new file mode 100644 index 00000000000..6eb41bfcd2d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module2_C.java @@ -0,0 +1,7 @@ +package b; + +class C { + C() { + new B(); + } +} \ No newline at end of file From ba98b64776021cd2fe74720da05b81efbbd9c1d3 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Tue, 13 Oct 2015 16:16:12 +0300 Subject: [PATCH 0569/1557] Fix test data Original commit: bee0fb62831254b66aa7694e147dbd5cca64d286 --- .../pureKotlin/traitClassObjectConstantChanged/const.kt.new | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new index 23bfae9ef54..67d312249e9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new @@ -3,6 +3,6 @@ package test interface Trait { companion object { // Old and new constant values are different, but their hashes are the same - val CONST = "Ae" + const val CONST = "Ae" } } From a613d6707436c889acbc3cf0cb5f4ce5c7a809d6 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Wed, 14 Oct 2015 12:10:31 +0200 Subject: [PATCH 0570/1557] Make getDaemonConnection synchronized to avoid racing conditions on connection Original commit: 5b5ec2cb04fea54d17aa2f4c2141a0e44fa989cc --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 8c6da3b0209..50e752af3b6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -128,9 +128,9 @@ public object KotlinCompilerRunner { internal class DaemonConnection(public val daemon: CompileService?) internal object getDaemonConnection { - private var connection: DaemonConnection? = null + private @Volatile var connection: DaemonConnection? = null - operator fun invoke(environment: CompilerEnvironment, messageCollector: MessageCollector): DaemonConnection? { + @Synchronized operator fun invoke(environment: CompilerEnvironment, messageCollector: MessageCollector): DaemonConnection? { if (connection == null) { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) From 4a10df80fb4e74acbaf070450830a51320f01ddf Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 13 Oct 2015 16:47:47 +0300 Subject: [PATCH 0571/1557] Update IDE tests to use KProperty instead of PropertyMetadata Original commit: 6a965c9a06e38e01901160e22719e81aefa44e2b --- .../lookupTracker/conventions/delegateProperty.kt | 10 ++++++---- .../delegatedPropertyInlineExtensionAccessor/build.log | 3 +++ .../inlineGet.kt | 6 ++++-- .../inlineGet.kt.new.1 | 6 ++++-- .../inlineSet.kt | 6 ++++-- .../inlineSet.kt.new.2 | 6 ++++-- .../delegatedPropertyInlineMethodAccessor/build.log | 3 +++ .../delegatedPropertyInlineMethodAccessor/inline.kt | 8 +++++--- .../inline.kt.new.1 | 8 +++++--- .../inline.kt.new.2 | 8 +++++--- 10 files changed, 43 insertions(+), 21 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index b6595d9bbbb..5fa5b67c2da 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -1,16 +1,18 @@ package foo.bar +import kotlin.reflect.KProperty + /*p:foo.bar*/class D1 { - fun get(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1 p:foo.bar*/PropertyMetadata) = 1 + fun get(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = 1 } -/*p:foo.bar*/fun /*p:foo.bar*/D1.set(t: /*p:foo.bar*/Any?, p: /*p:foo.bar*/PropertyMetadata, v: /*p:foo.bar*/Int) {} +/*p:foo.bar*/fun /*p:foo.bar*/D1.set(t: /*p:foo.bar*/Any?, p: KProperty<*>, v: /*p:foo.bar*/Int) {} /*p:foo.bar(D2)*/open class D2 { - fun set(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2 p:foo.bar*/PropertyMetadata, v: /*c:foo.bar.D2 p:foo.bar*/Int) {} + fun set(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar*/Int) {} } -/*p:foo.bar*/fun /*p:foo.bar*/D2.get(t: /*p:foo.bar*/Any?, p: /*p:foo.bar*/PropertyMetadata) = 1 +/*p:foo.bar*/fun /*p:foo.bar*/D2.get(t: /*p:foo.bar*/Any?, p: KProperty<*>) = 1 /*p:foo.bar*/fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log index c2f6c6d4d8f..d4162fbf6f8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log @@ -7,7 +7,9 @@ Compiling files: src/inlineGet.kt End of files Cleaning output files: +out/production/module/usage/UsageVal$x$1.class out/production/module/usage/UsageVal.class +out/production/module/usage/UsageVar$x$1.class out/production/module/usage/UsageVar.class End of files Compiling files: @@ -25,6 +27,7 @@ Compiling files: src/inlineSet.kt End of files Cleaning output files: +out/production/module/usage/UsageVar$x$1.class out/production/module/usage/UsageVar.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt index 1277c339dca..a5ca9157e97 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt @@ -1,5 +1,7 @@ package inline -inline fun Inline.getValue(receiver: Any?, prop: PropertyMetadata): Int { +import kotlin.reflect.KProperty + +inline fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int { return 0 -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 index 3ed00a5f3b1..c1e548cf52c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 @@ -1,5 +1,7 @@ package inline -inline fun Inline.getValue(receiver: Any?, prop: PropertyMetadata): Int { +import kotlin.reflect.KProperty + +inline fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int { return 1 -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt index 0a9a76e7be4..36754dd7b0e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt @@ -1,5 +1,7 @@ package inline -inline fun Inline.setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { +import kotlin.reflect.KProperty + +inline fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value) -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 index 446a5ad574c..bec3dc03047 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 @@ -1,5 +1,7 @@ package inline -inline fun Inline.setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { +import kotlin.reflect.KProperty + +inline fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value * 2) -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log index eafebdfd179..b85fde4388d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log @@ -5,7 +5,9 @@ Compiling files: src/inline.kt End of files Cleaning output files: +out/production/module/usage/UsageVal$x$1.class out/production/module/usage/UsageVal.class +out/production/module/usage/UsageVar$x$1.class out/production/module/usage/UsageVar.class End of files Compiling files: @@ -21,6 +23,7 @@ Compiling files: src/inline.kt End of files Cleaning output files: +out/production/module/usage/UsageVar$x$1.class out/production/module/usage/UsageVar.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt index 470f1f47d05..059a1a9379d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt @@ -1,11 +1,13 @@ package inline +import kotlin.reflect.KProperty + class Inline { - inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: KProperty<*>): Int { return 0 } - inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value) } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 index 49af798d65d..b983f8237cb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 @@ -1,11 +1,13 @@ package inline +import kotlin.reflect.KProperty + class Inline { - inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: KProperty<*>): Int { return 1 } - inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value) } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 index d0a03b3014f..f65f3c2cf62 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 @@ -1,11 +1,13 @@ package inline +import kotlin.reflect.KProperty + class Inline { - inline fun getValue(receiver: Any?, prop: PropertyMetadata): Int { + inline fun getValue(receiver: Any?, prop: KProperty<*>): Int { return 1 } - inline fun setValue(receiver: Any?, prop: PropertyMetadata, value: Int) { + inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value * 2) } -} \ No newline at end of file +} From 2fbded1b7994b81713b572f71156ff0bb9ae2c96 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 13 Oct 2015 14:50:49 +0300 Subject: [PATCH 0572/1557] Drop package facades: code cleanup in Kotlin project. Original commit: 8cd624a58a01a2287f58719862286a5cb914444b --- .../kotlin/jps/build/kannotator/KannotatorJpsTest.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java index 5b8c8e070d0..ea0dbc4c9f5 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java @@ -22,7 +22,7 @@ import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase; -import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonPackage; +import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonKt; import java.io.File; import java.io.IOException; @@ -76,10 +76,9 @@ public class KannotatorJpsTest extends AbstractKotlinJpsBuildTestCase { System.out.println("Checking output directories after make and rebuild"); - ClassFilesComparisonPackage + ClassFilesComparisonKt .assertEqualDirectories(new File(getOutDirAfterRebuild(), "production"), new File(getOutDir(), "production"), false); - ClassFilesComparisonPackage - .assertEqualDirectories(new File(getOutDirAfterRebuild(), "test"), new File(getOutDir(), "test"), false); + ClassFilesComparisonKt.assertEqualDirectories(new File(getOutDirAfterRebuild(), "test"), new File(getOutDir(), "test"), false); System.out.println("Test successfully finished. File: " + root.getName()); System.out.println("-----"); From 98d448ef967af7e64cc77db347c14f3e0aa0b66a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 7 Oct 2015 19:00:08 +0300 Subject: [PATCH 0573/1557] Support a more optimized way of storing types in metadata Together with almost every type now there's also an id which references a type from a separate table. Storing such ids instead of Type messages will allow to reduce the size of the metadata for files where types are used many times over and over again. Currently only deserialization of such types is supported, along with the former mechanism Original commit: 82d2e623d3ecf67a940265dab1579c18334f6941 --- .../jps/incremental/ProtoCompareGenerated.kt | 210 +++++++++++++++++- .../jps/incremental/protoDifferenceUtils.kt | 6 + 2 files changed, 209 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 597ba7dcbfb..4401a64b791 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -39,11 +39,17 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsPackageProperty(old, new)) return false + if (old.hasTypeTable() != new.hasTypeTable()) return false + if (old.hasTypeTable()) { + if (!checkEquals(old.typeTable, new.typeTable)) return false + } + return true } public enum class ProtoBufPackageKind { FUNCTION_LIST, - PROPERTY_LIST + PROPERTY_LIST, + TYPE_TABLE } public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { @@ -53,6 +59,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsPackageProperty(old, new)) result.add(ProtoBufPackageKind.PROPERTY_LIST) + if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufPackageKind.TYPE_TABLE) + if (old.hasTypeTable()) { + if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufPackageKind.TYPE_TABLE) + } + return result } @@ -73,6 +84,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassSupertype(old, new)) return false + if (!checkEqualsClassSupertypeId(old, new)) return false + if (!checkEqualsClassNestedClassName(old, new)) return false if (!checkEqualsClassConstructor(old, new)) return false @@ -83,6 +96,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassEnumEntry(old, new)) return false + if (old.hasTypeTable() != new.hasTypeTable()) return false + if (old.hasTypeTable()) { + if (!checkEquals(old.typeTable, new.typeTable)) return false + } + if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) return false for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { @@ -97,11 +115,13 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi COMPANION_OBJECT_NAME, TYPE_PARAMETER_LIST, SUPERTYPE_LIST, + SUPERTYPE_ID_LIST, NESTED_CLASS_NAME_LIST, CONSTRUCTOR_LIST, FUNCTION_LIST, PROPERTY_LIST, ENUM_ENTRY_LIST, + TYPE_TABLE, CLASS_ANNOTATION_LIST } @@ -124,6 +144,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassSupertype(old, new)) result.add(ProtoBufClassKind.SUPERTYPE_LIST) + if (!checkEqualsClassSupertypeId(old, new)) result.add(ProtoBufClassKind.SUPERTYPE_ID_LIST) + if (!checkEqualsClassNestedClassName(old, new)) result.add(ProtoBufClassKind.NESTED_CLASS_NAME_LIST) if (!checkEqualsClassConstructor(old, new)) result.add(ProtoBufClassKind.CONSTRUCTOR_LIST) @@ -134,6 +156,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST) + if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufClassKind.TYPE_TABLE) + if (old.hasTypeTable()) { + if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufClassKind.TYPE_TABLE) + } + if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST) for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { @@ -151,7 +178,15 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkStringEquals(old.name, new.name)) return false - if (!checkEquals(old.returnType, new.returnType)) return false + if (old.hasReturnType() != new.hasReturnType()) return false + if (old.hasReturnType()) { + if (!checkEquals(old.returnType, new.returnType)) return false + } + + if (old.hasReturnTypeId() != new.hasReturnTypeId()) return false + if (old.hasReturnTypeId()) { + if (old.returnTypeId != new.returnTypeId) return false + } if (!checkEqualsFunctionTypeParameter(old, new)) return false @@ -160,8 +195,18 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.receiverType, new.receiverType)) return false } + if (old.hasReceiverTypeId() != new.hasReceiverTypeId()) return false + if (old.hasReceiverTypeId()) { + if (old.receiverTypeId != new.receiverTypeId) return false + } + if (!checkEqualsFunctionValueParameter(old, new)) return false + if (old.hasTypeTable() != new.hasTypeTable()) return false + if (old.hasTypeTable()) { + if (!checkEquals(old.typeTable, new.typeTable)) return false + } + if (old.hasExtension(JvmProtoBuf.methodSignature) != new.hasExtension(JvmProtoBuf.methodSignature)) return false if (old.hasExtension(JvmProtoBuf.methodSignature)) { if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false @@ -183,7 +228,15 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkStringEquals(old.name, new.name)) return false - if (!checkEquals(old.returnType, new.returnType)) return false + if (old.hasReturnType() != new.hasReturnType()) return false + if (old.hasReturnType()) { + if (!checkEquals(old.returnType, new.returnType)) return false + } + + if (old.hasReturnTypeId() != new.hasReturnTypeId()) return false + if (old.hasReturnTypeId()) { + if (old.returnTypeId != new.returnTypeId) return false + } if (!checkEqualsPropertyTypeParameter(old, new)) return false @@ -192,6 +245,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.receiverType, new.receiverType)) return false } + if (old.hasReceiverTypeId() != new.hasReceiverTypeId()) return false + if (old.hasReceiverTypeId()) { + if (old.receiverTypeId != new.receiverTypeId) return false + } + if (old.hasSetterValueParameter() != new.hasSetterValueParameter()) return false if (old.hasSetterValueParameter()) { if (!checkEquals(old.setterValueParameter, new.setterValueParameter)) return false @@ -220,6 +278,17 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEquals(old: ProtoBuf.TypeTable, new: ProtoBuf.TypeTable): Boolean { + if (!checkEqualsTypeTableType(old, new)) return false + + if (old.hasFirstNullable() != new.hasFirstNullable()) return false + if (old.hasFirstNullable()) { + if (old.firstNullable != new.firstNullable) return false + } + + return true + } + open fun checkEquals(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { if (old.id != new.id) return false @@ -237,6 +306,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsTypeParameterUpperBound(old, new)) return false + if (!checkEqualsTypeParameterUpperBoundId(old, new)) return false + return true } @@ -258,6 +329,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.flexibleUpperBound, new.flexibleUpperBound)) return false } + if (old.hasFlexibleUpperBoundId() != new.hasFlexibleUpperBoundId()) return false + if (old.hasFlexibleUpperBoundId()) { + if (old.flexibleUpperBoundId != new.flexibleUpperBoundId) return false + } + if (old.hasClassName() != new.hasClassName()) return false if (old.hasClassName()) { if (!checkClassIdEquals(old.className, new.className)) return false @@ -314,13 +390,26 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkStringEquals(old.name, new.name)) return false - if (!checkEquals(old.type, new.type)) return false + if (old.hasType() != new.hasType()) return false + if (old.hasType()) { + if (!checkEquals(old.type, new.type)) return false + } + + if (old.hasTypeId() != new.hasTypeId()) return false + if (old.hasTypeId()) { + if (old.typeId != new.typeId) return false + } if (old.hasVarargElementType() != new.hasVarargElementType()) return false if (old.hasVarargElementType()) { if (!checkEquals(old.varargElementType, new.varargElementType)) return false } + if (old.hasVarargElementTypeId() != new.hasVarargElementTypeId()) return false + if (old.hasVarargElementTypeId()) { + if (old.varargElementTypeId != new.varargElementTypeId) return false + } + if (old.hasExtension(JvmProtoBuf.index) != new.hasExtension(JvmProtoBuf.index)) return false if (old.hasExtension(JvmProtoBuf.index)) { if (old.getExtension(JvmProtoBuf.index) != new.getExtension(JvmProtoBuf.index)) return false @@ -378,6 +467,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.type, new.type)) return false } + if (old.hasTypeId() != new.hasTypeId()) return false + if (old.hasTypeId()) { + if (old.typeId != new.typeId) return false + } + return true } @@ -494,6 +588,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEqualsClassSupertypeId(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.supertypeIdCount != new.supertypeIdCount) return false + + for(i in 0..old.supertypeIdCount - 1) { + if (old.getSupertypeId(i) != new.getSupertypeId(i)) return false + } + + return true + } + open fun checkEqualsClassNestedClassName(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { if (old.nestedClassNameCount != new.nestedClassNameCount) return false @@ -574,6 +678,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEqualsTypeTableType(old: ProtoBuf.TypeTable, new: ProtoBuf.TypeTable): Boolean { + if (old.typeCount != new.typeCount) return false + + for(i in 0..old.typeCount - 1) { + if (!checkEquals(old.getType(i), new.getType(i))) return false + } + + return true + } + open fun checkEqualsTypeParameterUpperBound(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { if (old.upperBoundCount != new.upperBoundCount) return false @@ -584,6 +698,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEqualsTypeParameterUpperBoundId(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { + if (old.upperBoundIdCount != new.upperBoundIdCount) return false + + for(i in 0..old.upperBoundIdCount - 1) { + if (old.getUpperBoundId(i) != new.getUpperBoundId(i)) return false + } + + return true + } + open fun checkEqualsTypeArgument(old: ProtoBuf.Type, new: ProtoBuf.Type): Boolean { if (old.argumentCount != new.argumentCount) return false @@ -666,6 +790,10 @@ public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes) } + if (hasTypeTable()) { + hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes) + } + return hashCode } @@ -690,6 +818,10 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: ( hashCode = 31 * hashCode + getSupertype(i).hashCode(stringIndexes, fqNameIndexes) } + for(i in 0..supertypeIdCount - 1) { + hashCode = 31 * hashCode + getSupertypeId(i) + } + for(i in 0..nestedClassNameCount - 1) { hashCode = 31 * hashCode + stringIndexes(getNestedClassName(i)) } @@ -710,6 +842,10 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: ( hashCode = 31 * hashCode + stringIndexes(getEnumEntry(i)) } + if (hasTypeTable()) { + hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes) + } + for(i in 0..getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes) } @@ -726,7 +862,13 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + stringIndexes(name) - hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) + if (hasReturnType()) { + hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasReturnTypeId()) { + hashCode = 31 * hashCode + returnTypeId + } for(i in 0..typeParameterCount - 1) { hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) @@ -736,10 +878,18 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) } + if (hasReceiverTypeId()) { + hashCode = 31 * hashCode + receiverTypeId + } + for(i in 0..valueParameterCount - 1) { hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) } + if (hasTypeTable()) { + hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes) + } + if (hasExtension(JvmProtoBuf.methodSignature)) { hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes) } @@ -760,7 +910,13 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + stringIndexes(name) - hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) + if (hasReturnType()) { + hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasReturnTypeId()) { + hashCode = 31 * hashCode + returnTypeId + } for(i in 0..typeParameterCount - 1) { hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) @@ -770,6 +926,10 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) } + if (hasReceiverTypeId()) { + hashCode = 31 * hashCode + receiverTypeId + } + if (hasSetterValueParameter()) { hashCode = 31 * hashCode + setterValueParameter.hashCode(stringIndexes, fqNameIndexes) } @@ -793,6 +953,20 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes return hashCode } +public fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { + var hashCode = 1 + + for(i in 0..typeCount - 1) { + hashCode = 31 * hashCode + getType(i).hashCode(stringIndexes, fqNameIndexes) + } + + if (hasFirstNullable()) { + hashCode = 31 * hashCode + firstNullable + } + + return hashCode +} + public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 @@ -812,6 +986,10 @@ public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIn hashCode = 31 * hashCode + getUpperBound(i).hashCode(stringIndexes, fqNameIndexes) } + for(i in 0..upperBoundIdCount - 1) { + hashCode = 31 * hashCode + getUpperBoundId(i) + } + return hashCode } @@ -834,6 +1012,10 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I hashCode = 31 * hashCode + flexibleUpperBound.hashCode(stringIndexes, fqNameIndexes) } + if (hasFlexibleUpperBoundId()) { + hashCode = 31 * hashCode + flexibleUpperBoundId + } + if (hasClassName()) { hashCode = 31 * hashCode + fqNameIndexes(className) } @@ -892,12 +1074,22 @@ public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameI hashCode = 31 * hashCode + stringIndexes(name) - hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) + if (hasType()) { + hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasTypeId()) { + hashCode = 31 * hashCode + typeId + } if (hasVarargElementType()) { hashCode = 31 * hashCode + varargElementType.hashCode(stringIndexes, fqNameIndexes) } + if (hasVarargElementTypeId()) { + hashCode = 31 * hashCode + varargElementTypeId + } + if (hasExtension(JvmProtoBuf.index)) { hashCode = 31 * hashCode + getExtension(JvmProtoBuf.index) } @@ -952,6 +1144,10 @@ public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIn hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) } + if (hasTypeId()) { + hashCode = 31 * hashCode + typeId + } + return hashCode } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index f80ba52a0cf..60954d7d26e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -210,6 +210,9 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList)) ProtoBufClassKind.ENUM_ENTRY_LIST -> names.addAll(calcDifferenceForNames(oldProto.enumEntryList, newProto.enumEntryList)) + ProtoBufClassKind.TYPE_TABLE -> { + // TODO + } ProtoBufClassKind.FLAGS, ProtoBufClassKind.FQ_NAME, ProtoBufClassKind.TYPE_PARAMETER_LIST, @@ -257,6 +260,9 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getFunctionList)) ProtoBufPackageKind.PROPERTY_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getPropertyList)) + ProtoBufPackageKind.TYPE_TABLE -> { + // TODO + } else -> throw IllegalArgumentException("Unsupported kind: $kind") } From 646d7feb4c224d281950560f98c108d70d6555ca Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 9 Oct 2015 04:47:16 +0300 Subject: [PATCH 0574/1557] Store type parameter names sometimes instead of ids This helps to reuse instances of types when TypeTable is enabled in cases when a file or a class contains a lot of functions with type parameters with the same name (like Maps.kt in the stdlib with "Map") Original commit: 4c211426485d19feb550d40366a5e408dc27b417 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 4401a64b791..12338aa078e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -344,6 +344,11 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.typeParameter != new.typeParameter) return false } + if (old.hasTypeParameterName() != new.hasTypeParameterName()) return false + if (old.hasTypeParameterName()) { + if (!checkStringEquals(old.typeParameterName, new.typeParameterName)) return false + } + if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false for(i in 0..old.getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { @@ -1024,6 +1029,10 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I hashCode = 31 * hashCode + typeParameter } + if (hasTypeParameterName()) { + hashCode = 31 * hashCode + stringIndexes(typeParameterName) + } + for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { hashCode = 31 * hashCode + getExtension(JvmProtoBuf.typeAnnotation, i).hashCode(stringIndexes, fqNameIndexes) } From 3cde86991027c51427b8f3f83c210df23eec696f Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 12 Oct 2015 19:57:59 +0300 Subject: [PATCH 0575/1557] Minor: fix build Original commit: e54e6a3f319f5b03ee0b8a89b4b7942e06197fba --- .../jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 5c807b2c89c..aa9d2abb009 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -757,18 +757,19 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { DELETE } - protected fun touch(path: String): Action = Action(Operation.CHANGE, path) + private fun touch(path: String): Action = Action(Operation.CHANGE, path) - protected fun del(path: String): Action = Action(Operation.DELETE, path) + private fun del(path: String): Action = Action(Operation.DELETE, path) - protected fun change(filePath: String): Unit = JpsBuildTestCase.change(filePath) + // TODO inline after KT-3974 will be fixed + private fun touch(file: File): Unit = JpsBuildTestCase.change(file.absolutePath) - protected inner class Action constructor(private val operation: Operation, private val path: String) { + private inner class Action constructor(private val operation: Operation, private val path: String) { fun apply() { val file = File(workDir, path) when (operation) { Operation.CHANGE -> - change(file.getAbsolutePath()) + touch(file) Operation.DELETE -> assertTrue(file.delete(), "Can not delete file \"" + file.getAbsolutePath() + "\"") else -> From 3f18729d01531fa52eaba599cbe885cc3e4f8969 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Thu, 1 Oct 2015 21:00:44 +0300 Subject: [PATCH 0576/1557] Added static methods, nested classes and companion object from superclasses. Original commit: d5dbc9638ddb3fd4e13f87df5a416fb21a59962c --- .../incremental/lookupTracker/conventions/delegateProperty.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 5fa5b67c2da..a44e7f2c02a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -16,7 +16,7 @@ import kotlin.reflect.KProperty /*p:foo.bar*/fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { - fun propertyDelegated(p: /*c:foo.bar.D3 p:foo.bar*/Any?) {} + fun propertyDelegated(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?) {} } From 9f2f66b3b8c498c2cd8e93db3cc2a507b00bfb8a Mon Sep 17 00:00:00 2001 From: Svetlana Isakova Date: Fri, 16 Oct 2015 21:55:18 +0300 Subject: [PATCH 0577/1557] Serialize/deserialize annotations on type parameters Original commit: 25b40455ad5460ffa6c74f7f613f5c82f194fde6 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 12338aa078e..74e6cbc514e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -308,6 +308,12 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsTypeParameterUpperBoundId(old, new)) return false + if (old.getExtensionCount(JvmProtoBuf.typeParameterAnnotation) != new.getExtensionCount(JvmProtoBuf.typeParameterAnnotation)) return false + + for(i in 0..old.getExtensionCount(JvmProtoBuf.typeParameterAnnotation) - 1) { + if (!checkEquals(old.getExtension(JvmProtoBuf.typeParameterAnnotation, i), new.getExtension(JvmProtoBuf.typeParameterAnnotation, i))) return false + } + return true } @@ -995,6 +1001,10 @@ public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIn hashCode = 31 * hashCode + getUpperBoundId(i) } + for(i in 0..getExtensionCount(JvmProtoBuf.typeParameterAnnotation) - 1) { + hashCode = 31 * hashCode + getExtension(JvmProtoBuf.typeParameterAnnotation, i).hashCode(stringIndexes, fqNameIndexes) + } + return hashCode } From 86acb982e58190b95670ba115500408d5c4a2030 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 16 Oct 2015 15:07:31 +0300 Subject: [PATCH 0578/1557] Make NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION error Original commit: de5dc61820443cb804f82957af50c66c1c59039a --- .../kotlin/jps/build/KotlinBuilder.kt | 6 +++++- .../multiModule/constantValueChanged/build.log | 10 +++++++++- .../constantValueChanged/module1_const.kt | 2 +- .../constantValueChanged/module1_const.kt.new | 2 +- .../pureKotlin/allConstants/build.log | 6 +++++- .../pureKotlin/allConstants/const.kt | 18 +++++++++--------- .../pureKotlin/allConstants/const.kt.new.1 | 18 +++++++++--------- .../pureKotlin/allConstants/const.kt.new.2 | 18 +++++++++--------- .../classObjectConstantChanged/const.kt | 2 +- .../classObjectConstantChanged/const.kt.new | 2 +- .../pureKotlin/constantsUnchanged/const.kt | 4 ++-- .../pureKotlin/constantsUnchanged/const.kt.new | 4 ++-- .../fileWithConstantRemoved/const.kt | 2 +- .../pureKotlin/objectConstantChanged/const.kt | 2 +- .../objectConstantChanged/const.kt.new | 2 +- .../packageConstantChanged/build.log | 6 +++++- .../pureKotlin/packageConstantChanged/const.kt | 2 +- .../packageConstantChanged/const.kt.new | 2 +- .../privateConstantsChanged/const.kt | 4 ++-- .../privateConstantsChanged/const.kt.new | 4 ++-- 20 files changed, 68 insertions(+), 48 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e7d99df6db9..5aceafc6d9e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -87,6 +87,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR override fun getCompilableFileExtensions() = arrayListOf("kt") override fun buildStarted(context: CompileContext) { + LOG.debug("==========================================") LOG.info("is Kotlin incremental compilation enabled: ${IncrementalCompilation.isEnabled()}") val historyLabel = context.getBuilderParameter("history label") @@ -101,6 +102,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR dirtyFilesHolder: DirtyFilesHolder, outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { + LOG.debug("------------------------------------------") val messageCollector = MessageCollectorAdapter(context) try { @@ -213,7 +215,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR copyJsLibraryFilesIfNeeded(chunk, project) } - if (!IncrementalCompilation.isEnabled()) return OK + if (!IncrementalCompilation.isEnabled()) { + return OK + } val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } val marker = ChangesProcessor(context, chunk, allCompiledFiles, caches) diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 1b7e8ed2b89..0a36e429697 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -7,8 +7,16 @@ Compiling files: module1/src/module1_const.kt End of files Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/test/Module1_constKt.class +out/production/module1/test/TestPackage.class +End of files +Compiling files: +module1/src/module1_const.kt +End of files +Cleaning output files: out/production/module2/usage/Usage.class End of files Compiling files: module2/src/module2_usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt index e79d6d05129..3b7db43d11b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt @@ -1,3 +1,3 @@ package test -public val CONST: String = "BF" +public const val CONST: String = "BF" diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new index d6250846ebf..06509478371 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/module1_const.kt.new @@ -1,3 +1,3 @@ package test -public val CONST: String = "Ae" +public const val CONST: String = "Ae" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 95a68077542..d7f5b678069 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -17,8 +17,12 @@ Compiling files: src/const.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/ConstKt.class +out/production/module/test/TestPackage.class out/production/module/test/Usage.class End of files Compiling files: +src/const.kt src/usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt index d0d300c1312..73047748dac 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt @@ -1,12 +1,12 @@ package test -val b: Byte = 100 -val s: Short = 20000 -val i: Int = 2000000 -val l: Long = 2000000000000L -val f: Float = 3.14f -val d: Double = 3.14 -val bb: Boolean = true -val c: Char = '\u03c0' // pi symbol +const val b: Byte = 100 +const val s: Short = 20000 +const val i: Int = 2000000 +const val l: Long = 2000000000000L +const val f: Float = 3.14f +const val d: Double = 3.14 +const val bb: Boolean = true +const val c: Char = '\u03c0' // pi symbol -val str: String = ":)" +const val str: String = ":)" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1 index 26796869ddc..9fe38e75928 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.1 @@ -1,12 +1,12 @@ package test -val b: Byte = 50 + 50 -val s: Short = 10000 + 10000 -val i: Int = 1000000 + 1000000 -val l: Long = 1000000000000L + 1000000000000L -val f: Float = 0.0f + 3.14f -val d: Double = 0.0 + 3.14 -val bb: Boolean = !false -val c: Char = '\u03c0' // pi symbol +const val b: Byte = 50 + 50 +const val s: Short = 10000 + 10000 +const val i: Int = 1000000 + 1000000 +const val l: Long = 1000000000000L + 1000000000000L +const val f: Float = 0.0f + 3.14f +const val d: Double = 0.0 + 3.14 +const val bb: Boolean = !false +const val c: Char = '\u03c0' // pi symbol -val str: String = ":)" +const val str: String = ":)" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2 index 668b4009dce..d0df4060261 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/const.kt.new.2 @@ -1,12 +1,12 @@ package test -val b: Byte = 0 -val s: Short = 0 -val i: Int = 0 -val l: Long = 0 -val f: Float = 0.0f -val d: Double = 0.0 -val bb: Boolean = false -val c: Char = 'x' +const val b: Byte = 0 +const val s: Short = 0 +const val i: Int = 0 +const val l: Long = 0 +const val f: Float = 0.0f +const val d: Double = 0.0 +const val bb: Boolean = false +const val c: Char = 'x' -val str: String = ":(" +const val str: String = ":(" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt index 4680ae2c26f..cd3256a7612 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt @@ -3,6 +3,6 @@ package test class Klass { companion object { // Old and new constant values are different, but their hashes are the same - val CONST = "BF" + const val CONST = "BF" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new index e9ccf1ab8db..49b604cd74f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new @@ -3,6 +3,6 @@ package test class Klass { companion object { // Old and new constant values are different, but their hashes are the same - val CONST = "Ae" + const val CONST = "Ae" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt index 40bbe8de705..8bdd5ae5b5d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt @@ -1,9 +1,9 @@ package test -val CONST = "foo" +const val CONST = "foo" class Klass { companion object { - val CONST = "bar" + const val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new index 40bbe8de705..8bdd5ae5b5d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new @@ -1,9 +1,9 @@ package test -val CONST = "foo" +const val CONST = "foo" class Klass { companion object { - val CONST = "bar" + const val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt index 1572968f89f..c2cc75a6691 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/const.kt @@ -1,3 +1,3 @@ package test -val CONST = "foo" +const val CONST = "foo" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt index 13a01eb1ac1..18ba78875d7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt @@ -1,5 +1,5 @@ package test object Object { - val CONST = "old" + const val CONST = "old" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new index d604ca1244f..3c94cbcc28b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new @@ -1,5 +1,5 @@ package test object Object { - val CONST = "new" + const val CONST = "new" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index ff943c45dd4..3e12fb327e1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -7,8 +7,12 @@ Compiling files: src/const.kt End of files Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/ConstKt.class +out/production/module/test/TestPackage.class out/production/module/test/Usage.class End of files Compiling files: +src/const.kt src/usage.kt -End of files \ No newline at end of file +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt index 62b4a2d0b23..cbc9ae86717 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt @@ -1,4 +1,4 @@ package test // Old and new constant values are different, but their hashes are the same -val CONST = "BF" +const val CONST = "BF" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new index bf471bbe0da..5d4d205f5a1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/const.kt.new @@ -1,4 +1,4 @@ package test // Old and new constant values are different, but their hashes are the same -val CONST = "Ae" +const val CONST = "Ae" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt index 7f64be02734..9ab04e28aff 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt @@ -1,11 +1,11 @@ package test -val CONST = "foo" +const val CONST = "foo" class Klass { companion object { private val CHANGED = "old" - public val UNCHANGED = 100 + const public val UNCHANGED = 100 } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new index 569acca03d0..83f620f0760 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/const.kt.new @@ -1,11 +1,11 @@ package test -val CONST = "foo" +const val CONST = "foo" class Klass { companion object { private val CHANGED = "new" - public val UNCHANGED = 100 + const public val UNCHANGED = 100 } } From 44a607abe3d4c9a59420687f24b92a43c99f41b8 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 13 Oct 2015 18:13:51 +0300 Subject: [PATCH 0579/1557] Error on 'if' without an 'else' branch when used as an expression Original commit: e14c9645dc0936e014b228d700c9b52dbf72faec --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 5aceafc6d9e..6282478f645 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -320,7 +320,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilerServices = Services.Builder() .register(javaClass(), IncrementalCompilationComponentsImpl(incrementalCaches, lookupTracker)) .register(javaClass(), object : CompilationCanceledStatus { - override fun checkCanceled(): Unit = if (context.getCancelStatus().isCanceled()) throw CompilationCanceledException() + override fun checkCanceled() { + if (context.getCancelStatus().isCanceled()) throw CompilationCanceledException() + } }) .build() From a41d139afe27e1bb2453ef3abdde01569a4a5eee Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 19 Oct 2015 14:01:59 +0300 Subject: [PATCH 0580/1557] Minor: do simpler check first Original commit: 5ab3dd171683df381fa30cb7f3c1515f1516727a --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6282478f645..2567681de87 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -128,7 +128,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector: MessageCollectorAdapter, outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { // Workaround for Android Studio - if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget()) && !JavaBuilder.IS_ENABLED[context, true]) { + if (!JavaBuilder.IS_ENABLED[context, true] && !JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { messageCollector.report(INFO, "Kotlin JPS plugin is disabled", CompilerMessageLocation.NO_LOCATION) return NOTHING_DONE } From e61c3d330769dbfd52e91717b101ee929ef6e0f4 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 16 Oct 2015 17:15:45 +0300 Subject: [PATCH 0581/1557] Code cleanup: data deprecations and some effective visibility stuff Original commit: cae0388a578a428f2317c620e8e78239f4d79dd6 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index ff37c5b5d2a..5973ba0c983 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -675,9 +675,14 @@ data class ChangesInfo( public fun BuildDataPaths.getKotlinCacheVersion(target: BuildTarget<*>): CacheFormatVersion = CacheFormatVersion(getTargetDataRoot(target)) -private data class KotlinIncrementalStorageProvider( +private class KotlinIncrementalStorageProvider( private val target: ModuleBuildTarget ) : StorageProvider() { + + override fun equals(other: Any?) = other is KotlinIncrementalStorageProvider && target == other.target + + override fun hashCode() = target.hashCode() + override fun createStorage(targetDataDir: File): IncrementalCacheImpl = IncrementalCacheImpl(targetDataDir, target) } From c26a7dfd29798ecbf1a1c2a7802b0739f2ebd47e Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 16 Oct 2015 20:03:31 +0300 Subject: [PATCH 0582/1557] Drop package facades: - incremental cache impl should not depend on package facades - fix trivial incremental compilation tests TODO: inlines DO NOT WORK with incremental compilation Original commit: c55106a325e12118c4834ed4142b824d936c5210 --- .../jps/incremental/CacheFormatVersion.kt | 2 +- .../jps/incremental/IncrementalCacheImpl.kt | 31 +++++-------------- .../module1Modified/build.log | 3 -- .../module2Modified/build.log | 2 -- .../moduleWithConstantModified/build.log | 1 - .../moduleWithInlineModified/build.log | 1 - .../cacheVersionChanged/touchedFile/build.log | 2 -- .../untouchedFiles/build.log | 1 - 8 files changed, 9 insertions(+), 34 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt index ab82093d5cb..d68f4babfd0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt @@ -25,7 +25,7 @@ import java.io.File class CacheFormatVersion(targetDataRoot: File) { companion object { // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 6 + private val INCREMENTAL_CACHE_OWN_VERSION = 7 private val CACHE_FORMAT_VERSION = INCREMENTAL_CACHE_OWN_VERSION * 1000000 + diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 5973ba0c983..6c8b73f7535 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -67,11 +67,9 @@ public class IncrementalCacheImpl( val PROTO_MAP = "proto" val CONSTANTS_MAP = "constants" val INLINE_FUNCTIONS = "inline-functions" - val PACKAGE_PARTS = "package-parts" val MULTIFILE_CLASS_FACADES = "multifile-class-facades" val MULTIFILE_CLASS_PARTS = "multifile-class-parts" val SOURCE_TO_CLASSES = "source-to-classes" - val CLASS_TO_SOURCES = "class-to-sources" val DIRTY_OUTPUT_CLASSES = "dirty-output-classes" val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions" val INLINED_TO = "inlined-to" @@ -93,7 +91,6 @@ public class IncrementalCacheImpl( private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) - private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile)) private val multifileClassFacadeMap = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile)) private val multifileClassPartMap = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile)) private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile)) @@ -134,17 +131,7 @@ public class IncrementalCacheImpl( val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { - val internalName = - if (packagePartMap.isPackagePart(className)) { - val packageInternalName = PackageClassUtils.getPackageClassInternalName(className.packageFqName) - val packageJvmName = JvmClassName.byInternalName(packageInternalName) - packageJvmName.internalName - } - else { - className.internalName - } - - val classFilePath = getClassFilePath(internalName) + val classFilePath = getClassFilePath(className.internalName) fun addFilesAffectedByChangedInlineFuns(cache: IncrementalCacheImpl) { val targetFiles = functions.flatMap { cache.inlinedTo[classFilePath, it] } @@ -190,8 +177,7 @@ public class IncrementalCacheImpl( header.isCompatiblePackageFacadeKind() -> protoMap.process(kotlinClass, isPackage = true) header.isCompatibleFileFacadeKind() -> { - assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } - packagePartMap.addPackagePart(className) + assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + @@ -207,8 +193,7 @@ public class IncrementalCacheImpl( inlineFunctionsMap.process(kotlinClass) } header.isCompatibleMultifileClassPartKind() -> { - assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" } - packagePartMap.addPackagePart(className) + assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" } multifileClassPartMap.add(className.internalName, header.multifileClassName!!) protoMap.process(kotlinClass, isPackage = true) + @@ -248,7 +233,6 @@ public class IncrementalCacheImpl( dirtyClasses.forEach { protoMap.remove(it) - packagePartMap.remove(it) multifileClassFacadeMap.remove(it) multifileClassPartMap.remove(it) constantsMap.remove(it) @@ -259,10 +243,11 @@ public class IncrementalCacheImpl( } override fun getObsoletePackageParts(): Collection { - val obsoletePackageParts = - dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } - KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") - return obsoletePackageParts + return emptyList() +// val obsoletePackageParts = +// dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } +// KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") +// return obsoletePackageParts } override fun getPackagePartData(fqName: String): JvmPackagePartProto? { diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index 784f8dd8873..ae0d40bb5e6 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -7,7 +7,6 @@ End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class -out/production/module1/module1/Module1Package.class out/production/module1/module1/Module1_aKt.class End of files Compiling files: @@ -15,7 +14,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/module2/Module2Package.class out/production/module2/module2/Module2_bKt.class End of files Compiling files: @@ -23,7 +21,6 @@ module2/src/module2_b.kt End of files Cleaning output files: out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3Package.class out/production/module3/module3/Module3_cKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log index 8c069b7fa2d..c1dd95e8e3a 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class -out/production/module1/module1/Module1Package.class out/production/module1/module1/Module1_aKt.class End of files Compiling files: @@ -9,7 +8,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/module2/Module2Package.class out/production/module2/module2/Module2_bKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index 96b3e5069a8..07ee39331d0 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/APackage.class out/production/module1/a/Module1_AKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index 35f17a0b6cc..679e1ce6888 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_AKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log index b8a67cc5ad0..84c1b712769 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log @@ -1,11 +1,9 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Cleaning output files: out/production/module/other/OtherKt.class -out/production/module/other/OtherPackage.class out/production/module/test/AKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log index 133a92b78d7..47ee1d1126c 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt From 428d7236d5ed47ee2022091e21e1f255a314e911 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 16 Oct 2015 20:23:13 +0300 Subject: [PATCH 0583/1557] Drop package facades: - fix KotlinJpsBuildTest Original commit: 989f761166cb4e2e72df46ac49c5f0f90dd273ed --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 67 ++++++++++++------- 1 file changed, 41 insertions(+), 26 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index aa9d2abb009..f5fe840ffaa 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -222,7 +222,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { public fun testKotlinProject() { doTest() - checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")) + checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "Test1Kt")) } public fun testKotlinJavaScriptProject() { @@ -372,17 +372,21 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { doTest() val module = myProject.getModules().get(0) - assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class") + assertFilesExistInOutput(module, "foo/MainKt.class", "boo/BooKt.class", "foo/Bar.class") - checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")) - checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) + checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")) + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt")) checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar"))) - checkWhen(del("src/main.kt"), arrayOf("src/Bar.kt", "src/boo.kt"), mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), arrayOf(klass("kotlinProject", "foo.Bar")))) - assertFilesExistInOutput(module, "boo/BooPackage.class", "foo/Bar.class") - assertFilesNotExistInOutput(module, "foo/FooPackage.class") + checkWhen(del("src/main.kt"), + arrayOf("src/Bar.kt", "src/boo.kt"), + mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.MainKt"), + packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"), + arrayOf(klass("kotlinProject", "foo.Bar")))) + assertFilesExistInOutput(module, "boo/BooKt.class", "foo/Bar.class") + assertFilesNotExistInOutput(module, "foo/MainKt.class") - checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt")) checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar"))) } @@ -390,17 +394,29 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { doTest() val module = myProject.getModules().get(0) - assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class") + assertFilesExistInOutput(module, "foo/MainKt.class", "boo/BooKt.class", "foo/Bar.class") - checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage")) - checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) - checkWhen(touch("src/Bar.kt"), arrayOf("src/Bar.kt"), arrayOf(klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage"), module("kotlinProject"))) + checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")) + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt")) + checkWhen(touch("src/Bar.kt"), + arrayOf("src/Bar.kt"), + arrayOf(klass("kotlinProject", "foo.Bar"), + packagePartClass("kotlinProject", "src/Bar.kt", "foo.MainKt"), + module("kotlinProject"))) - checkWhen(del("src/main.kt"), arrayOf("src/Bar.kt", "src/boo.kt"), mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.FooPackage"), packageClasses("kotlinProject", "src/Bar.kt", "foo.FooPackage"), packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage"), arrayOf(klass("kotlinProject", "foo.Bar")))) - assertFilesExistInOutput(module, "foo/FooPackage.class", "boo/BooPackage.class", "foo/Bar.class") + checkWhen(del("src/main.kt"), + arrayOf("src/Bar.kt", "src/boo.kt"), + mergeArrays(packageClasses("kotlinProject", "src/main.kt", "foo.MainKt"), + packageClasses("kotlinProject", "src/Bar.kt", "foo.MainKt"), + packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt"), + arrayOf(klass("kotlinProject", "foo.Bar")))) + assertFilesExistInOutput(module, "boo/BooKt.class", "foo/Bar.class") - checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooPackage")) - checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar"), klass("kotlinProject", "foo.FooPackage"), packagePartClass("kotlinProject", "src/Bar.kt", "foo.FooPackage"), module("kotlinProject"))) + checkWhen(touch("src/boo.kt"), null, packageClasses("kotlinProject", "src/boo.kt", "boo.BooKt")) + checkWhen(touch("src/Bar.kt"), null, + arrayOf(klass("kotlinProject", "foo.Bar"), + packagePartClass("kotlinProject", "src/Bar.kt", "foo.MainKt"), + module("kotlinProject"))) } public fun testKotlinProjectTwoFilesInOnePackage() { @@ -412,7 +428,6 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(arrayOf(del("src/test1.kt"), del("src/test2.kt")), NOTHING, arrayOf(packagePartClass("kotlinProject", "src/test1.kt", "_DefaultPackage"), packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"), - klass("kotlinProject", "_DefaultPackage"), module("kotlinProject"))) assertFilesNotExistInOutput(myProject.getModules().get(0), "_DefaultPackage.class") @@ -451,13 +466,13 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val result = makeAll() // Check that outputs are located properly - assertFilesExistInOutput(findModule("module2"), "kt1/Kt1Package.class") - assertFilesExistInOutput(findModule("kotlinProject"), "kt2/Kt2Package.class") + assertFilesExistInOutput(findModule("module2"), "kt1/Kt1Kt.class") + assertFilesExistInOutput(findModule("kotlinProject"), "kt2/Kt2Kt.class") result.assertSuccessful() - checkWhen(touch("src/kt2.kt"), null, packageClasses("kotlinProject", "src/kt2.kt", "kt2.Kt2Package")) - checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Package")) + checkWhen(touch("src/kt2.kt"), null, packageClasses("kotlinProject", "src/kt2.kt", "kt2.Kt2Kt")) + checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Kt")) } public fun testCircularDependenciesSamePackage() { @@ -466,10 +481,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.assertSuccessful() // Check that outputs are located properly - val facadeWithA = findFileInOutputDir(findModule("module1"), "test/TestPackage.class") - val facadeWithB = findFileInOutputDir(findModule("module2"), "test/TestPackage.class") - UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "a", "getA") - UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "b", "getB", "setB") + val facadeWithA = findFileInOutputDir(findModule("module1"), "test/AKt.class") + val facadeWithB = findFileInOutputDir(findModule("module2"), "test/BKt.class") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "getA") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "getB", "setB") checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage")) checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) @@ -736,7 +751,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } private fun packageClasses(moduleName: String, fileName: String, packageClassFqName: String): Array { - return arrayOf(module(moduleName), klass(moduleName, packageClassFqName), packagePartClass(moduleName, fileName, packageClassFqName)) + return arrayOf(module(moduleName), packagePartClass(moduleName, fileName, packageClassFqName)) } private fun packagePartClass(moduleName: String, fileName: String, packageClassFqName: String): String { From 49831484ef252fbb14f74b20878ebb3c6fb3ebe8 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 16 Oct 2015 21:52:11 +0300 Subject: [PATCH 0584/1557] Drop package facades: - getting rid of package facades in InlineCodegen & related stuff. Provide binary source element to top-level package members. Original commit: 70c91b2e7532dc7cb85d90ebba47e777341403ac --- .../jps/incremental/IncrementalCacheImpl.kt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 6c8b73f7535..1e462e4f7c9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -520,21 +520,6 @@ public class IncrementalCacheImpl( value.dumpMap { java.lang.Long.toHexString(it) } } - private inner class PackagePartMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { - public fun addPackagePart(className: JvmClassName) { - storage[className.internalName] = true - } - - public fun remove(className: JvmClassName) { - storage.remove(className.internalName) - } - - public fun isPackagePart(className: JvmClassName): Boolean = - className.internalName in storage - - override fun dumpValue(value: Boolean) = "" - } - private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { public fun add(facadeName: JvmClassName, partNames: List) { storage[facadeName.internalName] = partNames From 848216756d1b0e7047a9cff42da2cd72ce348289 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 16 Oct 2015 22:19:00 +0300 Subject: [PATCH 0585/1557] Drop package facades: - update incremental compilation tests Original commit: f2279081512215003204908257bbf60e60c49afe --- .../inlineFunCallSite/classProperty/build.log | 1 - .../inlineFunCallSite/companionObjectProperty/build.log | 1 - .../incremental/inlineFunCallSite/function/build.log | 2 -- .../incremental/inlineFunCallSite/getter/build.log | 2 -- .../incremental/inlineFunCallSite/lambda/build.log | 2 -- .../incremental/inlineFunCallSite/localFun/build.log | 2 -- .../incremental/inlineFunCallSite/method/build.log | 1 - .../inlineFunCallSite/parameterDefaultValue/build.log | 2 -- .../primaryConstructorParameterDefaultValue/build.log | 1 - .../incremental/inlineFunCallSite/superCall/build.log | 1 - .../incremental/inlineFunCallSite/thisCall/build.log | 1 - .../inlineFunCallSite/topLevelObjectProperty/build.log | 1 - .../inlineFunCallSite/topLevelProperty/build.log | 2 -- .../incremental/pureKotlin/annotations/build.log | 1 - .../compilationErrorThenFixedWithPhantomPart/build.log | 1 - .../pureKotlin/conflictingPlatformDeclarations/build.log | 7 +++++-- .../pureKotlin/conflictingPlatformDeclarations/fun1.kt | 2 ++ .../pureKotlin/conflictingPlatformDeclarations/fun2.kt | 2 ++ .../conflictingPlatformDeclarations/fun2.kt.new | 2 ++ .../incremental/pureKotlin/defaultArguments/build.log | 1 - .../delegatedPropertyInlineExtensionAccessor/build.log | 2 -- .../pureKotlin/fileWithInlineFunctionRemoved/build.log | 2 -- .../pureKotlin/filesExchangePackages/build.log | 8 -------- .../incremental/pureKotlin/funRedeclaration/build.log | 1 - .../multifileClassInlineFunctionAccessingField/build.log | 1 - .../pureKotlin/multifileClassRecreated/build.log | 1 - .../pureKotlin/multifileClassRemoved/build.log | 1 - .../pureKotlin/multiplePackagesModified/build.log | 3 --- .../incremental/pureKotlin/optionalParameter/build.log | 1 - .../incremental/pureKotlin/packageFileRemoved/build.log | 4 ---- .../packageInlineFunctionFromOurPackage/build.log | 1 - .../pureKotlin/privateConstantsChanged/build.log | 1 - .../pureKotlin/propertyRedeclaration/build.log | 1 - .../incremental/pureKotlin/returnTypeChanged/build.log | 2 -- .../pureKotlin/soleFileChangesPackage/build.log | 9 --------- .../pureKotlin/valAddCustomAccessor/build.log | 3 +-- .../pureKotlin/valRemoveCustomAccessor/build.log | 3 +-- .../convertBetweenJavaAndKotlin/javaToKotlin/build.log | 1 - .../javaToKotlinAndBack/build.log | 3 --- .../convertBetweenJavaAndKotlin/kotlinToJava/build.log | 1 - .../withJava/javaUsedInKotlin/changeSignature/build.log | 1 - .../javaAndKotlinChangedSimultaneously/build.log | 1 - .../withJava/javaUsedInKotlin/methodRenamed/build.log | 1 - .../samConversions/methodAdded/build.log | 3 +-- .../samConversions/methodSignatureChanged/build.log | 3 +-- .../kotlinUsedInJava/addOptionalParameter/JavaUsage.java | 2 +- .../kotlinUsedInJava/addOptionalParameter/build.log | 2 -- .../kotlinUsedInJava/changeNotUsedSignature/build.log | 1 - .../withJava/kotlinUsedInJava/changeSignature/Usage.java | 2 +- .../withJava/kotlinUsedInJava/changeSignature/build.log | 1 - .../kotlinUsedInJava/funRenamed/WillBeUnresolved.java | 2 +- .../withJava/kotlinUsedInJava/funRenamed/build.log | 3 +-- .../kotlinUsedInJava/notChangeSignature/Usage.java | 2 +- .../kotlinUsedInJava/notChangeSignature/build.log | 1 - .../onlyTopLevelFunctionInFileRemoved/Usage.java | 2 +- .../onlyTopLevelFunctionInFileRemoved/build.log | 6 ------ .../kotlinUsedInJava/packageFileAdded/Usage.java | 2 +- .../kotlinUsedInJava/packageFileAdded/Usage.java.new | 4 ++-- .../withJava/kotlinUsedInJava/packageFileAdded/build.log | 5 ----- .../propertyRenamed/WillBeUnresolved.java | 2 +- .../withJava/kotlinUsedInJava/propertyRenamed/build.log | 3 +-- 61 files changed, 26 insertions(+), 107 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log index 189cef9935f..7c45fecebde 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log index 9c606a33ab8..552f2fae39c 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log index c898540bf6a..131fc644d33 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log index 2f1bb65b15e..7324f24d9d4 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt @@ -10,7 +9,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/TopLevelUsageKt.class out/production/module/usage/Usage.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/Usage.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log index 73c24d79a1d..81dc8237c58 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt @@ -10,7 +9,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt$usage$use$1.class out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log index e03d85b028e..7cfa84f7e3a 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt @@ -10,7 +9,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt$usage$1.class out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log index 189cef9935f..7c45fecebde 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log index c898540bf6a..131fc644d33 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log index 189cef9935f..7c45fecebde 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log index 189cef9935f..7c45fecebde 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log index 189cef9935f..7c45fecebde 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log index 189cef9935f..7c45fecebde 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log index c898540bf6a..131fc644d33 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 1bcd74bbd73..6059154e756 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index e6135ea0ed4..9fec192fafc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/OtherKt.class -out/production/module/_DefaultPackage.class End of files Cleaning output files: out/production/module/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index cf4dad56113..a52dc89f8cb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -1,12 +1,15 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/Fun2Kt.class -out/production/module/test/TestPackage.class +out/production/module/test/Utils.class +out/production/module/test/Utils__Fun2Kt.class End of files Compiling files: src/fun2.kt End of files COMPILATION FAILED +Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): + fun function(list: kotlin.List): kotlin.Unit + fun function(list: kotlin.List): kotlin.Unit Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): fun function(list: kotlin.List): kotlin.Unit fun function(list: kotlin.List): kotlin.Unit \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt index 45fb46b3db7..c40775ad126 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun1.kt @@ -1,3 +1,5 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass package test fun function(list: List) { diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt index 897d69e3641..5cfb71fb5fa 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt @@ -1,3 +1,5 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass package test val x = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new index 97e1b6d862c..b52b4557d42 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/fun2.kt.new @@ -1,3 +1,5 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass package test val x = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index e5452954f7d..8ef11343a77 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/AKt.class out/production/module/META-INF/module.kotlin_module -out/production/module/_DefaultPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log index d4162fbf6f8..2e91170dfdf 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineGetKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inlineGet.kt @@ -20,7 +19,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlinePackage.class out/production/module/inline/InlineSetKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index 733faeb31b6..60df58144eb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,14 +1,12 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 4607a5f8ce2..95279b945bf 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,9 +1,7 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/bar/BarPackage.class out/production/module/bar/CKt.class out/production/module/foo/BKt.class -out/production/module/foo/FooPackage.class End of files Compiling files: src/b.kt @@ -11,14 +9,8 @@ src/c.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/bar/BKt.class -out/production/module/bar/BarPackage.class out/production/module/foo/AKt.class -out/production/module/foo/CKt.class -out/production/module/foo/FooPackage.class End of files Compiling files: src/a.kt -src/b.kt -src/c.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index c0a3c02fc3e..56ddebe1997 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Fun2Kt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun2.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log index 64f2485efca..5d71ad8f098 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log index f920f7c94b5..4bf4f586644 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log index 663b207d00c..0130c5b1155 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class End of files Cleaning output files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 3f1c854ccdd..dbd1e3ebd5e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/b/B2Kt.class -out/production/module/b/BPackage.class End of files Compiling files: src/a2.kt @@ -9,9 +8,7 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/a/A1Kt.class -out/production/module/a/APackage.class out/production/module/b/B1Kt.class -out/production/module/b/BPackage.class End of files Compiling files: src/a1.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index 1bcd74bbd73..6059154e756 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 3dba902abd0..5fde10f5d36 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,16 +1,13 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class -out/production/module/other/OtherPackage.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -21,7 +18,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class -out/production/module/other/OtherPackage.class End of files Compiling files: src/other.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index 64f2485efca..5d71ad8f098 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log index 453becd76c1..9f4084d830a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log @@ -4,7 +4,6 @@ out/production/module/test/ConstKt.class out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/Obj.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 57f8be71b1c..03c96004241 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Prop2Kt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/prop2.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 608f0f77e0d..55336e565a6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,14 +1,12 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 6472fc74235..9ecb2e772f7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,15 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/foo/AKt.class -out/production/module/foo/FooPackage.class -End of files -Compiling files: -src/a.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/AKt.class -out/production/module/bar/BarPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log index 6f1e2c934a1..19a6d813836 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -6,11 +6,10 @@ src/A.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: src/usage.kt End of files COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Int? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Int? \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log index a16744da042..3eb9b489054 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: @@ -16,4 +15,4 @@ End of files Compiling files: src/A.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index feb87ecf426..2e8924b6ec7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -8,7 +8,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class out/production/module/UsageInKotlinKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usageInKotlin.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index 9470b88ba7f..170796b034f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -4,7 +4,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/Foo.kt @@ -13,7 +12,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt @@ -26,7 +24,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index f522c2a2bec..5ca026d1eef 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -10,7 +10,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/Usage.class out/production/module/UsageInKotlinKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usageInKotlin.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index 877c6f84715..fb3b63529f5 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -7,7 +7,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index 56ac4ce0b6a..16bb200a16c 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/JavaClass.class out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index fe3532de44b..7acfe6e0c6e 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -9,7 +9,6 @@ out/production/module/META-INF/module.kotlin_module out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class out/production/module/WillBeResolvedToOtherKt.class out/production/module/WillBeUnresolvedKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/willBeResolvedToOther.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index 5f216e1066a..351c19dafcc 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -6,12 +6,11 @@ src/SamInterface.java End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module +out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$*.class out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class out/production/module/UsageWithFunctionExpressionKt.class out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class out/production/module/UsageWithFunctionLiteralKt.class -out/production/module/_DefaultPackage$sam$SamInterface$*.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usageWithFunctionExpression.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index 23dd90da9ab..51e50502a62 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -6,12 +6,11 @@ src/SamInterface.java End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module +out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$*.class out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class out/production/module/UsageWithFunctionExpressionKt.class out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class out/production/module/UsageWithFunctionLiteralKt.class -out/production/module/_DefaultPackage$sam$SamInterface$*.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usageWithFunctionExpression.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java index da2f9b63512..24f7dfeeee0 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java @@ -1,5 +1,5 @@ class JavaUsage { public static void main(String[] args) { - test.TestPackage.f("x"); + test.FunKt.f("x"); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index 9e3013e637b..ed7f4aa70c3 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt @@ -10,7 +9,6 @@ Cleaning output files: out/production/module/JavaUsage.class out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index 29261260d2e..6d42272706d 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java index c5c8cac1e85..b492ee33f0f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/Usage.java @@ -1,5 +1,5 @@ public class Usage { public static void main(String[] args) { - test.TestPackage.foo(); + test.FunKt.foo(); } } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 9781fe64b23..b8578f3d619 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java index 7d43b904ef1..9fdeb34fe1e 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java @@ -1,5 +1,5 @@ class WillBeUnresolved { void main() { - test.TestPackage.f(":("); + test.FunKt.f(":("); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 0f156cfb7d7..5c2f946ccf7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt @@ -15,4 +14,4 @@ End of files COMPILATION FAILED cannot find symbol symbol : method f(java.lang.String) -location: class test.TestPackage \ No newline at end of file +location: class test.FunKt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java index c5c8cac1e85..b492ee33f0f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/Usage.java @@ -1,5 +1,5 @@ public class Usage { public static void main(String[] args) { - test.TestPackage.foo(); + test.FunKt.foo(); } } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index 29261260d2e..6d42272706d 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java index d1dcba0d6fa..b0c2df3d720 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/Usage.java @@ -1,5 +1,5 @@ class Usage { void usage() { - test.TestPackage.a(); + test.AKt.a(); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 60d621e6d83..3bf6a00fbf0 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -1,20 +1,14 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/Usage.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files -Compiling files: -src/Usage.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java index d1dcba0d6fa..b0c2df3d720 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java @@ -1,5 +1,5 @@ class Usage { void usage() { - test.TestPackage.a(); + test.AKt.a(); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new index bff530ab5c1..91e2e0b5602 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new @@ -1,6 +1,6 @@ class Usage { void usage() { - test.TestPackage.a(); - test.TestPackage.b(); + test.AKt.a(); + test.BKt.b(); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index ed15d46e2c7..097791a0aa3 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -9,13 +9,8 @@ src/Usage.java End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/Usage.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -End of files -Compiling files: -src/Usage.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java index 38666b4ad3c..f4445f33838 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java @@ -1,5 +1,5 @@ class WillBeUnresolved { void main() { - test.TestPackage.getProp(); + test.PropKt.getProp(); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 75f34f18a29..6aabff7ee22 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/PropKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/prop.kt @@ -15,4 +14,4 @@ End of files COMPILATION FAILED cannot find symbol symbol : method getProp() -location: class test.TestPackage \ No newline at end of file +location: class test.PropKt \ No newline at end of file From f0cd2702cb4311722a6d53707564d966f9c454ec Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Sat, 17 Oct 2015 17:26:17 +0300 Subject: [PATCH 0586/1557] Drop package facades: fix incremental compilation tests & proto comparison tests (package facades are no longer generated) Original commit: 621d26aeebe82fbb501b70b4034be95fa5e192a8 --- .../jps/incremental/IncrementalCacheImpl.kt | 34 ++++++++++++++----- .../jps/incremental/storage/LazyStorage.kt | 6 ++-- .../ProtoComparisonTestGenerated.java | 6 ++-- .../new.kt | 0 .../old.kt | 0 .../result.out | 2 +- .../packageFacadeToClass/result.out | 2 +- .../result.out | 1 - .../result.out | 1 - .../packageFacadePublicChanges/result.out | 1 - .../unchangedPackageFacade/result.out | 1 - .../build.log | 1 - .../build.log | 2 -- .../constantValueChanged/build.log | 1 - .../inlineFunctionInlined/build.log | 2 -- .../inlineFunctionTwoPackageParts/build.log | 4 --- .../multiModule/simpleDependency/build.log | 2 -- .../simpleDependencyUnchanged/build.log | 1 - .../transitiveDependency/build.log | 2 -- .../multiModule/transitiveInlining/build.log | 3 -- .../multiModule/twoDependants/build.log | 3 -- .../build.log | 1 - .../build.log | 7 +--- .../accessingPropertiesViaField/build.log | 1 - .../pureKotlin/allConstants/build.log | 2 -- .../anonymousObjectChanged/build.log | 1 - .../classInlineFunctionChanged/build.log | 1 - .../pureKotlin/classRecreated/build.log | 2 -- .../classSignatureChanged/build.log | 1 - .../build.log | 1 - .../build.log | 5 --- .../build.log | 5 ++- .../build.log | 11 ------ .../build.log | 3 -- .../pureKotlin/constantRemoved/build.log | 1 - .../pureKotlin/constantsUnchanged/build.log | 1 - .../dependencyClassReferenced/build.log | 1 - .../fileWithConstantRemoved/build.log | 2 -- .../pureKotlin/funRedeclaration/build.log | 11 +++--- .../inlineFunctionRemoved/build.log | 1 - .../build.log | 3 -- .../inlineFunctionsUnchanged/build.log | 1 - .../pureKotlin/inlineLinesChanged/build.log | 2 -- .../inlineTwoFunctionsOneChanged/build.log | 2 -- .../pureKotlin/localClassChanged/build.log | 1 - .../multifileClassFileAdded/build.log | 2 -- .../multifileClassFileChanged/build.log | 1 - .../build.log | 2 -- .../multifileClassInlineFunction/build.log | 1 - .../build.log | 2 -- .../pureKotlin/ourClassReferenced/build.log | 2 -- .../packageConstantChanged/build.log | 1 - .../pureKotlin/packageFileAdded/build.log | 1 - .../packageFileChangedPackage/build.log | 5 --- .../build.log | 3 -- .../packageFilesChangedInTurn/build.log | 3 -- .../build.log | 1 - .../build.log | 1 - .../build.log | 1 - .../packagePrivateOnlyChanged/build.log | 1 - .../pureKotlin/packageRecreated/build.log | 1 - .../packageRecreatedAfterRenaming/build.log | 10 ------ .../pureKotlin/packageRemoved/build.log | 1 - .../propertyRedeclaration/build.log | 11 +++--- .../pureKotlin/subpackage/build.log | 1 - .../topLevelFunctionSameSignature/build.log | 1 - .../topLevelMembersInTwoFiles/build.log | 1 - .../topLevelPrivateValUsageAdded/build.log | 7 +--- 68 files changed, 54 insertions(+), 148 deletions(-) rename jps/jps-plugin/testData/comparison/classSignatureChange/{classToPackageFacade => classToFileFacade}/new.kt (100%) rename jps/jps-plugin/testData/comparison/classSignatureChange/{classToPackageFacade => classToFileFacade}/old.kt (100%) rename jps/jps-plugin/testData/comparison/classSignatureChange/{classToPackageFacade => classToFileFacade}/result.out (63%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 1e462e4f7c9..d7aeaf112a9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -67,6 +67,7 @@ public class IncrementalCacheImpl( val PROTO_MAP = "proto" val CONSTANTS_MAP = "constants" val INLINE_FUNCTIONS = "inline-functions" + val PACKAGE_PARTS = "package-parts" val MULTIFILE_CLASS_FACADES = "multifile-class-facades" val MULTIFILE_CLASS_PARTS = "multifile-class-parts" val SOURCE_TO_CLASSES = "source-to-classes" @@ -91,11 +92,11 @@ public class IncrementalCacheImpl( private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) + private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile)) private val multifileClassFacadeMap = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile)) private val multifileClassPartMap = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile)) private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile)) private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile)) - // TODO: can be removed? private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) @@ -177,7 +178,8 @@ public class IncrementalCacheImpl( header.isCompatiblePackageFacadeKind() -> protoMap.process(kotlinClass, isPackage = true) header.isCompatibleFileFacadeKind() -> { - assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } + assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } + packagePartMap.addPackagePart(className) protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + @@ -193,7 +195,8 @@ public class IncrementalCacheImpl( inlineFunctionsMap.process(kotlinClass) } header.isCompatibleMultifileClassPartKind() -> { - assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" } + assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" } + packagePartMap.addPackagePart(className) multifileClassPartMap.add(className.internalName, header.multifileClassName!!) protoMap.process(kotlinClass, isPackage = true) + @@ -233,6 +236,7 @@ public class IncrementalCacheImpl( dirtyClasses.forEach { protoMap.remove(it) + packagePartMap.remove(it) multifileClassFacadeMap.remove(it) multifileClassPartMap.remove(it) constantsMap.remove(it) @@ -243,11 +247,10 @@ public class IncrementalCacheImpl( } override fun getObsoletePackageParts(): Collection { - return emptyList() -// val obsoletePackageParts = -// dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } -// KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") -// return obsoletePackageParts + val obsoletePackageParts = + dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } + KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") + return obsoletePackageParts } override fun getPackagePartData(fqName: String): JvmPackagePartProto? { @@ -520,6 +523,21 @@ public class IncrementalCacheImpl( value.dumpMap { java.lang.Long.toHexString(it) } } + private inner class PackagePartMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { + public fun addPackagePart(className: JvmClassName) { + storage[className.internalName] = true + } + + public fun remove(className: JvmClassName) { + storage.remove(className.internalName) + } + + public fun isPackagePart(className: JvmClassName): Boolean = + className.internalName in storage + + override fun dumpValue(value: Boolean) = "" + } + private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { public fun add(facadeName: JvmClassName, partNames: List) { storage[facadeName.internalName] = partNames diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt index 9a002b05951..007e8d0db17 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt @@ -59,13 +59,13 @@ internal class LazyStorage( val keys: Collection get() = getStorageIfExists()?.allKeysWithExistingMapping ?: listOf() - fun contains(key: K): Boolean = + operator fun contains(key: K): Boolean = getStorageIfExists()?.containsMapping(key) ?: false - fun get(key: K): V? = + operator fun get(key: K): V? = getStorageIfExists()?.get(key) - fun set(key: K, value: V) { + operator fun set(key: K, value: V) { getStorageOrCreateNew().put(key, value) } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index fca9885dc30..d6a6ae7a97d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -43,9 +43,9 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } - @TestMetadata("classToPackageFacade") - public void testClassToPackageFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/"); + @TestMetadata("classToFileFacade") + public void testClassToFileFacade() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/"); doTest(fileName); } diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/new.kt similarity index 100% rename from jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/new.kt rename to jps/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/new.kt diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/old.kt similarity index 100% rename from jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/old.kt rename to jps/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/old.kt diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/result.out similarity index 63% rename from jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out rename to jps/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/result.out index 2d7f4a601b2..f20b90a9fb8 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classToPackageFacade/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/result.out @@ -1,3 +1,3 @@ REMOVED: class MainKt$Companion.class +REMOVED: class TestPackage.class changes in test/MainKt: CLASS_SIGNATURE -changes in test/TestPackage: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out index ea61b532d55..aeacc916ed4 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/result.out @@ -1,3 +1,3 @@ ADDED: class MainKt$Companion.class +ADDED: class TestPackage.class changes in test/MainKt: CLASS_SIGNATURE -changes in test/TestPackage: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out index 7868fd3e24c..6408bf25bd5 100644 --- a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out +++ b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/result.out @@ -1,4 +1,3 @@ -changes in test/TestPackage: NONE skip test/Utils changes in test/Utils__Main1Kt: MEMBERS [publicAddedFun1] diff --git a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out index 2b72c17b8c9..f1d7bb25ec4 100644 --- a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out +++ b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/result.out @@ -1,2 +1 @@ changes in test/MainKt: NONE -changes in test/TestPackage: NONE diff --git a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out index 78f2014d8d6..44a87ed54f8 100644 --- a/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out +++ b/jps/jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/result.out @@ -1,3 +1,2 @@ changes in test/MainKt: MEMBERS [addedFun, addedVal, changedFun, changedVal, removedFun, removedVal] -changes in test/TestPackage: NONE diff --git a/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out b/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out index 2b72c17b8c9..f1d7bb25ec4 100644 --- a/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out +++ b/jps/jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/result.out @@ -1,2 +1 @@ changes in test/MainKt: NONE -changes in test/TestPackage: NONE diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index 28e47e17c31..3b32ed64b7a 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/Module1_aKt.class -out/production/module1/test/TestPackage.class End of files Compiling files: module1/src/module1_a.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index b7aa90ed99f..39074c74d70 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 0a36e429697..fd4b25b3281 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/Module1_constKt.class -out/production/module1/test/TestPackage.class End of files Compiling files: module1/src/module1_const.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index d83166dbc16..791a5274399 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageKt.class -out/production/module2/usage/UsagePackage.class End of files Compiling files: module2/src/module2_usage.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index e58786bb51a..a5103f47632 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineFKt.class End of files Compiling files: @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageFKt.class -out/production/module2/usage/UsagePackage.class End of files Compiling files: module2/src/module2_usageF.kt @@ -18,7 +16,6 @@ End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/InlinePackage.class out/production/module1/inline/Module1_inlineGKt.class End of files Compiling files: @@ -27,7 +24,6 @@ End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/Module2_usageGKt.class -out/production/module2/usage/UsagePackage.class End of files Compiling files: module2/src/module2_usageG.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index e41875375b3..c1cc4371b80 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: @@ -9,7 +8,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index b50d1ef170e..d8abebfacd9 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index e41875375b3..c1cc4371b80 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: @@ -9,7 +8,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index cbcb127580d..1a3419a31d0 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: @@ -8,7 +7,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: @@ -16,7 +14,6 @@ module2/src/module2_b.kt End of files Cleaning output files: out/production/module3/META-INF/module3.kotlin_module -out/production/module3/c/CPackage.class out/production/module3/c/Module3_cKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index 17c93731c9a..231ec872217 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class -out/production/module1/a/APackage.class out/production/module1/a/Module1_aKt.class End of files Compiling files: @@ -9,7 +8,6 @@ module1/src/module1_a.kt End of files Cleaning output files: out/production/module3/META-INF/module3.kotlin_module -out/production/module3/c/CPackage.class out/production/module3/c/Module3_cKt.class End of files Compiling files: @@ -17,7 +15,6 @@ module3/src/module3_c.kt End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/BPackage.class out/production/module2/b/Module2_bKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index f6d869802f6..e6382637768 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log index 7f7b03e5656..0ec1f516f0d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: @@ -11,13 +10,9 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class -out/production/module/other/OtherPackage.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class -out/production/module/test/UsageKt.class End of files Compiling files: src/a.kt src/other.kt -src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index f6d869802f6..e6382637768 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index d7f5b678069..d06d82dfad0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt @@ -11,7 +10,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index aea6b8eb09c..05305b4fbc1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/a/AKt$foo$1.class out/production/module/a/AKt.class -out/production/module/a/APackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index 66ea0c9264b..d9c7184cdc5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -7,7 +7,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index 7bfb2824b7b..e0121953e8d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -6,7 +6,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt @@ -19,7 +18,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/OtherKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/other.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 5b708acde85..4af27f55f39 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -6,7 +6,6 @@ src/class.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index 608d27e154b..b5bba6d6639 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index b86cc3d98f3..a2d97b25cad 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/usage.kt @@ -10,10 +9,6 @@ COMPILATION FAILED Expecting an expression -Cleaning output files: -out/production/module/FunKt.class -End of files Compiling files: -src/fun.kt src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index 9fec192fafc..c40d007ecf8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -12,10 +12,13 @@ COMPILATION FAILED Expecting an expression +Compiling files: +src/usage.kt +End of files Cleaning output files: out/production/module/FunKt.class +out/production/module/META-INF/module.kotlin_module End of files Compiling files: src/fun.kt -src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index 568e98b633e..3baa953b9de 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/OtherKt.class out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/other.kt @@ -12,24 +11,14 @@ COMPILATION FAILED Expecting an expression -Cleaning output files: -out/production/module/FunKt.class -End of files Compiling files: -src/fun.kt src/other.kt src/usage.kt End of files Cleaning output files: out/production/module/FunKt.class out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class -out/production/module/new/NewPackage.class -out/production/module/new/OtherKt.class End of files Compiling files: src/fun.kt -src/other.kt -src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index 707e820c744..7b1f40c1e02 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/B.class out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/other.kt @@ -20,9 +19,7 @@ Cleaning output files: out/production/module/A.class out/production/module/META-INF/module.kotlin_module out/production/module/UsageKt.class -out/production/module/_DefaultPackage.class out/production/module/new/LikePartKt.class -out/production/module/new/NewPackage.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index d510d134860..03a0bbef9ef 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 5dd5778c4da..34e9b8168a2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -3,7 +3,6 @@ out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 83f507ec501..2afa4c79cd7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index 0c625ec403a..9675632dd89 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,14 +1,12 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 56ddebe1997..8581a0c52c8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -5,7 +5,10 @@ End of files Compiling files: src/fun2.kt End of files -COMPILATION FAILED -Platform declaration clash: The following declarations have the same JVM signature (function()V): - fun function(): kotlin.Unit - fun function(): kotlin.Unit \ No newline at end of file +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Fun1Kt.class +End of files +Compiling files: +src/fun1.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 1610391fa42..693a52e4076 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index 4fc890074a5..a494ecda26d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt @@ -17,7 +15,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index a54e1398ea7..d1fcb39ec95 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class out/production/module/inline/Klass.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log index 387aadf985d..004b241bfbd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log @@ -1,14 +1,12 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsagePackage.class out/production/module/usage/UseGKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log index c881d0f9efe..ac2a1edc839 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log @@ -1,14 +1,12 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsagePackage.class out/production/module/usage/UsesGKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index a1d5fac9789..8bcb920f9f5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt$foo$X.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log index 50ccb081084..a92e18853c5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log @@ -4,7 +4,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class out/production/module/test/Test__BKt.class End of files @@ -15,7 +14,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log index 82b2f80c31e..a9a6b9d26d9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__BKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log index 8366c68cc13..3e38eacb915 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__BKt.class End of files Compiling files: @@ -10,7 +9,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log index 64f2485efca..5d71ad8f098 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log index 9e245d73c4a..18aa43b6fc9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class -out/production/module/test/TestPackage.class out/production/module/test/Test__AKt.class End of files Compiling files: @@ -15,7 +14,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test2/Test2.class -out/production/module/test2/Test2Package.class out/production/module/test2/Test2__AKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index 6330ba2d73d..f6db1281cca 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -12,7 +11,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/klass/Klass.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/Klass.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index 3e12fb327e1..e2f10970eb7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/const.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index e72ed20e75d..63886b2e9de 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -4,7 +4,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 9256b8b2c7b..3bf6a00fbf0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,19 +1,14 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/newName/BKt.class -out/production/module/newName/NewNamePackage.class out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt -src/b.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index c3202a992c2..6d48cad7fb8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -11,14 +10,12 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 756a5208a1e..201a5da3f4d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt @@ -11,7 +10,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/b.kt @@ -21,7 +19,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index 64f2485efca..5d71ad8f098 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log index a9c8fe4ddc2..5c549fedfb3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/Utils.class out/production/module/test/Utils__Pkg1Kt.class out/production/module/test/Utils__Pkg2Kt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log index 4c132408b65..86929627da9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/Utils.class out/production/module/test/Utils__Pkg1Kt.class out/production/module/test/Utils__Pkg2Kt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log index ed1502ec2a6..6aa345e8bd2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/PkgKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/pkg.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 447eefc6d66..f03973ae191 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index e9ec0e2d294..e0e7540f091 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,15 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class -End of files -Compiling files: -src/a.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test2/AKt.class -out/production/module/test2/Test2Package.class End of files Compiling files: src/a.kt @@ -22,7 +13,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test2/AKt.class -out/production/module/test2/Test2Package.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 031eab48aa7..58112c0c033 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Cleaning output files: out/production/module/test/BKt.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 03c96004241..6314d92d2ad 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -5,7 +5,10 @@ End of files Compiling files: src/prop2.kt End of files -COMPILATION FAILED -Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): - fun (): kotlin.Int - fun (): kotlin.Int \ No newline at end of file +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Prop1Kt.class +End of files +Compiling files: +src/prop1.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index 7da9e935797..e3f3aac4243 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -2,7 +2,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/outer/nested/NestedKt$main$1.class out/production/module/outer/nested/NestedKt.class -out/production/module/outer/nested/NestedPackage.class End of files Compiling files: src/nested.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index 29261260d2e..6d42272706d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/FunKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/fun.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 83f507ec501..2afa4c79cd7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class -out/production/module/test/TestPackage.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log index 992db6b386d..4827d2f4878 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/TestPackage.class out/production/module/test/UsageKt.class End of files Compiling files: @@ -10,10 +9,6 @@ COMPILATION FAILED Cannot access 'foo': it is 'private' in file -Cleaning output files: -out/production/module/test/FooKt.class -End of files Compiling files: -src/foo.kt src/usage.kt -End of files +End of files \ No newline at end of file From 70ff0d967652719195777ccf4369cabce37975da Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Sat, 17 Oct 2015 19:01:59 +0300 Subject: [PATCH 0587/1557] Drop package facades: fix testData for IncrementalLazyCachesTestGenerated Original commit: ac1f0efe7c68f978acb45163df033316a884c62b --- .../testData/incremental/lazyKotlinCaches/constant/build.log | 2 -- .../testData/incremental/lazyKotlinCaches/function/build.log | 3 +-- .../lazyKotlinCaches/inlineFunctionWithUsage/build.log | 4 +--- .../lazyKotlinCaches/inlineFunctionWithoutUsage/build.log | 3 +-- 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log index 2a2e5870c31..b539afde438 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/constant/ConstantKt.class -out/production/module/constant/ConstantPackage.class End of files Compiling files: src/constant.kt @@ -9,7 +8,6 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log index 2664e23862b..a40eeba1a4a 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log @@ -1,8 +1,7 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/UtilsKt.class -out/production/module/_DefaultPackage.class End of files Compiling files: src/utils.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log index 83bdd5a2da2..131fc644d33 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt @@ -9,8 +8,7 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/UsageKt.class -out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log index 003142b5452..693a52e4076 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log @@ -1,8 +1,7 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/inline/InlineKt.class -out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt -End of files +End of files \ No newline at end of file From 099d588802da2ecae1c1f1a2d8de3a496f374678 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 19 Oct 2015 11:11:32 +0300 Subject: [PATCH 0588/1557] Drop package facades: fix testData for IncrementalProjectPathCaseChangedTest Original commit: 639300a89d1695f368c7787bdd729197f9894974 --- .../testData/incremental/custom/projectPathCaseChanged/build.log | 1 - .../incremental/custom/projectPathCaseChangedMultiFile/build.log | 1 - 2 files changed, 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log index c3579d28234..acae21392b6 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/FooKt.class out/production/module/META-INF/module.kotlin_module -out/production/module/_DefaultPackage.class End of files Compiling files: src/foo.kt diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log index c3579d28234..acae21392b6 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log @@ -1,7 +1,6 @@ Cleaning output files: out/production/module/FooKt.class out/production/module/META-INF/module.kotlin_module -out/production/module/_DefaultPackage.class End of files Compiling files: src/foo.kt From 1bd1fbeee4a4010a264b5ae8c9604a6923af8621 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 19 Oct 2015 15:20:23 +0300 Subject: [PATCH 0589/1557] Drop package facades: - update tests - cleanup JetTyMapper after rebase Original commit: dda508234fa8a6e4b7afb21f6d9888ebc9285538 --- .../multiModule/constantValueChanged/build.log | 3 +-- .../incremental/pureKotlin/allConstants/build.log | 3 +-- .../pureKotlin/packageConstantChanged/build.log | 3 +-- .../pureKotlin/propertyRedeclaration/build.log | 11 ++++------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index fd4b25b3281..144dd0bb291 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -8,7 +8,6 @@ End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/Module1_constKt.class -out/production/module1/test/TestPackage.class End of files Compiling files: module1/src/module1_const.kt @@ -18,4 +17,4 @@ out/production/module2/usage/Usage.class End of files Compiling files: module2/src/module2_usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index d06d82dfad0..46b44cd6dd2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -17,10 +17,9 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class out/production/module/test/Usage.class End of files Compiling files: src/const.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index e2f10970eb7..52d2dfe569e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -8,10 +8,9 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/ConstKt.class -out/production/module/test/TestPackage.class out/production/module/test/Usage.class End of files Compiling files: src/const.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 6314d92d2ad..03c96004241 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -5,10 +5,7 @@ End of files Compiling files: src/prop2.kt End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Prop1Kt.class -End of files -Compiling files: -src/prop1.kt -End of files \ No newline at end of file +COMPILATION FAILED +Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): + fun (): kotlin.Int + fun (): kotlin.Int \ No newline at end of file From 79a82d9466ea9d1c1872dde58496c5410e951aa2 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 19 Oct 2015 15:10:54 +0200 Subject: [PATCH 0590/1557] Setting property that controls application environment lifetime for daemon builds Original commit: 376c188cf7c1ba0a1ea3787a14cef875d741b82a --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 50e752af3b6..19897e05a6c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -136,6 +136,10 @@ public object KotlinCompilerRunner { val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) val daemonOptions = configureDaemonOptions() val daemonJVMOptions = configureDaemonJVMOptions(true) + // the property should be set by default for daemon builds to avoid parallel building problems + // but it cannot be currently set by default globally, because it seems breaks many tests + // TODO: find out how to get rid of the property and make it the default behavior + daemonJVMOptions.jvmParams.add("Dkotlin.environment.keepalive") val daemonReportMessages = ArrayList() From 7dd7ec447dff0d814599610c1ecbc17b24706df7 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 19 Oct 2015 19:16:23 +0300 Subject: [PATCH 0591/1557] Drop @inline from tests and incremental compilation Original commit: d87ce33458866117de947e85e9c90c67175aac6d --- .../jps/incremental/IncrementalCacheImpl.kt | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index d7aeaf112a9..3de1a1a4800 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -27,17 +27,15 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.jps.incremental.storage.StorageOwner +import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.BasicMap import org.jetbrains.kotlin.jps.incremental.storage.BasicStringMap -import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.ModuleMapping -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto -import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName import org.jetbrains.kotlin.serialization.jvm.BitEncoding @@ -49,8 +47,6 @@ import java.io.File import java.security.MessageDigest import java.util.* -val INLINE_ANNOTATION_DESC = "Lkotlin/inline;" - internal val CACHE_DIRECTORY_NAME = "kotlin" @TestOnly @@ -451,26 +447,21 @@ public class IncrementalCacheImpl( private fun getInlineFunctionsMap(bytes: ByteArray): Map { val result = HashMap() + val inlineFunctions = inlineFunctionsJvmNames(bytes) + if (inlineFunctions.isEmpty()) return emptyMap() + ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { val dummyClassWriter = ClassWriter(Opcodes.ASM5) + return object : MethodVisitor(Opcodes.ASM5, dummyClassWriter.visitMethod(0, name, desc, null, exceptions)) { - var hasInlineAnnotation = false - - override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? { - if (desc == INLINE_ANNOTATION_DESC) { - hasInlineAnnotation = true - } - return null - } - override fun visitEnd() { - if (hasInlineAnnotation) { - val dummyBytes = dummyClassWriter.toByteArray()!! - val hash = dummyBytes.md5() + val jvmName = name + desc + if (jvmName !in inlineFunctions) return - result[name + desc] = hash - } + val dummyBytes = dummyClassWriter.toByteArray()!! + val hash = dummyBytes.md5() + result[jvmName] = hash } } } From b4033f2bcdfabd93c10371d9b7c97f81717238e8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 19 Oct 2015 16:00:15 +0300 Subject: [PATCH 0592/1557] Fix tests Original commit: 6f96484e1f00a265c3a9b93d9d68734f95a43523 --- .../pureKotlin/fileWithInlineFunctionRemoved/build.log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index 60df58144eb..5d8302cd157 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -12,4 +12,4 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Unresolved reference: f \ No newline at end of file +Unresolved reference: inline \ No newline at end of file From 406783b53d075d7db78678a6e075d0c33f88e306 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 19 Oct 2015 19:14:40 +0300 Subject: [PATCH 0593/1557] Code cleanup Original commit: e9e42b0251dcb61ff105903c2ee15d0062388616 --- .../pureKotlin/fileWithInlineFunctionRemoved/build.log | 4 ++-- .../pureKotlin/fileWithInlineFunctionRemoved/inline.kt | 2 +- .../pureKotlin/fileWithInlineFunctionRemoved/usage.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index 5d8302cd157..78dbad6abae 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class +out/production/module/test/InlineKt.class End of files Compiling files: End of files @@ -12,4 +12,4 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Unresolved reference: inline \ No newline at end of file +Unresolved reference: test \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt index 80d71e901a3..fb5e59f5432 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/inline.kt @@ -1,4 +1,4 @@ -package inline +package test inline fun f(body: () -> Unit) { println("i'm inline function") diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt index 6e64d97cde2..98840f6537a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/usage.kt @@ -1,7 +1,7 @@ package usage fun main(args: Array) { - inline.f { + test.f { println("to be inlined") } } From 13aedbd1616b1d199db1d4d0b4dd270e53fb6fe6 Mon Sep 17 00:00:00 2001 From: Max Kammerer Date: Mon, 19 Oct 2015 21:13:53 +0300 Subject: [PATCH 0594/1557] Incremental compilation test data update after making package property backing field private Original commit: 715893446c475397a4515fece2d7280d2175e2b0 --- .../jps/build/IncrementalLazyCachesTestGenerated.java | 6 ++++++ .../incremental/lazyKotlinCaches/constant/build.log | 2 ++ .../incremental/lazyKotlinCaches/constant/constant.kt | 2 +- .../incremental/lazyKotlinCaches/constant/constant.kt.new | 2 +- .../lazyKotlinCaches/topLevelPropertyAccess/build.log | 7 +++++++ .../lazyKotlinCaches/topLevelPropertyAccess/constant.kt | 3 +++ .../topLevelPropertyAccess/constant.kt.new | 3 +++ .../topLevelPropertyAccess/expected-kotlin-caches.txt | 6 ++++++ .../lazyKotlinCaches/topLevelPropertyAccess/usage.kt | 4 ++++ 9 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 2460cccbdca..2b29dff9834 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -71,4 +71,10 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC doTest(fileName); } + @TestMetadata("topLevelPropertyAccess") + public void testTopLevelPropertyAccess() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); + doTest(fileName); + } + } diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log index b539afde438..b9269ba28f4 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log @@ -7,8 +7,10 @@ src/constant.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module +out/production/module/constant/ConstantKt.class out/production/module/usage/UsageKt.class End of files Compiling files: +src/constant.kt src/usage.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt index 5bb00251bf3..d86254c6145 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt @@ -1,3 +1,3 @@ package constant -val X = 10 \ No newline at end of file +const val X = 10 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new index 922484aea23..e068bc3b724 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new @@ -1,3 +1,3 @@ package constant -val X = 11 \ No newline at end of file +const val X = 11 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log new file mode 100644 index 00000000000..2914423d765 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/constant/ConstantKt.class +End of files +Compiling files: +src/constant.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt new file mode 100644 index 00000000000..5bb00251bf3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt @@ -0,0 +1,3 @@ +package constant + +val X = 10 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new new file mode 100644 index 00000000000..922484aea23 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new @@ -0,0 +1,3 @@ +package constant + +val X = 11 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt new file mode 100644 index 00000000000..89837f47189 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt @@ -0,0 +1,6 @@ +Module 'module' production + format-version.txt + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt new file mode 100644 index 00000000000..4a70ee33065 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt @@ -0,0 +1,4 @@ +package usage + +fun f(): Int = + constant.X \ No newline at end of file From 3b8d50f06e4b6efb22a3c4671e08e32c9ab37688 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 20 Oct 2015 17:18:11 +0300 Subject: [PATCH 0595/1557] OverloadResolver: fix redeclaration diagnostics issue in incremental compilation (KT-6165) J2K: OverloadUtil.kt Original commit: 51703416243a22aa4b25dc5e67f9133408d9c3e9 --- .../incremental/pureKotlin/funRedeclaration/build.log | 9 ++------- .../pureKotlin/propertyRedeclaration/build.log | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 8581a0c52c8..1e5f3f89482 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -5,10 +5,5 @@ End of files Compiling files: src/fun2.kt End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Fun1Kt.class -End of files -Compiling files: -src/fun1.kt -End of files \ No newline at end of file +COMPILATION FAILED +'public fun function(): kotlin.Unit' is already defined in test \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 03c96004241..60cc1bf3937 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -6,6 +6,4 @@ Compiling files: src/prop2.kt End of files COMPILATION FAILED -Platform declaration clash: The following declarations have the same JVM signature (getProperty()I): - fun (): kotlin.Int - fun (): kotlin.Int \ No newline at end of file +Redeclaration: property \ No newline at end of file From abac00df69b672cbca9c54674f092b51f21bf72c Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 21 Oct 2015 16:35:23 +0300 Subject: [PATCH 0596/1557] KT-6165, KT-9547: fix testData for JPS plugin. Test contains effectively single module (with circular dependencies), and should not have conflicting declarations. Rename the package in a library used in this test. #KT-9547 Fixed Original commit: 1a58636ea951aa6a82f2121b8d70db49db512241 --- .../oldModuleLib/src/{ => lib}/module1/JavaClass.java | 2 +- .../oldModuleLib/src/{ => lib}/module1/b.kt | 4 ++-- .../oldModuleLib/src/{ => lib}/module2/KotlinObject.kt | 2 +- .../oldModuleLib/src/{ => lib}/module2/a.kt | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) rename jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/{ => lib}/module1/JavaClass.java (76%) rename jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/{ => lib}/module1/b.kt (66%) rename jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/{ => lib}/module2/KotlinObject.kt (78%) rename jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/{ => lib}/module2/a.kt (66%) diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java similarity index 76% rename from jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java rename to jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java index 695f1f369ac..3ee75e14976 100644 --- a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/JavaClass.java +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/JavaClass.java @@ -1,4 +1,4 @@ -package module1; +package lib.module1; public class JavaClass { public static void oldJavaMethod() {} diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt similarity index 66% rename from jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt rename to jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt index f849db6dc81..2d7a7f20b33 100644 --- a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module1/b.kt +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module1/b.kt @@ -1,6 +1,6 @@ -package module1 +package lib.module1 -import module2.* +import lib.module2.* fun foo() { JavaClass.oldJavaMethod() diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt similarity index 78% rename from jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt rename to jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt index 9abb5fd9320..cb5a7f55c77 100644 --- a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/KotlinObject.kt +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/KotlinObject.kt @@ -1,4 +1,4 @@ -package module2 +package lib.module2 public object KotlinObject { public fun oldKotlinMethod() { diff --git a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt similarity index 66% rename from jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt rename to jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt index c595a192cad..ff5c408f39b 100644 --- a/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/module2/a.kt +++ b/jps/jps-plugin/testData/general/CircularDependencyWithReferenceToOldVersionLib/oldModuleLib/src/lib/module2/a.kt @@ -1,6 +1,6 @@ -package module2 +package lib.module2 -import module1.* +import lib.module1.* fun bar() { JavaClass.oldJavaMethod() From 4899abe828585d67735855b650bc0a9b471b79c9 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 27 Oct 2015 02:40:10 +0300 Subject: [PATCH 0597/1557] Fix incremental test (DefaultImpls are not generated for an empty interface) Original commit: 10eed8f7cdc2c8aa16ee4b1dd13e85fcb0f7a80d --- .../pureKotlin/traitClassObjectConstantChanged/build.log | 2 -- 1 file changed, 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 3ea22bfaba3..3af1c73f9f2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -1,6 +1,5 @@ Cleaning output files: out/production/module/test/Trait$Companion.class -out/production/module/test/Trait$DefaultImpls.class out/production/module/test/Trait.class End of files Compiling files: @@ -8,7 +7,6 @@ src/const.kt End of files Cleaning output files: out/production/module/test/Trait$Companion.class -out/production/module/test/Trait$DefaultImpls.class out/production/module/test/Trait.class out/production/module/test/Usage.class End of files From ae8748d5938cc1f719f5ae29530e84bcb402f351 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 22 Oct 2015 22:24:06 +0300 Subject: [PATCH 0598/1557] Minor: print "" for root package instead empty string in Lookup tests. Additionally fixed warnings. Original commit: 2d859d619182c2f9da4294cb728cda24fe4cc2e8 --- .../kotlin/jps/build/AbstractLookupTrackerTest.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 4af96a722b6..628421fca5a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -23,7 +23,6 @@ import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.utils.join import java.io.File import java.util.* -import kotlin.test.fail private val DECLARATION_KEYWORDS = listOf("interface", "class", "enum class", "object", "fun", "val", "var") @@ -34,7 +33,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( // ignore KDoc like comments which starts with `/**`, example: /** text */ val COMMENT_WITH_LOOKUP_INFO = "/\\*[^*]+\\*/".toRegex() - override fun createLookupTracker() = TestLookupTracker() + override fun createLookupTracker(): LookupTracker = TestLookupTracker() override fun checkLookups(lookupTracker: LookupTracker) { if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker.javaClass}") @@ -50,7 +49,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val text = file.readText() - val matchResult = COMMENT_WITH_LOOKUP_INFO.match(text) + val matchResult = COMMENT_WITH_LOOKUP_INFO.find(text) if (matchResult != null) { fail("File $file unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") } @@ -61,7 +60,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val columnToLookups = lookupsFromLine.groupBy { it.lookupColumn!! }.toList().sortedBy { it.first } val lineContent = lines[line - 1] - val parts = ArrayList(columnToLookups.size() * 2) + val parts = ArrayList(columnToLookups.size * 2) var start = 0 @@ -81,7 +80,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( else -> "(" + it.name + ")" } - it.scopeKind.toString()[0].toLowerCase().toString() + ":" + it.scopeFqName + name + it.scopeKind.toString()[0].toLowerCase().toString() + ":" + it.scopeFqName.let { if (it.isNotEmpty()) it else "" } + name } parts.add(lookups) @@ -89,7 +88,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( start = end } - lines[line - 1] = parts.join("") + lineContent.subSequence(start, lineContent.length()) + lines[line - 1] = parts.join("") + lineContent.subSequence(start, lineContent.length) } val actual = lines.joinToString("\n") From a8e6d8fdfbe6ed0a6a1b7471f58843022cd94ecd Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 23 Oct 2015 19:22:12 +0300 Subject: [PATCH 0599/1557] Add the support checking lookups after modifications Original commit: cc3c76ae6701570b1fa753ffe49fb1423df15d12 --- .../jps/build/AbstractIncrementalJpsTest.kt | 26 +++++++---- .../jps/build/AbstractLookupTrackerTest.kt | 44 +++++++++++++++---- 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index c47e195ec9e..008e899868c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -56,7 +56,6 @@ import java.util.* import kotlin.properties.Delegates import kotlin.test.assertEquals import kotlin.test.assertFalse -import kotlin.test.fail public abstract class AbstractIncrementalJpsTest( private val allowNoFilesWithSuffixInTestData: Boolean = false, @@ -109,10 +108,10 @@ public abstract class AbstractIncrementalJpsTest( protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING - protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) { + protected open fun checkLookups(modifications: List, @Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) { } - fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all()): MakeResult { + private fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all(), modifications: List, checkLookups: Boolean = true): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath) val logger = MyLogger(workDirPath) projectDescriptor = createProjectDescriptor(BuildLoggingManager(logger)) @@ -127,7 +126,9 @@ public abstract class AbstractIncrementalJpsTest( builder.addMessageHandler(buildResult) builder.build(scope.build(), false) - checkLookups(lookupTracker) + if (checkLookups) { + checkLookups(modifications, lookupTracker) + } if (!buildResult.isSuccessful) { val errorMessages = @@ -149,17 +150,17 @@ public abstract class AbstractIncrementalJpsTest( } private fun initialMake(): MakeResult { - val makeResult = build() + val makeResult = build(modifications = emptyList()) assertFalse(makeResult.makeFailed, "Initial make failed:\n$makeResult") return makeResult } - private fun make(): MakeResult { - return build() + private fun make(modifications: List): MakeResult { + return build(modifications = modifications) } private fun rebuild(): MakeResult { - return build(CompileScopeTestBuilder.rebuild().allModules()) + return build(CompileScopeTestBuilder.rebuild().allModules(), emptyList(), checkLookups = false) } private fun getModificationsToPerform(moduleNames: Collection?): List> { @@ -346,7 +347,14 @@ public abstract class AbstractIncrementalJpsTest( for (step in modifications) { step.forEach { it.perform(workDir) } performAdditionalModifications(step) - results.add(make()) + if (moduleNames == null) { + preProcessSources(File(workDir, "src")) + } + else { + moduleNames.forEach { preProcessSources(File(workDir, "$it/src")) } + } + + results.add(make(step)) } return results } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 628421fca5a..6b71c749f94 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -35,23 +35,22 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( override fun createLookupTracker(): LookupTracker = TestLookupTracker() - override fun checkLookups(lookupTracker: LookupTracker) { + override fun checkLookups(modifications: List, lookupTracker: LookupTracker) { if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker.javaClass}") val fileToLookups = lookupTracker.lookups.groupBy { it.lookupContainingFile } val workSrcDir = File(workDir, "src") - for (file in workSrcDir.walkTopDown()) { - if (!file.isFile) continue + fun checkLookupsInFile(expectedFile: File, actualFile: File) { - val independentFilePath = FileUtil.toSystemIndependentName(file.path) - val lookupsFromFile = fileToLookups[independentFilePath] ?: continue + val independentFilePath = FileUtil.toSystemIndependentName(actualFile.path) + val lookupsFromFile = fileToLookups[independentFilePath] ?: return - val text = file.readText() + val text = actualFile.readText() val matchResult = COMMENT_WITH_LOOKUP_INFO.find(text) if (matchResult != null) { - fail("File $file unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") + fail("File $actualFile unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") } val lines = text.lines().toArrayList() @@ -93,7 +92,28 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val actual = lines.joinToString("\n") - JetTestUtils.assertEqualsToFile(File(testDataDir, independentFilePath.replace(".*/src/".toRegex(), "")), actual) + JetTestUtils.assertEqualsToFile(expectedFile, actual) + } + + if (modifications.isNotEmpty()) { + for (modification in modifications) { + if (modification !is ModifyContent) continue + + val expectedFile = modification.dataFile + val actualFile = File(workDir, modification.path) + + checkLookupsInFile(expectedFile, actualFile) + } + } + else { + for (actualFile in workSrcDir.walkTopDown()) { + if (!actualFile.isFile) continue + + val independentFilePath = FileUtil.toSystemIndependentName(actualFile.path) + val expectedFile = File(testDataDir, independentFilePath.replace(".*/src/".toRegex(), "")) + + checkLookupsInFile(expectedFile, actualFile) + } } } @@ -102,7 +122,13 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( private fun dropBlockComments(workSrcDir: File) { for (file in workSrcDir.walkTopDown()) { if (!file.isFile) continue - file.writeText(file.readText().replace(COMMENT_WITH_LOOKUP_INFO, "")) + + val original = file.readText() + val modified = original.replace(COMMENT_WITH_LOOKUP_INFO, "") + + if (original != modified) { + file.writeText(modified) + } } } } From ef1d6efe1e9c7cb3b9f1fb92bb4aa0cfef1e0126 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 26 Oct 2015 20:35:31 +0300 Subject: [PATCH 0600/1557] Allow to fail on initial build in incremental tests if testdata contains "init-build.log" file Original commit: 412e078a6b2e5bf3278fd7e646a3a30c4db3cf59 --- .../jps/build/AbstractIncrementalJpsTest.kt | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 008e899868c..36d4b075bd9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -151,7 +151,15 @@ public abstract class AbstractIncrementalJpsTest( private fun initialMake(): MakeResult { val makeResult = build(modifications = emptyList()) - assertFalse(makeResult.makeFailed, "Initial make failed:\n$makeResult") + + val initBuildLogFile = File(testDataDir, "init-build.log") + if (initBuildLogFile.exists()) { + UsefulTestCase.assertSameLinesWithFile(initBuildLogFile.absolutePath, makeResult.log) + } + else { + assertFalse(makeResult.makeFailed, "Initial make failed:\n$makeResult") + } + return makeResult } @@ -225,13 +233,21 @@ public abstract class AbstractIncrementalJpsTest( private fun rebuildAndCheckOutput(makeOverallResult: MakeResult) { val outDir = File(getAbsolutePath("out")) val outAfterMake = File(getAbsolutePath("out-after-make")) - FileUtil.copyDir(outDir, outAfterMake) + + if (outDir.exists()) { + FileUtil.copyDir(outDir, outAfterMake) + } val rebuildResult = rebuild() assertEquals(rebuildResult.makeFailed, makeOverallResult.makeFailed, "Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult") - assertEqualDirectories(outDir, outAfterMake, makeOverallResult.makeFailed) + if (!outAfterMake.exists()) { + assertFalse(outDir.exists()) + } + else { + assertEqualDirectories(outDir, outAfterMake, makeOverallResult.makeFailed) + } if (!makeOverallResult.makeFailed) { if (checkDumpsCaseInsensitively && rebuildResult.mappingsDump?.toLowerCase() == makeOverallResult.mappingsDump?.toLowerCase()) { From d7a4c9a54d3377485c4ebb3c2a754ebce40c49e4 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 23 Oct 2015 17:53:54 +0300 Subject: [PATCH 0601/1557] Track lookups in JavaSyntheticPropertiesScope Original commit: a5708c9c0d8b8b6aafd7b494565fd1cfeae93561 --- .../jps/build/LookupTrackerTestGenerated.java | 6 ++++ .../lookupTracker/classifierMembers/foo.kt | 2 +- .../lookupTracker/conventions/comparison.kt | 16 +++++----- .../conventions/delegateProperty.kt | 12 ++++---- .../conventions/mathematicalLike.kt | 26 ++++++++-------- .../lookupTracker/conventions/other.kt | 12 ++++---- .../lookupTracker/packageDeclarations/foo1.kt | 2 +- .../syntheticProperties/JavaClass.java | 26 ++++++++++++++++ .../syntheticProperties/KotlinClass.kt | 8 +++++ .../syntheticProperties/init-build.log | 13 ++++++++ .../syntheticProperties/usages.kt | 30 +++++++++++++++++++ 11 files changed, 118 insertions(+), 35 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/JavaClass.java create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/init-build.log create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index c92b2605d3a..943495cf248 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -65,4 +65,10 @@ public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { doTest(fileName); } + @TestMetadata("syntheticProperties") + public void testSyntheticProperties() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/syntheticProperties/"); + doTest(fileName); + } + } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 1c11f0893af..08fdb76ebef 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,7 +18,7 @@ import bar.* /*c:foo.A*/foo() this./*c:foo.A*/a this./*c:foo.A*/foo() - /*c:foo.A c:foo.A.Companion p:foo p:bar*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar c:foo.A(getBaz) c:foo.A(getBAZ)*/baz() /*c:foo.A c:foo.A.Companion p:foo p:bar*/Companion./*c:foo.A.Companion*/a /*c:foo.A c:foo.A.Companion p:foo p:bar*/O./*c:foo.A.O*/v = "OK" } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index 215f51de39e..a7c36992c88 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -6,13 +6,13 @@ package foo.bar na /*c:foo.bar.A(equals)*/== a na /*c:foo.bar.A(equals)*/== null - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/> b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/< b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/>= b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/<= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/> c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/< c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/>= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/<= c } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index a44e7f2c02a..8c0a5de927e 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,11 +20,11 @@ import kotlin.reflect.KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(get) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(set) p:foo.bar(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(getGetValue) c:foo.bar.D1(getGETValue) c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(getGetValue) c:foo.bar.D1(getGETValue) c:foo.bar.D1(get) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) c:foo.bar.D1(set) p:foo.bar(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(setValue) p:foo.bar(setValue) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(setValue) p:foo.bar(setValue) c:foo.bar.D2(getSetValue) c:foo.bar.D2(getSETValue) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(setValue) p:foo.bar(setValue) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(setValue) p:foo.bar(setValue) c:foo.bar.D3(getSetValue) c:foo.bar.D3(getSETValue) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 2317cc69b42..69516a94d51 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -3,22 +3,22 @@ package foo.bar /*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) { var d = a - d/*c:foo.bar.A(inc) p:foo.bar(inc)*/++ - /*c:foo.bar.A(inc) p:foo.bar(inc)*/++d - d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- - /*c:foo.bar.A(dec) p:foo.bar(dec)*/--d + d/*c:foo.bar.A(inc) p:foo.bar(inc) c:foo.bar.A(getInc) c:foo.bar.A(getINC)*/++ + /*c:foo.bar.A(inc) p:foo.bar(inc) c:foo.bar.A(getInc) c:foo.bar.A(getINC)*/++d + d/*c:foo.bar.A(dec) p:foo.bar(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC)*/-- + /*c:foo.bar.A(dec) p:foo.bar(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC)*/--d - a /*c:foo.bar.A(plus) p:foo.bar(plus)*/+ b - a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- b - /*c:foo.bar.A(not) p:foo.bar(not)*/!a + a /*c:foo.bar.A(plus) p:foo.bar(plus) c:foo.bar.A(getPlus) c:foo.bar.A(getPLUS)*/+ b + a /*c:foo.bar.A(minus) p:foo.bar(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS)*/- b + /*c:foo.bar.A(not) p:foo.bar(not) c:foo.bar.A(getNot) c:foo.bar.A(getNOT)*/!a // for val - a /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign)*/*= b - a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= b + a /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) c:foo.bar.A(getTimesAssign) c:foo.bar.A(getTIMESAssign)*/*= b + a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign)*//= b // for var - d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) c:foo.bar.A(plus) p:foo.bar(plus)*/+= b - d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= b - d /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) c:foo.bar.A(times) p:foo.bar(times)*/*= b - d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div)*//= b + d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus) p:foo.bar(plus) c:foo.bar.A(getPlus) c:foo.bar.A(getPLUS)*/+= b + d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS)*/-= b + d /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) c:foo.bar.A(getTimesAssign) c:foo.bar.A(getTIMESAssign) c:foo.bar.A(times) p:foo.bar(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b + d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) c:foo.bar.A(div) p:foo.bar(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index 1765cb22d1f..8d78d790252 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(get)*/a[2] + /*c:foo.bar.A(set) p:foo.bar(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(get) c:foo.bar.A(getGet) c:foo.bar.A(getGET)*/a[2] - b /*c:foo.bar.A(contains) p:foo.bar(contains)*/in a - "s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in a + b /*c:foo.bar.A(contains) p:foo.bar(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS)*/in a + "s" /*c:foo.bar.A(contains) p:foo.bar(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS)*/!in a /*c:foo.bar.A(invoke) p:foo.bar(invoke)*/a() /*c:foo.bar.A(invoke) p:foo.bar(invoke)*/a(1) - val (/*c:foo.bar.A(component1) p:foo.bar(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = a; + val (/*c:foo.bar.A(component1) p:foo.bar(component1) c:foo.bar.A(getComponent1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2) c:foo.bar.A(getComponent2)*/t) = a; - for ((/*c:foo.bar.A(component1) p:foo.bar(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1) p:foo.bar(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1) p:foo.bar(component1) c:foo.bar.A(getComponent1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) c:foo.bar.A(getComponent2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1) p:foo.bar(component1) c:foo.bar.A(getComponent1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) c:foo.bar.A(getComponent2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index bc2ad02cdd9..5429ad30dc2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /*c:foo.MyClass p:foo p:bar*/b + /*c:foo.MyClass p:foo p:bar c:foo.MyClass(getB)*/b return /*c:foo.MyClass p:foo p:bar*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/JavaClass.java b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/JavaClass.java new file mode 100644 index 00000000000..58cb77be2d0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/JavaClass.java @@ -0,0 +1,26 @@ +public class JavaClass { + public int getFoo() { + return 1; + } + + public String getBar() { + return ""; + } + + public void setBar(String s) { + } + + public int getBazBaz() { + return 1; + } + + public int getBAZBaz() { + return 1; + } + + public void setBazBaz(int i) { + } + + public void setBoo(int i) { + } +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt new file mode 100644 index 00000000000..1771c1d3c84 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt @@ -0,0 +1,8 @@ +package foo + +import /*p:*/JavaClass + +/*p:foo*/class KotlinClass : JavaClass() { + override fun getFoo() = 2 + fun setFoo(i: /*c:foo.KotlinClass p:foo*/Int) {} +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/init-build.log b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/init-build.log new file mode 100644 index 00000000000..1fa99e08a45 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/init-build.log @@ -0,0 +1,13 @@ +Compiling files: +src/KotlinClass.kt +src/usages.kt +End of files +COMPILATION FAILED +Unresolved reference: setFoo +Val cannot be reassigned +Unresolved reference: bazBaz +Unresolved reference: bazBaz +Unresolved reference: boo +Unresolved reference: bazBaz +Unresolved reference: bazBaz +Unresolved reference: boo diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt new file mode 100644 index 00000000000..3315e1cc011 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -0,0 +1,30 @@ +package foo.bar + +import /*p:*/JavaClass +import foo./*p:foo*/KotlinClass + +/*p:foo.bar*/fun test() { + val j = /*p:foo.bar*/JavaClass() + val k = /*p:foo.bar*/KotlinClass() + + j.getFoo() + j./*p:foo.bar c:JavaClass(getSetFoo) c:JavaClass(getSETFoo)*/setFoo(2) + j./*p:foo.bar c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = 2 + j./*p:foo.bar c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo + j./*p:foo.bar c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar + j./*p:foo.bar c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = "" + j./*p:foo.bar c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz + j./*p:foo.bar c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz = "" + j.setBoo(2) + j./*p:foo.bar c:JavaClass(getBoo) c:JavaClass(getBOO)*/boo = 2 + k./*c:foo.KotlinClass*/getFoo() + k./*c:foo.KotlinClass*/setFoo(2) + k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 + k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo + k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar + k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" + k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz + k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz = "" + k./*c:foo.KotlinClass*/setBoo(2) + k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO)*/boo = 2 +} From ef395369bf6a22c209f8c1895cd72a38c70a66d0 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Fri, 23 Oct 2015 16:54:40 +0300 Subject: [PATCH 0602/1557] Cleanup: get rid of effective visibility warnings Original commit: f8a70302ac7c5cbc7c66f36814f5994dc14da72a --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 2567681de87..cf165fdd2a2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -694,7 +694,7 @@ private fun hasKotlinDirtyOrRemovedFiles( return chunk.getTargets().any { !KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isEmpty() } } -private open class GeneratedFile( +public open class GeneratedFile internal constructor( val target: ModuleBuildTarget, val sourceFiles: Collection, val outputFile: File diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 13d62fc9e42..da3c8aac047 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -23,7 +23,7 @@ import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.utils.Printer import java.io.File -abstract class BasicMap, V>( +internal abstract class BasicMap, V>( storageFile: File, keyDescriptor: KeyDescriptor, valueExternalizer: DataExternalizer @@ -64,7 +64,7 @@ abstract class BasicMap, V>( protected abstract fun dumpValue(value: V): String } -public abstract class BasicStringMap( +internal abstract class BasicStringMap( storageFile: File, keyDescriptor: KeyDescriptor, valueExternalizer: DataExternalizer From 731268085f092c3674e3c8190c05d4296693f97b Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Tue, 6 Oct 2015 16:23:37 +0300 Subject: [PATCH 0603/1557] fix KT-9299 In a project with circular dependencies between modules, IDE reports error on use of internal class from another module, but the corresponding code still compiles and runs. #KT-9299 Fixed Original commit: 6ebe0c30ec99df77b9d9260e8dda5d0d9a975877 --- .../build/IncrementalJpsTestGenerated.java | 12 +++++++++ .../kotlin/jps/build/KotlinJpsBuildTest.kt | 21 ++++++++------- .../errors.txt | 7 +++++ .../module1/src/module1.kt | 9 +++++++ .../module2/src/module2.kt | 8 +++--- .../InternalFromAnotherModule/errors.txt | 10 ++++--- .../module1/src/module1.kt | 9 +++++++ .../module2/src/module2.kt | 3 +++ .../build.log | 26 +++++++++++++++++++ .../dependencies.txt | 2 ++ .../module1_a.kt | 14 ++++++++++ .../module1_a.kt.new | 15 +++++++++++ .../module2_b.kt | 13 ++++++++++ .../module2_c.kt | 5 ++++ .../build.log | 26 +++++++++++++++++++ .../dependencies.txt | 2 ++ .../module1_a.kt | 19 ++++++++++++++ .../module1_a.kt.new | 19 ++++++++++++++ .../module2_b.kt | 7 +++++ .../module2_b.kt.new | 12 +++++++++ .../module2_c.kt | 5 ++++ 21 files changed, 228 insertions(+), 16 deletions(-) create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 00730fed6a4..896dbdd010d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -79,6 +79,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("simpleDependencyErrorOnAccessToInternal1") + public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/"); + doTest(fileName); + } + + @TestMetadata("simpleDependencyErrorOnAccessToInternal2") + public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/"); + doTest(fileName); + } + @TestMetadata("simpleDependencyUnchanged") public void testSimpleDependencyUnchanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index f5fe840ffaa..b4264cd694a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -494,20 +494,14 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { initProject() val result = makeAll() result.assertFailed() - - val actualErrors = result.getMessages(BuildMessage.Kind.ERROR) - .map { it as CompilerMessage } - .map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n") - val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) - val expectedFile = File(projectRoot, "errors.txt") - JetTestUtils.assertEqualsToFile(expectedFile, actualErrors) + result.checkErrors() } - // TODO See KT-9299 In a project with circular dependencies between modules, IDE reports error on use of internal class from another module, but the corresponding code still compiles and runs. public fun testCircularDependenciesInternalFromAnotherModule() { initProject() val result = makeAll() - result.assertSuccessful() + result.assertFailed() + result.checkErrors() } public fun testCircularDependencyWithReferenceToOldVersionLib() { @@ -679,6 +673,15 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFalse(File(storageRoot, "targets/java-production/module2/kotlin").exists()) } + private fun BuildResult.checkErrors() { + val actualErrors = getMessages(BuildMessage.Kind.ERROR) + .map { it as CompilerMessage } + .map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n") + val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) + val expectedFile = File(projectRoot, "errors.txt") + JetTestUtils.assertEqualsToFile(expectedFile, actualErrors) + } + private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) { val scopeBuilder = CompileScopeTestBuilder.make().all() val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger)) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt new file mode 100644 index 00000000000..331aaf1316d --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -0,0 +1,7 @@ +'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14 +Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 +Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 +Cannot access 'InternalClass2': it is 'internal' in 'test' at line 19, column 15 +Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 +Cannot access 'InternalFileAnnotation': it is 'internal' in 'test' at line 1, column 7 +Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt index 30fcc94d780..9a7bdb153a3 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module1/src/module1.kt @@ -2,9 +2,18 @@ package test internal open class InternalClass1 +@Target(AnnotationTarget.FILE) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalFileAnnotation() + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalClassAnnotation() + abstract class ClassA1(internal val member: Int) abstract class ClassB1 { internal abstract val member: Int } +class ClassD: InternalClass2() \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt index 1f1647ddad4..ece01121bd2 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/module2/src/module2.kt @@ -1,11 +1,13 @@ -// ERROR: 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it -// ERROR: Cannot access 'InternalClass1': it is 'internal' in 'test' -// ERROR: Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' +@file:InternalFileAnnotation + package test +import test.InternalClass1 + // InternalClass1, ClassA1, ClassB1 are in module1 class ClassInheritedFromInternal1: InternalClass1() +@InternalClassAnnotation class ClassAA1 : ClassA1(10) class ClassBB1 : ClassB1() { diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index 13cd0c3cbf1..2fae260968a 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,4 +1,6 @@ -'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 11, column 14 -Cannot access 'InternalClass1': it is 'internal' in 'test' at line 3, column 13 -Cannot access 'InternalClass1': it is 'internal' in 'test' at line 6, column 36 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 24, column 25 \ No newline at end of file +'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14 +Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 +Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 +Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 +Cannot access 'InternalTestAnnotation': it is 'internal' in 'test' at line 1, column 7 +Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt index 30fcc94d780..e2fc0309302 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module1/src/module1.kt @@ -1,4 +1,13 @@ package test +@Target(AnnotationTarget.FILE) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalTestAnnotation() + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalClassAnnotation() + +private class PrivateClass1 internal open class InternalClass1 diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt index 64f4bb6cf1f..155a4c3a341 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/module2/src/module2.kt @@ -1,3 +1,5 @@ +@file:InternalTestAnnotation + package test import test.InternalClass1 @@ -5,6 +7,7 @@ import test.InternalClass1 // InternalClass1, ClassA1, ClassB1 are in module1 class ClassInheritedFromInternal1: InternalClass1() +@InternalClassAnnotation class ClassAA1 : ClassA1(10) class ClassBB1 : ClassB1() { diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log new file mode 100644 index 00000000000..df01db10bfd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -0,0 +1,26 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/A.class +out/production/module1/a/ClassAnnotation.class +out/production/module1/a/FileAnnotation.class +out/production/module1/a/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/b/B.class +out/production/module2/b/Module2_bKt.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +COMPILATION FAILED +Cannot access 'FileAnnotation': it is 'internal' in 'a' +Cannot access 'A': it is 'internal' in 'a' +Cannot access 'FileAnnotation': it is 'internal' in 'a' +Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Cannot access 'A': it is 'internal' in 'a' +Cannot access 'a': it is 'internal' in 'a' \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt new file mode 100644 index 00000000000..621ede2ee51 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt @@ -0,0 +1,14 @@ +package a + +@Target(AnnotationTarget.FILE) +@Retention(AnnotationRetention.SOURCE) +annotation class FileAnnotation() + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.SOURCE) +annotation class ClassAnnotation() + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new new file mode 100644 index 00000000000..e514959008c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module1_a.kt.new @@ -0,0 +1,15 @@ +package a + +@Target(AnnotationTarget.FILE) +@Retention(AnnotationRetention.SOURCE) +internal annotation class FileAnnotation() + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.SOURCE) +internal annotation class ClassAnnotation() + +internal class A + +internal fun a(): String { + return ":)" +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt new file mode 100644 index 00000000000..9573f5d0517 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_b.kt @@ -0,0 +1,13 @@ +@file:FileAnnotation +package b + +import a.A +import a.FileAnnotation +import a.ClassAnnotation + +@ClassAnnotation +class B + +fun b(param: a.A) { + a.a() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt new file mode 100644 index 00000000000..c4fab8fb00b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/module2_c.kt @@ -0,0 +1,5 @@ +package c + +fun c() { + // This file doesn't use anything from module1, so it won't be recompiled after change +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log new file mode 100644 index 00000000000..1a5350845e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log @@ -0,0 +1,26 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/A.class +out/production/module1/a/InternalA.class +out/production/module1/a/InternalClassAnnotation.class +out/production/module1/a/InternalFileAnnotation.class +out/production/module1/a/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/b/B.class +out/production/module2/b/Module2_bKt.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +COMPILATION FAILED +Cannot access 'InternalFileAnnotation': it is 'internal' in 'a' +Cannot access 'InternalFileAnnotation': it is 'internal' in 'a' +Cannot access 'InternalClassAnnotation': it is 'internal' in 'a' +Cannot access 'InternalClassAnnotation': it is 'internal' in 'a' +Unresolved reference: InternalA +Unresolved reference: internalA \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt new file mode 100644 index 00000000000..e7392045a0b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt @@ -0,0 +1,19 @@ +package a + +@Target(AnnotationTarget.FILE) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalFileAnnotation() + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalClassAnnotation() + +class A + +internal class InternalA + +fun a() { +} + +internal fun internalA() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new new file mode 100644 index 00000000000..bc696864750 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module1_a.kt.new @@ -0,0 +1,19 @@ +package a + +@Target(AnnotationTarget.FILE) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalFileAnnotation() + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalClassAnnotation() + +class A + +internal class AA + +fun a() { +} + +internal fun aa() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt new file mode 100644 index 00000000000..436721358e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt @@ -0,0 +1,7 @@ +package b + +class B + +fun b(param: a.A) { + a.a() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new new file mode 100644 index 00000000000..961d6541b9c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_b.kt.new @@ -0,0 +1,12 @@ +@file:InternalFileAnnotation +package b + +import a.InternalFileAnnotation +import a.InternalClassAnnotation + +@InternalClassAnnotation +class B + +fun b(param: a.InternalA) { + a.internalA() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt new file mode 100644 index 00000000000..c4fab8fb00b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/module2_c.kt @@ -0,0 +1,5 @@ +package c + +fun c() { + // This file doesn't use anything from module1, so it won't be recompiled after change +} \ No newline at end of file From 6a7fcd61fefb7fdcfb8e23df76faa4d3b1d093b2 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 22 Sep 2015 21:03:59 +0300 Subject: [PATCH 0604/1557] Refactoring: introduced `val location: LocationInfo?` in LookupLocation and use it in LookupTracker::record Original commit: a5d8b470839dbd242dfc4e6598a644dd9886018a --- .../jps/build/AbstractLookupTrackerTest.kt | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 6b71c749f94..44646a79e42 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.incremental.components.LocationInfo import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.test.JetTestUtils @@ -55,8 +56,8 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val lines = text.lines().toArrayList() - for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.lookupLine!! }) { - val columnToLookups = lookupsFromLine.groupBy { it.lookupColumn!! }.toList().sortedBy { it.first } + for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.lookupLine }) { + val columnToLookups = lookupsFromLine.groupBy { it.lookupColumn }.toList().sortedBy { it.first } val lineContent = lines[line - 1] val parts = ArrayList(columnToLookups.size * 2) @@ -135,8 +136,8 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( private data class LookupInfo( val lookupContainingFile: String, - val lookupLine: Int?, - val lookupColumn: Int?, + val lookupLine: Int, + val lookupColumn: Int, val scopeFqName: String, val scopeKind: ScopeKind, val name: String @@ -145,14 +146,9 @@ private data class LookupInfo( private class TestLookupTracker : LookupTracker { val lookups = arrayListOf() - override val requiresLookupLineAndColumn: Boolean - get() = true - - override fun record( - lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, - scopeFqName: String, scopeKind: ScopeKind, name: String - ) { - lookups.add(LookupInfo(lookupContainingFile, lookupLine, lookupColumn, scopeFqName, scopeKind, name)) + override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) { + val (line, column) = locationInfo.position + lookups.add(LookupInfo(locationInfo.filePath, line, column, scopeFqName, scopeKind, name)) } } From 22a2f03219cd09140ba41f579903328830008d27 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 28 Oct 2015 21:49:10 +0300 Subject: [PATCH 0605/1557] Added "touch" command to incremental tests and implemented; Implemented more accurate checking lookups after modifications Original commit: 24037c8bf4b26400d4a0a9315607032c92576a4f --- .../jps/build/AbstractIncrementalJpsTest.kt | 94 +++++++++++++------ .../jps/build/AbstractLookupTrackerTest.kt | 24 +---- 2 files changed, 69 insertions(+), 49 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 36d4b075bd9..2599ef866f5 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -69,6 +69,10 @@ public abstract class AbstractIncrementalJpsTest( val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" + + private val COMMANDS = listOf("new", "touch", "delete") + private val COMMANDS_AS_REGEX_PART = COMMANDS.joinToString("|") + private val COMMANDS_AS_MESSAGE_PART = COMMANDS.joinToString("/") { "\".$it\"" } } protected var testDataDir: File by Delegates.notNull() @@ -77,6 +81,8 @@ public abstract class AbstractIncrementalJpsTest( protected var projectDescriptor: ProjectDescriptor by Delegates.notNull() + protected val mapWorkingToOriginalFile: MutableMap = hashMapOf() + private fun enableDebugLogging() { com.intellij.openapi.diagnostic.Logger.setFactory(javaClass()) TestLoggerFactory.dumpLogToStdout("") @@ -108,10 +114,10 @@ public abstract class AbstractIncrementalJpsTest( protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING - protected open fun checkLookups(modifications: List, @Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker) { + protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker, compiledFiles: Set) { } - private fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all(), modifications: List, checkLookups: Boolean = true): MakeResult { + private fun build(scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().all(), checkLookups: Boolean = true): MakeResult { val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath) val logger = MyLogger(workDirPath) projectDescriptor = createProjectDescriptor(BuildLoggingManager(logger)) @@ -127,7 +133,7 @@ public abstract class AbstractIncrementalJpsTest( builder.build(scope.build(), false) if (checkLookups) { - checkLookups(modifications, lookupTracker) + checkLookups(lookupTracker, logger.compiledFiles) } if (!buildResult.isSuccessful) { @@ -150,7 +156,7 @@ public abstract class AbstractIncrementalJpsTest( } private fun initialMake(): MakeResult { - val makeResult = build(modifications = emptyList()) + val makeResult = build() val initBuildLogFile = File(testDataDir, "init-build.log") if (initBuildLogFile.exists()) { @@ -163,17 +169,17 @@ public abstract class AbstractIncrementalJpsTest( return makeResult } - private fun make(modifications: List): MakeResult { - return build(modifications = modifications) + private fun make(): MakeResult { + return build() } private fun rebuild(): MakeResult { - return build(CompileScopeTestBuilder.rebuild().allModules(), emptyList(), checkLookups = false) + return build(CompileScopeTestBuilder.rebuild().allModules(), checkLookups = false) } private fun getModificationsToPerform(moduleNames: Collection?): List> { - fun getModificationsForIteration(newSuffix: String, deleteSuffix: String): List { + fun getModificationsForIteration(newSuffix: String, touchSuffix: String, deleteSuffix: String): List { fun getDirPrefix(fileName: String): String { val underscore = fileName.indexOf("_") @@ -198,6 +204,9 @@ public abstract class AbstractIncrementalJpsTest( if (fileName.endsWith(newSuffix)) { modifications.add(ModifyContent(getDirPrefix(fileName) + "/" + fileName.removeSuffix(newSuffix), file)) } + if (fileName.endsWith(touchSuffix)) { + modifications.add(TouchFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(touchSuffix))) + } if (fileName.endsWith(deleteSuffix)) { modifications.add(DeleteFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(deleteSuffix))) } @@ -205,27 +214,27 @@ public abstract class AbstractIncrementalJpsTest( return modifications } - val haveFilesWithoutNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)$".toRegex()) }?.isNotEmpty() ?: false - val haveFilesWithNumbers = testDataDir.listFiles { it.getName().matches(".+\\.(new|delete)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithoutNumbers = testDataDir.listFiles { it.getName().matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithNumbers = testDataDir.listFiles { it.getName().matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false if (haveFilesWithoutNumbers && haveFilesWithNumbers) { - fail("Bad test data format: files ending with both unnumbered and numbered \".new\"/\".delete\" were found") + fail("Bad test data format: files ending with both unnumbered and numbered $COMMANDS_AS_MESSAGE_PART were found") } if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { if (allowNoFilesWithSuffixInTestData) { return listOf(listOf()) } else { - fail("Bad test data format: no files ending with \".new\" or \".delete\" found") + fail("Bad test data format: no files ending with $COMMANDS_AS_MESSAGE_PART found") } } if (haveFilesWithoutNumbers) { - return listOf(getModificationsForIteration(".new", ".delete")) + return listOf(getModificationsForIteration(".new", ".touch", ".delete")) } else { return (1..10) - .map { getModificationsForIteration(".new.$it", ".delete.$it") } + .map { getModificationsForIteration(".new.$it", ".touch.$it", ".delete.$it") } .filter { it.isNotEmpty() } } } @@ -361,7 +370,7 @@ public abstract class AbstractIncrementalJpsTest( val modifications = getModificationsToPerform(moduleNames) for (step in modifications) { - step.forEach { it.perform(workDir) } + step.forEach { it.perform(workDir, mapWorkingToOriginalFile) } performAdditionalModifications(step) if (moduleNames == null) { preProcessSources(File(workDir, "src")) @@ -370,7 +379,7 @@ public abstract class AbstractIncrementalJpsTest( moduleNames.forEach { preProcessSources(File(workDir, "$it/src")) } } - results.add(make(step)) + results.add(make()) } return results } @@ -380,6 +389,16 @@ public abstract class AbstractIncrementalJpsTest( // null means one module private fun configureModules(): Set? { + + fun prepareSources(relativePathToSrc: String, filePrefix: String) { + val srcDir = File(workDir, relativePathToSrc) + FileUtil.copyDir(testDataDir, srcDir) { it.name.startsWith(filePrefix) && (it.name.endsWith(".kt") || it.name.endsWith(".java")) } + + srcDir.walk().forEach { mapWorkingToOriginalFile[it] = File(testDataDir, filePrefix + it.name) } + + preProcessSources(srcDir) + } + var moduleNames: Set? JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject).outputUrl = JpsPathUtil.pathToUrl(getAbsolutePath("out")) @@ -388,10 +407,7 @@ public abstract class AbstractIncrementalJpsTest( if (moduleDependencies == null) { addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk) - val srcDir = File(workDir, "src") - FileUtil.copyDir(testDataDir, srcDir, { it.getName().endsWith(".kt") || it.getName().endsWith(".java") }) - - preProcessSources(srcDir) + prepareSources(relativePathToSrc = "src", filePrefix = "") moduleNames = null } @@ -410,12 +426,7 @@ public abstract class AbstractIncrementalJpsTest( for (module in nameToModule.values()) { val moduleName = module.name - - val srcDir = File(workDir, "$moduleName/src") - FileUtil.copyDir(testDataDir, srcDir, - { it.getName().startsWith(moduleName + "_") && (it.getName().endsWith(".kt") || it.getName().endsWith(".java")) }) - - preProcessSources(srcDir) + prepareSources(relativePathToSrc = "$moduleName/src", filePrefix = moduleName + "_") } moduleNames = nameToModule.keySet() @@ -429,26 +440,37 @@ public abstract class AbstractIncrementalJpsTest( override fun doGetProjectDir(): File? = workDir + // TODO replace with org.jetbrains.jps.builders.TestProjectBuilderLogger private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() public val log: String get() = logBuf.toString() + val compiledFiles = hashSetOf() + override fun isEnabled(): Boolean = true + override fun logCompiledFiles(files: MutableCollection?, builderName: String?, description: String?) { + super.logCompiledFiles(files, builderName, description) + + if (builderName == KotlinBuilder.KOTLIN_BUILDER_NAME) { + compiledFiles.addAll(files!!) + } + } + override fun logLine(message: String?) { logBuf.append(JetTestUtils.replaceHashWithStar(message!!.removePrefix("$rootPath/"))).append('\n') } } protected abstract class Modification(val path: String) { - abstract fun perform(workDir: File) + abstract fun perform(workDir: File, mapping: MutableMap) override fun toString(): String = "${javaClass.simpleName} $path" } protected class ModifyContent(path: String, val dataFile: File) : Modification(path) { - override fun perform(workDir: File) { + override fun perform(workDir: File, mapping: MutableMap) { val file = File(workDir, path) val oldLastModified = file.lastModified() @@ -460,15 +482,29 @@ public abstract class AbstractIncrementalJpsTest( //Mac OS and some versions of Linux truncate timestamp to nearest second file.setLastModified(oldLastModified + 1000) } + + mapping[file] = dataFile + } + } + + protected class TouchFile(path: String) : Modification(path) { + override fun perform(workDir: File, mapping: MutableMap) { + val file = File(workDir, path) + + val oldLastModified = file.lastModified() + //Mac OS and some versions of Linux truncate timestamp to nearest second + file.setLastModified(Math.max(System.currentTimeMillis(), oldLastModified + 1000)) } } protected class DeleteFile(path: String) : Modification(path) { - override fun perform(workDir: File) { + override fun perform(workDir: File, mapping: MutableMap) { val fileToDelete = File(workDir, path) if (!fileToDelete.delete()) { throw AssertionError("Couldn't delete $fileToDelete") } + + mapping.remove(fileToDelete) } } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 44646a79e42..9e70025c019 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -36,11 +36,10 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( override fun createLookupTracker(): LookupTracker = TestLookupTracker() - override fun checkLookups(modifications: List, lookupTracker: LookupTracker) { + override fun checkLookups(lookupTracker: LookupTracker, compiledFiles: Set) { if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker.javaClass}") val fileToLookups = lookupTracker.lookups.groupBy { it.lookupContainingFile } - val workSrcDir = File(workDir, "src") fun checkLookupsInFile(expectedFile: File, actualFile: File) { @@ -96,25 +95,10 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( JetTestUtils.assertEqualsToFile(expectedFile, actual) } - if (modifications.isNotEmpty()) { - for (modification in modifications) { - if (modification !is ModifyContent) continue + for (actualFile in compiledFiles) { + val expectedFile = mapWorkingToOriginalFile[actualFile]!! - val expectedFile = modification.dataFile - val actualFile = File(workDir, modification.path) - - checkLookupsInFile(expectedFile, actualFile) - } - } - else { - for (actualFile in workSrcDir.walkTopDown()) { - if (!actualFile.isFile) continue - - val independentFilePath = FileUtil.toSystemIndependentName(actualFile.path) - val expectedFile = File(testDataDir, independentFilePath.replace(".*/src/".toRegex(), "")) - - checkLookupsInFile(expectedFile, actualFile) - } + checkLookupsInFile(expectedFile, actualFile) } } From 171bfa8d67653eb6cb343b78cef20cecd1547854 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 28 Oct 2015 22:02:14 +0300 Subject: [PATCH 0606/1557] Minor: fix testdata Original commit: 3484c43c8c27549a002ded0b521519ec308acb5e --- .../lookupTracker/classifierMembers/foo.kt | 37 +++--------------- .../lookupTracker/classifierMembers/usages.kt | 30 +++++++++++++++ .../lookupTracker/conventions/comparison.kt | 16 ++++---- .../conventions/delegateProperty.kt | 14 +++---- .../conventions/mathematicalLike.kt | 26 ++++++------- .../lookupTracker/conventions/other.kt | 16 ++++---- .../lookupTracker/localDeclarations/locals.kt | 2 +- .../lookupTracker/packageDeclarations/foo1.kt | 12 +++--- .../syntheticProperties/usages.kt | 38 +++++++++---------- 9 files changed, 97 insertions(+), 94 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 08fdb76ebef..097daea53d9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() this./*c:foo.A*/a this./*c:foo.A*/foo() - /*c:foo.A c:foo.A.Companion p:foo p:bar c:foo.A(getBaz) c:foo.A(getBAZ)*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar*/O./*c:foo.A.O*/v = "OK" + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A(getBaz) c:foo.A(getBAZ)*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/O./*c:foo.A.O*/v = "OK" } class B { @@ -60,35 +60,8 @@ import bar.* val a = 1 fun foo() { /*c:foo.E*/a - /*c:foo.E p:foo p:bar*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() } } - -/*p:foo*/fun usages(i: /*p:foo*/I) { - /*p:foo p:bar*/A()./*c:foo.A*/a - /*p:foo p:bar*/A()./*c:foo.A*/b - /*p:foo p:bar*/A()./*c:foo.A*/c - /*p:foo p:bar*/A()./*c:foo.A*/d = "new value" - /*p:foo p:bar*/A()./*c:foo.A*/foo() - /*p:foo p:bar*/A./*c:foo.A*/B()./*c:foo.A.B*/a - /*p:foo p:bar*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) - /*p:foo p:bar*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo p:bar*/A./*c:foo.A c:foo.A.Companion*/a - /*p:foo p:bar*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo p:bar*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo p:bar*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" - i./*c:foo.I*/a = 2 - /*p:foo p:bar*/Obj./*c:foo.Obj*/a - /*p:foo p:bar*/Obj./*c:foo.Obj*/foo() - var ii: /*p:foo*/I = /*p:foo p:bar*/Obj - ii./*c:foo.I*/a - ii./*c:foo.I*/foo() - /*p:foo p:bar*/Obj./*c:foo.Obj*/b - val iii = /*p:foo p:bar*/Obj./*c:foo.Obj*/bar() - iii./*c:foo.I*/foo() - /*p:foo p:bar*/E./*c:foo.E*/X - /*p:foo p:bar*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar*/E./*c:foo.E*/Y./*c:foo.E*/foo() -} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt new file mode 100644 index 00000000000..07dbeaac81a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -0,0 +1,30 @@ +package foo + +import bar.* + +/*p:foo*/fun usages(i: /*p:foo*/I) { + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/b + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/c + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/d = "new value" + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/foo() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B()./*c:foo.A.B*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/baz() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" + i./*c:foo.I*/a = 2 + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/foo() + var ii: /*p:foo*/I = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj + ii./*c:foo.I*/a + ii./*c:foo.I*/foo() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/b + val iii = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/bar() + iii./*c:foo.I*/foo() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index a7c36992c88..02cae7f1a1f 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -6,13 +6,13 @@ package foo.bar na /*c:foo.bar.A(equals)*/== a na /*c:foo.bar.A(equals)*/== null - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/> b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/< b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/>= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/<= b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/> b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/< b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/>= b + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/<= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/> c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/< c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/>= c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/<= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/> c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/< c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/>= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/<= c } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 8c0a5de927e..80e5fb200f1 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -1,6 +1,6 @@ package foo.bar -import kotlin.reflect.KProperty +import kotlin.reflect./*p:kotlin.reflect*/KProperty /*p:foo.bar*/class D1 { fun get(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = 1 @@ -20,11 +20,11 @@ import kotlin.reflect.KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(getGetValue) c:foo.bar.D1(getGETValue) c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) p:foo.bar(getValue) c:foo.bar.D1(getGetValue) c:foo.bar.D1(getGETValue) c:foo.bar.D1(get) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) c:foo.bar.D1(set) p:foo.bar(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D1(getGetValue) c:foo.bar.D1(getGETValue) c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D1(getGetValue) c:foo.bar.D1(getGETValue) c:foo.bar.D1(get) c:foo.bar.D1(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) c:foo.bar.D1(set) p:foo.bar(set) p:java.lang(set) p:kotlin(set) p:kotlin.annotation(set) p:kotlin.jvm(set) p:kotlin.io(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) c:foo.bar.D2(get) p:foo.bar(get) c:foo.bar.D2(setValue) p:foo.bar(setValue) c:foo.bar.D2(getSetValue) c:foo.bar.D2(getSETValue) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) c:foo.bar.D2(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) c:foo.bar.D2(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.D2(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D2(getSetValue) c:foo.bar.D2(getSETValue) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) p:foo.bar(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(get) p:foo.bar(get) c:foo.bar.D3(setValue) p:foo.bar(setValue) c:foo.bar.D3(getSetValue) c:foo.bar.D3(getSETValue) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.D3(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D3(getSetValue) c:foo.bar.D3(getSETValue) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 69516a94d51..07fad84d3bf 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -3,22 +3,22 @@ package foo.bar /*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) { var d = a - d/*c:foo.bar.A(inc) p:foo.bar(inc) c:foo.bar.A(getInc) c:foo.bar.A(getINC)*/++ - /*c:foo.bar.A(inc) p:foo.bar(inc) c:foo.bar.A(getInc) c:foo.bar.A(getINC)*/++d - d/*c:foo.bar.A(dec) p:foo.bar(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC)*/-- - /*c:foo.bar.A(dec) p:foo.bar(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC)*/--d + d/*c:foo.bar.A(inc) p:foo.bar(inc) p:java.lang(inc) p:kotlin(inc) p:kotlin.annotation(inc) p:kotlin.jvm(inc) p:kotlin.io(inc) c:foo.bar.A(getInc) c:foo.bar.A(getINC)*/++ + /*c:foo.bar.A(inc) p:foo.bar(inc) p:java.lang(inc) p:kotlin(inc) p:kotlin.annotation(inc) p:kotlin.jvm(inc) p:kotlin.io(inc) c:foo.bar.A(getInc) c:foo.bar.A(getINC)*/++d + d/*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC)*/-- + /*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC)*/--d - a /*c:foo.bar.A(plus) p:foo.bar(plus) c:foo.bar.A(getPlus) c:foo.bar.A(getPLUS)*/+ b - a /*c:foo.bar.A(minus) p:foo.bar(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS)*/- b - /*c:foo.bar.A(not) p:foo.bar(not) c:foo.bar.A(getNot) c:foo.bar.A(getNOT)*/!a + a /*c:foo.bar.A(plus) p:foo.bar(plus) p:java.lang(plus) p:kotlin(plus) p:kotlin.annotation(plus) p:kotlin.jvm(plus) p:kotlin.io(plus) c:foo.bar.A(getPlus) c:foo.bar.A(getPLUS)*/+ b + a /*c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS)*/- b + /*c:foo.bar.A(not) p:foo.bar(not) p:java.lang(not) p:kotlin(not) p:kotlin.annotation(not) p:kotlin.jvm(not) p:kotlin.io(not) c:foo.bar.A(getNot) c:foo.bar.A(getNOT)*/!a // for val - a /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) c:foo.bar.A(getTimesAssign) c:foo.bar.A(getTIMESAssign)*/*= b - a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign)*//= b + a /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) p:java.lang(timesAssign) p:kotlin(timesAssign) p:kotlin.annotation(timesAssign) p:kotlin.jvm(timesAssign) p:kotlin.io(timesAssign) c:foo.bar.A(getTimesAssign) c:foo.bar.A(getTIMESAssign)*/*= b + a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign)*//= b // for var - d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus) p:foo.bar(plus) c:foo.bar.A(getPlus) c:foo.bar.A(getPLUS)*/+= b - d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS)*/-= b - d /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) c:foo.bar.A(getTimesAssign) c:foo.bar.A(getTIMESAssign) c:foo.bar.A(times) p:foo.bar(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b - d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) c:foo.bar.A(div) p:foo.bar(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b + d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus) p:foo.bar(plus) p:java.lang(plus) p:kotlin(plus) p:kotlin.annotation(plus) p:kotlin.jvm(plus) p:kotlin.io(plus) c:foo.bar.A(getPlus) c:foo.bar.A(getPLUS)*/+= b + d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS)*/-= b + d /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) p:java.lang(timesAssign) p:kotlin(timesAssign) p:kotlin.annotation(timesAssign) p:kotlin.jvm(timesAssign) p:kotlin.io(timesAssign) c:foo.bar.A(getTimesAssign) c:foo.bar.A(getTIMESAssign) c:foo.bar.A(times) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.io(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b + d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index 8d78d790252..d6d7481e2a1 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) p:foo.bar(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(get) c:foo.bar.A(getGet) c:foo.bar.A(getGET)*/a[2] + /*c:foo.bar.A(set) p:foo.bar(set) p:java.lang(set) p:kotlin(set) p:kotlin.annotation(set) p:kotlin.jvm(set) p:kotlin.io(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.A(getGet) c:foo.bar.A(getGET)*/a[2] - b /*c:foo.bar.A(contains) p:foo.bar(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS)*/in a - "s" /*c:foo.bar.A(contains) p:foo.bar(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS)*/!in a + b /*c:foo.bar.A(contains) p:foo.bar(contains) p:java.lang(contains) p:kotlin(contains) p:kotlin.annotation(contains) p:kotlin.jvm(contains) p:kotlin.io(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS)*/in a + "s" /*c:foo.bar.A(contains) p:foo.bar(contains) p:java.lang(contains) p:kotlin(contains) p:kotlin.annotation(contains) p:kotlin.jvm(contains) p:kotlin.io(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS)*/!in a - /*c:foo.bar.A(invoke) p:foo.bar(invoke)*/a() - /*c:foo.bar.A(invoke) p:foo.bar(invoke)*/a(1) + /*c:foo.bar.A(invoke) p:foo.bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/a() + /*c:foo.bar.A(invoke) p:foo.bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/a(1) - val (/*c:foo.bar.A(component1) p:foo.bar(component1) c:foo.bar.A(getComponent1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2) c:foo.bar.A(getComponent2)*/t) = a; + val (/*c:foo.bar.A(component1) p:foo.bar(component1) p:java.lang(component1) p:kotlin(component1) p:kotlin.annotation(component1) p:kotlin.jvm(component1) p:kotlin.io(component1) c:foo.bar.A(getComponent1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2) c:foo.bar.A(getComponent2)*/t) = a; - for ((/*c:foo.bar.A(component1) p:foo.bar(component1) c:foo.bar.A(getComponent1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) c:foo.bar.A(getComponent2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1) p:foo.bar(component1) c:foo.bar.A(getComponent1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) c:foo.bar.A(getComponent2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1) p:foo.bar(component1) p:java.lang(component1) p:kotlin(component1) p:kotlin.annotation(component1) p:kotlin.jvm(component1) p:kotlin.io(component1) c:foo.bar.A(getComponent1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2) c:foo.bar.A(getComponent2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1) p:foo.bar(component1) p:java.lang(component1) p:kotlin(component1) p:kotlin.annotation(component1) p:kotlin.jvm(component1) p:kotlin.io(component1) c:foo.bar.A(getComponent1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2) c:foo.bar.A(getComponent2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) p:java.lang(iterator) p:kotlin(iterator) p:kotlin.annotation(iterator) p:kotlin.jvm(iterator) p:kotlin.io(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index 4de42a1547a..3ba9645f6c2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -31,7 +31,7 @@ import bar.* } localFun() - 1./*p:local.declarations p:bar*/localExtFun() + 1./*p:local.declarations p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/localExtFun() val c = LocalC() c.a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 5429ad30dc2..d859f60fc67 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -3,15 +3,15 @@ package foo import bar.* import baz./*p:baz*/C -/*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar*/baz./*p:baz*/B = /*p:foo p:bar*/baz./*p:baz*/B() +/*p:foo*/val a = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A() +/*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B { - /*p:foo p:bar*/a - return /*p:foo p:bar*/B() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/a + return /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/B() } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /*c:foo.MyClass p:foo p:bar c:foo.MyClass(getB)*/b - return /*c:foo.MyClass p:foo p:bar*/MyClass() + /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.MyClass(getB)*/b + return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 3315e1cc011..1d737978e1d 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -4,27 +4,27 @@ import /*p:*/JavaClass import foo./*p:foo*/KotlinClass /*p:foo.bar*/fun test() { - val j = /*p:foo.bar*/JavaClass() - val k = /*p:foo.bar*/KotlinClass() + val j = /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/JavaClass() + val k = /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/KotlinClass() - j.getFoo() - j./*p:foo.bar c:JavaClass(getSetFoo) c:JavaClass(getSETFoo)*/setFoo(2) - j./*p:foo.bar c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = 2 - j./*p:foo.bar c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo - j./*p:foo.bar c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar - j./*p:foo.bar c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = "" - j./*p:foo.bar c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz - j./*p:foo.bar c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz = "" - j.setBoo(2) - j./*p:foo.bar c:JavaClass(getBoo) c:JavaClass(getBOO)*/boo = 2 + j./*c:JavaClass*/getFoo() + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getSetFoo) c:JavaClass(getSETFoo)*/setFoo(2) + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = 2 + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = "" + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz = "" + j./*c:JavaClass*/setBoo(2) + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBoo) c:JavaClass(getBOO)*/boo = 2 k./*c:foo.KotlinClass*/getFoo() k./*c:foo.KotlinClass*/setFoo(2) - k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 - k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo - k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar - k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" - k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz - k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz = "" + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz = "" k./*c:foo.KotlinClass*/setBoo(2) - k./*c:foo.KotlinClass p:foo.bar c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO)*/boo = 2 + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO)*/boo = 2 } From ee0ec87da6668f3c7b904b0443abe2d7b5f69c04 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 28 Oct 2015 22:02:14 +0300 Subject: [PATCH 0607/1557] Add tests for lookups to deserialized and java scopes Original commit: 519172f1822450b440a40ef0a7e743d07d17f69b --- .../incremental/lookupTracker/classifierMembers/bar.kt | 4 ++++ .../lookupTracker/classifierMembers/usages.kt.touch | 0 .../incremental/lookupTracker/conventions/comparison.kt.touch | 0 .../lookupTracker/conventions/delegateProperty.kt.touch | 0 .../lookupTracker/conventions/mathematicalLike.kt.touch | 0 .../incremental/lookupTracker/conventions/other.kt.touch | 0 .../lookupTracker/packageDeclarations/foo1.kt.touch | 0 .../lookupTracker/packageDeclarations/foo2.kt.touch | 0 .../lookupTracker/syntheticProperties/usages.kt.touch | 0 9 files changed, 4 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt.touch diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/bar.kt index ddac0faf273..3798ab0118a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/bar.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/bar.kt @@ -1 +1,5 @@ package bar + +// To force creating bar package + +/*p:bar(Dummy)*/private class Dummy diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo2.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt.touch new file mode 100644 index 00000000000..e69de29bb2d From e41b323fb4d7477d6130fa92e41bbd493110724e Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 29 Oct 2015 15:28:15 +0300 Subject: [PATCH 0608/1557] Add tests for lookups to declarations form Java Original commit: 4cb5398c04b7361ef6c4f356bb68b92bff5fd0d6 --- .../jps/build/AbstractIncrementalJpsTest.kt | 4 ++- .../jps/build/LookupTrackerTestGenerated.java | 6 ++++ .../incremental/lookupTracker/java/bar/C.java | 16 +++++++++ .../incremental/lookupTracker/java/baz/E.java | 9 +++++ .../incremental/lookupTracker/java/foo/I.java | 8 +++++ .../lookupTracker/java/init-build.log | 5 +++ .../incremental/lookupTracker/java/usages.kt | 35 +++++++++++++++++++ .../lookupTracker/java/usages.kt.touch | 0 8 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/java/bar/C.java create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/java/baz/E.java create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/java/foo/I.java create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt.touch diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 2599ef866f5..4fc7d3c5c02 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -392,7 +392,9 @@ public abstract class AbstractIncrementalJpsTest( fun prepareSources(relativePathToSrc: String, filePrefix: String) { val srcDir = File(workDir, relativePathToSrc) - FileUtil.copyDir(testDataDir, srcDir) { it.name.startsWith(filePrefix) && (it.name.endsWith(".kt") || it.name.endsWith(".java")) } + FileUtil.copyDir(testDataDir, srcDir) { + it.isDirectory || it.name.startsWith(filePrefix) && (it.name.endsWith(".kt") || it.name.endsWith(".java")) + } srcDir.walk().forEach { mapWorkingToOriginalFile[it] = File(testDataDir, filePrefix + it.name) } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 943495cf248..71cee46f567 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -47,6 +47,12 @@ public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { doTest(fileName); } + @TestMetadata("java") + public void testJava() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/java/"); + doTest(fileName); + } + @TestMetadata("localDeclarations") public void testLocalDeclarations() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/localDeclarations/"); diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/bar/C.java b/jps/jps-plugin/testData/incremental/lookupTracker/java/bar/C.java new file mode 100644 index 00000000000..5dc47c5b4c8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/bar/C.java @@ -0,0 +1,16 @@ +package bar; + +import foo.I; + +public class C implements I { + @Override + public void ifunc() {} + + public int field = 1; + public void func() {} + public class B {} + + public static String sfield = ""; + public static void sfunc() {} + public static class S {} +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/baz/E.java b/jps/jps-plugin/testData/incremental/lookupTracker/java/baz/E.java new file mode 100644 index 00000000000..4b7305cfdde --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/baz/E.java @@ -0,0 +1,9 @@ +package baz; + +public enum E { + F, + S; + + public int field = 1; + public void func() {} +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/foo/I.java b/jps/jps-plugin/testData/incremental/lookupTracker/java/foo/I.java new file mode 100644 index 00000000000..0bf443cff80 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/foo/I.java @@ -0,0 +1,8 @@ +package foo; + +public interface I { + void ifunc(); + + static String isfield = ""; + static class IS {} +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log b/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log new file mode 100644 index 00000000000..4ef7b46d7ba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log @@ -0,0 +1,5 @@ +Compiling files: +src/usages.kt +End of files +COMPILATION FAILED +Unresolved reference: IS diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt new file mode 100644 index 00000000000..128a8475cf3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -0,0 +1,35 @@ +package foo + +import bar./*p:bar*/C +import baz.* + +/*p:foo*/fun usages() { + val c = /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C() + + c./*c:bar.C*/field + c./*c:bar.C*/field = 2 + c./*c:bar.C*/func() + c./*c:bar.C*/B() + + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfield = "new" + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/S() + + // inherited from I + c./*c:bar.C*/ifunc() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/isfield + // expected error: Unresolved reference: IS + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/IS() + + + val i: /*p:foo*/I = c + i./*c:foo.I*/ifunc() + + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/I./*c:foo.I*/isfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/I./*c:foo.I*/IS() + + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt.touch new file mode 100644 index 00000000000..e69de29bb2d From 64a1cac2b98441ea77f99d2f18cb1f3b00bf4cd5 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 30 Oct 2015 16:45:03 +0300 Subject: [PATCH 0609/1557] Add test for lookups in generic constraints; Add cases with lookup to companion and nested object; Original commit: 5d72629b0b4c78f61460915c3fa7956b54ab1b65 --- .../lookupTracker/classifierMembers/constraints.kt | 7 +++++++ .../incremental/lookupTracker/classifierMembers/usages.kt | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt new file mode 100644 index 00000000000..1f41efa5406 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt @@ -0,0 +1,7 @@ +package foo + +import bar.* + +/*p:foo*/fun , C> test() + where C : /*p:foo*/Number, C : /*p:foo*/Comparable, C : B +{} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 07dbeaac81a..4559284cced 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -11,9 +11,12 @@ import bar.* /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B()./*c:foo.A.B*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/baz() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" i./*c:foo.I*/a = 2 /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/a From 71ad871488333a5c54d4774daea97eb46bf5afe0 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 2 Nov 2015 17:56:31 +0300 Subject: [PATCH 0610/1557] More precise diagnostics of smart cast impossible #KT-7240 Fixed Original commit: 41ebfd025e6cc02cc5559b1a79d6335dd3831cb7 --- .../incremental/pureKotlin/valAddCustomAccessor/build.log | 2 +- .../incremental/pureKotlin/valRemoveCustomAccessor/build.log | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log index 19a6d813836..0390b000838 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -12,4 +12,4 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Int? \ No newline at end of file +Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a member value that has open or custom getter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log index 3eb9b489054..d998319baf2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log @@ -6,7 +6,7 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Int? +Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a member value that has open or custom getter Cleaning output files: From b4fdd8ffbb6b896ca33ea7eb4b703be0d4c2b4b0 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 3 Nov 2015 14:01:47 +0300 Subject: [PATCH 0611/1557] Minor: fix generating LookupTracker tests Original commit: 54cb5758198c1f0d6495529530147233e4aea197 --- .../jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 71cee46f567..1ea148f1be4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -32,7 +32,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { public void testAllFilesPresentInLookupTracker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("classifierMembers") From 5fe43b4e722cf0191035f82730c8b3166fa2c365 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 3 Nov 2015 14:05:20 +0100 Subject: [PATCH 0612/1557] remove Jet from names of classes in tests: phase 2 Original commit: 19af88738bec80a8d903f921957aaf96f28f02ba --- .../jps/build/AbstractIncrementalJpsTest.kt | 4 +- .../jps/build/AbstractLookupTrackerTest.kt | 4 +- ...entalCacheVersionChangedTestGenerated.java | 18 +- .../build/IncrementalJpsTestGenerated.java | 300 +++++++++--------- .../IncrementalLazyCachesTestGenerated.java | 18 +- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 4 +- .../jps/build/LookupTrackerTestGenerated.java | 19 +- .../jps/build/SimpleKotlinJpsBuildTest.kt | 4 +- .../AbstractProtoComparisonTest.kt | 6 +- .../ProtoComparisonTestGenerated.java | 54 ++-- .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 4 +- .../modules/KotlinModuleXmlGeneratorTest.java | 8 +- 12 files changed, 221 insertions(+), 222 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 4fc7d3c5c02..f7dc0e32a67 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -46,7 +46,7 @@ import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories import org.jetbrains.kotlin.jps.incremental.getKotlinCache -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.keysToMap import java.io.ByteArrayOutputStream @@ -461,7 +461,7 @@ public abstract class AbstractIncrementalJpsTest( } override fun logLine(message: String?) { - logBuf.append(JetTestUtils.replaceHashWithStar(message!!.removePrefix("$rootPath/"))).append('\n') + logBuf.append(KotlinTestUtils.replaceHashWithStar(message!!.removePrefix("$rootPath/"))).append('\n') } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 9e70025c019..649c9e544e4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.incremental.components.LocationInfo import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.join import java.io.File import java.util.* @@ -92,7 +92,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val actual = lines.joinToString("\n") - JetTestUtils.assertEqualsToFile(expectedFile, actual) + KotlinTestUtils.assertEqualsToFile(expectedFile, actual) } for (actualFile in compiledFiles) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index eea8bc8cd4f..77d283f12d3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncrementalCacheVersionChangedTest { public void testAllFilesPresentInCacheVersionChanged() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("exportedModule") public void testExportedModule() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); doTest(fileName); } @TestMetadata("module1Modified") public void testModule1Modified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); doTest(fileName); } @TestMetadata("module2Modified") public void testModule2Modified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/"); doTest(fileName); } @TestMetadata("moduleWithConstantModified") public void testModuleWithConstantModified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/"); doTest(fileName); } @TestMetadata("moduleWithInlineModified") public void testModuleWithInlineModified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/"); doTest(fileName); } @TestMetadata("touchedFile") public void testTouchedFile() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); doTest(fileName); } @TestMetadata("untouchedFiles") public void testUntouchedFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); doTest(fileName); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 896dbdd010d..72c7dff31e4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,84 +34,84 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class MultiModule extends AbstractIncrementalJpsTest { public void testAllFilesPresentInMultiModule() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("circularDependencyClasses") public void testCircularDependencyClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyClasses/"); doTest(fileName); } @TestMetadata("circularDependencySamePackageUnchanged") public void testCircularDependencySamePackageUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/"); doTest(fileName); } @TestMetadata("circularDependencyTopLevelFunctions") public void testCircularDependencyTopLevelFunctions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); doTest(fileName); } @TestMetadata("constantValueChanged") public void testConstantValueChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); doTest(fileName); } @TestMetadata("inlineFunctionInlined") public void testInlineFunctionInlined() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); doTest(fileName); } @TestMetadata("inlineFunctionTwoPackageParts") public void testInlineFunctionTwoPackageParts() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/"); doTest(fileName); } @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); doTest(fileName); } @TestMetadata("simpleDependencyErrorOnAccessToInternal1") public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/"); doTest(fileName); } @TestMetadata("simpleDependencyErrorOnAccessToInternal2") public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/"); doTest(fileName); } @TestMetadata("simpleDependencyUnchanged") public void testSimpleDependencyUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"); doTest(fileName); } @TestMetadata("transitiveDependency") public void testTransitiveDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveDependency/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveDependency/"); doTest(fileName); } @TestMetadata("transitiveInlining") public void testTransitiveInlining() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveInlining/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveInlining/"); doTest(fileName); } @TestMetadata("twoDependants") public void testTwoDependants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); doTest(fileName); } @@ -123,539 +123,539 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public static class PureKotlin extends AbstractIncrementalJpsTest { @TestMetadata("accessingFunctionsViaPackagePart") public void testAccessingFunctionsViaPackagePart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); doTest(fileName); } @TestMetadata("accessingFunctionsViaRenamedFileClass") public void testAccessingFunctionsViaRenamedFileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); doTest(fileName); } @TestMetadata("accessingPropertiesViaField") public void testAccessingPropertiesViaField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); doTest(fileName); } @TestMetadata("allConstants") public void testAllConstants() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); doTest(fileName); } public void testAllFilesPresentInPureKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("annotations") public void testAnnotations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/"); doTest(fileName); } @TestMetadata("anonymousObjectChanged") public void testAnonymousObjectChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/"); doTest(fileName); } @TestMetadata("classInlineFunctionChanged") public void testClassInlineFunctionChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); doTest(fileName); } @TestMetadata("classObjectConstantChanged") public void testClassObjectConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); doTest(fileName); } @TestMetadata("classRecreated") public void testClassRecreated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); doTest(fileName); } @TestMetadata("classRedeclaration") public void testClassRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/"); doTest(fileName); } @TestMetadata("classSignatureChanged") public void testClassSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); doTest(fileName); } @TestMetadata("classSignatureUnchanged") public void testClassSignatureUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedOtherPackage") public void testCompilationErrorThenFixedOtherPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedSamePackage") public void testCompilationErrorThenFixedSamePackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedWithPhantomPart") public void testCompilationErrorThenFixedWithPhantomPart() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedWithPhantomPart2") public void testCompilationErrorThenFixedWithPhantomPart2() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/"); doTest(fileName); } @TestMetadata("compilationErrorThenFixedWithPhantomPart3") public void testCompilationErrorThenFixedWithPhantomPart3() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/"); doTest(fileName); } @TestMetadata("conflictingPlatformDeclarations") public void testConflictingPlatformDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); doTest(fileName); } @TestMetadata("constantRemoved") public void testConstantRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); doTest(fileName); } @TestMetadata("constantsUnchanged") public void testConstantsUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); doTest(fileName); } @TestMetadata("defaultArguments") public void testDefaultArguments() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); doTest(fileName); } @TestMetadata("delegatedPropertyInlineExtensionAccessor") public void testDelegatedPropertyInlineExtensionAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/"); doTest(fileName); } @TestMetadata("delegatedPropertyInlineMethodAccessor") public void testDelegatedPropertyInlineMethodAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/"); doTest(fileName); } @TestMetadata("dependencyClassReferenced") public void testDependencyClassReferenced() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); doTest(fileName); } @TestMetadata("fileWithConstantRemoved") public void testFileWithConstantRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/"); doTest(fileName); } @TestMetadata("fileWithInlineFunctionRemoved") public void testFileWithInlineFunctionRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/"); doTest(fileName); } @TestMetadata("filesExchangePackages") public void testFilesExchangePackages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); doTest(fileName); } @TestMetadata("funRedeclaration") public void testFunRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funRedeclaration/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funRedeclaration/"); doTest(fileName); } @TestMetadata("functionBecameInline") public void testFunctionBecameInline() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/"); doTest(fileName); } @TestMetadata("independentClasses") public void testIndependentClasses() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); doTest(fileName); } @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); doTest(fileName); } @TestMetadata("inlineFunctionsCircularDependency") public void testInlineFunctionsCircularDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); doTest(fileName); } @TestMetadata("inlineFunctionsUnchanged") public void testInlineFunctionsUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); doTest(fileName); } @TestMetadata("inlineLinesChanged") public void testInlineLinesChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/"); doTest(fileName); } @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); doTest(fileName); } @TestMetadata("internalClassChanged") public void testInternalClassChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); doTest(fileName); } @TestMetadata("internalMemberInClassChanged") public void testInternalMemberInClassChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/"); doTest(fileName); } @TestMetadata("localClassChanged") public void testLocalClassChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); doTest(fileName); } @TestMetadata("moveClass") public void testMoveClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); doTest(fileName); } @TestMetadata("multifileClassFileAdded") public void testMultifileClassFileAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); doTest(fileName); } @TestMetadata("multifileClassFileChanged") public void testMultifileClassFileChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); doTest(fileName); } @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); doTest(fileName); } @TestMetadata("multifileClassInlineFunction") public void testMultifileClassInlineFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); doTest(fileName); } @TestMetadata("multifileClassInlineFunctionAccessingField") public void testMultifileClassInlineFunctionAccessingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); doTest(fileName); } @TestMetadata("multifileClassRecreated") public void testMultifileClassRecreated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); doTest(fileName); } @TestMetadata("multifileClassRecreatedAfterRenaming") public void testMultifileClassRecreatedAfterRenaming() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); doTest(fileName); } @TestMetadata("multifileClassRemoved") public void testMultifileClassRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); doTest(fileName); } @TestMetadata("multiplePackagesModified") public void testMultiplePackagesModified() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); doTest(fileName); } @TestMetadata("objectConstantChanged") public void testObjectConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/"); doTest(fileName); } @TestMetadata("optionalParameter") public void testOptionalParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); doTest(fileName); } @TestMetadata("ourClassReferenced") public void testOurClassReferenced() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); doTest(fileName); } @TestMetadata("packageConstantChanged") public void testPackageConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); doTest(fileName); } @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); doTest(fileName); } @TestMetadata("packageFileChangedPackage") public void testPackageFileChangedPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); doTest(fileName); } @TestMetadata("packageFileChangedThenOtherRemoved") public void testPackageFileChangedThenOtherRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); doTest(fileName); } @TestMetadata("packageFileRemoved") public void testPackageFileRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); doTest(fileName); } @TestMetadata("packageFilesChangedInTurn") public void testPackageFilesChangedInTurn() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); doTest(fileName); } @TestMetadata("packageInlineFunctionAccessingField") public void testPackageInlineFunctionAccessingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); doTest(fileName); } @TestMetadata("packageInlineFunctionFromOurPackage") public void testPackageInlineFunctionFromOurPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); doTest(fileName); } @TestMetadata("packageMultifileClassOneFileWithPublicChanges") public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); doTest(fileName); } @TestMetadata("packageMultifileClassPrivateOnlyChanged") public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); doTest(fileName); } @TestMetadata("packagePrivateOnlyChanged") public void testPackagePrivateOnlyChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); doTest(fileName); } @TestMetadata("packageRecreated") public void testPackageRecreated() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); doTest(fileName); } @TestMetadata("packageRecreatedAfterRenaming") public void testPackageRecreatedAfterRenaming() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); doTest(fileName); } @TestMetadata("packageRemoved") public void testPackageRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); doTest(fileName); } @TestMetadata("privateConstantsChanged") public void testPrivateConstantsChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/"); doTest(fileName); } @TestMetadata("privateMethodAdded") public void testPrivateMethodAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/"); doTest(fileName); } @TestMetadata("privateMethodDeleted") public void testPrivateMethodDeleted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/"); doTest(fileName); } @TestMetadata("privateMethodSignatureChanged") public void testPrivateMethodSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/"); doTest(fileName); } @TestMetadata("privateSecondaryConstructorAdded") public void testPrivateSecondaryConstructorAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/"); doTest(fileName); } @TestMetadata("privateSecondaryConstructorDeleted") public void testPrivateSecondaryConstructorDeleted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/"); doTest(fileName); } @TestMetadata("privateValAccessorChanged") public void testPrivateValAccessorChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/"); doTest(fileName); } @TestMetadata("privateValAdded") public void testPrivateValAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAdded/"); doTest(fileName); } @TestMetadata("privateValDeleted") public void testPrivateValDeleted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValDeleted/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValDeleted/"); doTest(fileName); } @TestMetadata("privateValSignatureChanged") public void testPrivateValSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/"); doTest(fileName); } @TestMetadata("privateVarAdded") public void testPrivateVarAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarAdded/"); doTest(fileName); } @TestMetadata("privateVarDeleted") public void testPrivateVarDeleted() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/"); doTest(fileName); } @TestMetadata("privateVarSignatureChanged") public void testPrivateVarSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/"); doTest(fileName); } @TestMetadata("propertyRedeclaration") public void testPropertyRedeclaration() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/"); doTest(fileName); } @TestMetadata("returnTypeChanged") public void testReturnTypeChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); doTest(fileName); } @TestMetadata("simpleClassDependency") public void testSimpleClassDependency() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); doTest(fileName); } @TestMetadata("soleFileChangesPackage") public void testSoleFileChangesPackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); doTest(fileName); } @TestMetadata("subpackage") public void testSubpackage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/"); doTest(fileName); } @TestMetadata("topLevelFunctionSameSignature") public void testTopLevelFunctionSameSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); doTest(fileName); } @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); doTest(fileName); } @TestMetadata("topLevelPrivateValUsageAdded") public void testTopLevelPrivateValUsageAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/"); doTest(fileName); } @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); doTest(fileName); } @TestMetadata("valAddCustomAccessor") public void testValAddCustomAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/"); doTest(fileName); } @TestMetadata("valRemoveCustomAccessor") public void testValRemoveCustomAccessor() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/"); doTest(fileName); } @@ -666,7 +666,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @@ -674,30 +674,30 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("javaToKotlin") public void testJavaToKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/"); doTest(fileName); } @TestMetadata("javaToKotlinAndBack") public void testJavaToKotlinAndBack() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/"); doTest(fileName); } @TestMetadata("javaToKotlinAndRemove") public void testJavaToKotlinAndRemove() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/"); doTest(fileName); } @TestMetadata("kotlinToJava") public void testKotlinToJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); doTest(fileName); } @@ -708,54 +708,54 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("changeNotUsedSignature") public void testChangeNotUsedSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/"); doTest(fileName); } @TestMetadata("changeSignature") public void testChangeSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/"); doTest(fileName); } @TestMetadata("constantChanged") public void testConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/"); doTest(fileName); } @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/"); doTest(fileName); } @TestMetadata("javaAndKotlinChangedSimultaneously") public void testJavaAndKotlinChangedSimultaneously() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/"); doTest(fileName); } @TestMetadata("methodAddedInSuper") public void testMethodAddedInSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/"); doTest(fileName); } @TestMetadata("methodRenamed") public void testMethodRenamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); doTest(fileName); } @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); doTest(fileName); } @@ -764,18 +764,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class SamConversions extends AbstractIncrementalJpsTest { public void testAllFilesPresentInSamConversions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("methodAdded") public void testMethodAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/"); doTest(fileName); } @TestMetadata("methodSignatureChanged") public void testMethodSignatureChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/"); doTest(fileName); } @@ -788,77 +788,77 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { public static class KotlinUsedInJava extends AbstractIncrementalJpsTest { @TestMetadata("addOptionalParameter") public void testAddOptionalParameter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/"); doTest(fileName); } public void testAllFilesPresentInKotlinUsedInJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("changeNotUsedSignature") public void testChangeNotUsedSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/"); doTest(fileName); } @TestMetadata("changeSignature") public void testChangeSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/"); doTest(fileName); } @TestMetadata("constantChanged") public void testConstantChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/"); doTest(fileName); } @TestMetadata("constantUnchanged") public void testConstantUnchanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/"); doTest(fileName); } @TestMetadata("funRenamed") public void testFunRenamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/"); doTest(fileName); } @TestMetadata("methodAddedInSuper") public void testMethodAddedInSuper() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); doTest(fileName); } @TestMetadata("notChangeSignature") public void testNotChangeSignature() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); doTest(fileName); } @TestMetadata("onlyTopLevelFunctionInFileRemoved") public void testOnlyTopLevelFunctionInFileRemoved() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/"); doTest(fileName); } @TestMetadata("packageFileAdded") public void testPackageFileAdded() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/"); doTest(fileName); } @TestMetadata("privateChanges") public void testPrivateChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/"); doTest(fileName); } @TestMetadata("propertyRenamed") public void testPropertyRenamed() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); doTest(fileName); } @@ -870,84 +870,84 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunCallSite extends AbstractIncrementalJpsTest { public void testAllFilesPresentInInlineFunCallSite() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("classProperty") public void testClassProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty/"); doTest(fileName); } @TestMetadata("companionObjectProperty") public void testCompanionObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/"); doTest(fileName); } @TestMetadata("function") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); doTest(fileName); } @TestMetadata("getter") public void testGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter/"); doTest(fileName); } @TestMetadata("lambda") public void testLambda() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda/"); doTest(fileName); } @TestMetadata("localFun") public void testLocalFun() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun/"); doTest(fileName); } @TestMetadata("method") public void testMethod() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method/"); doTest(fileName); } @TestMetadata("parameterDefaultValue") public void testParameterDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/"); doTest(fileName); } @TestMetadata("primaryConstructorParameterDefaultValue") public void testPrimaryConstructorParameterDefaultValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/"); doTest(fileName); } @TestMetadata("superCall") public void testSuperCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall/"); doTest(fileName); } @TestMetadata("thisCall") public void testThisCall() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall/"); doTest(fileName); } @TestMetadata("topLevelObjectProperty") public void testTopLevelObjectProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/"); doTest(fileName); } @TestMetadata("topLevelProperty") public void testTopLevelProperty() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); doTest(fileName); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 2b29dff9834..865585c9c52 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,48 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyCachesTest { public void testAllFilesPresentInLazyKotlinCaches() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("class") public void testClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/"); doTest(fileName); } @TestMetadata("constant") public void testConstant() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); doTest(fileName); } @TestMetadata("function") public void testFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/"); doTest(fileName); } @TestMetadata("inlineFunctionWithUsage") public void testInlineFunctionWithUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); doTest(fileName); } @TestMetadata("inlineFunctionWithoutUsage") public void testInlineFunctionWithoutUsage() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/"); doTest(fileName); } @TestMetadata("noKotlin") public void testNoKotlin() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/"); doTest(fileName); } @TestMetadata("topLevelPropertyAccess") public void testTopLevelPropertyAccess() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); doTest(fileName); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index b4264cd694a..f8d4f8cec66 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -45,7 +45,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.org.objectweb.asm.ClassReader @@ -679,7 +679,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { .map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n") val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) val expectedFile = File(projectRoot, "errors.txt") - JetTestUtils.assertEqualsToFile(expectedFile, actualErrors) + KotlinTestUtils.assertEqualsToFile(expectedFile, actualErrors) } private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 1ea148f1be4..5109411ef0a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,49 +32,48 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { public void testAllFilesPresentInLookupTracker() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("classifierMembers") public void testClassifierMembers() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/classifierMembers/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/classifierMembers/"); doTest(fileName); } @TestMetadata("conventions") public void testConventions() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/conventions/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/conventions/"); doTest(fileName); } @TestMetadata("java") public void testJava() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/java/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/java/"); doTest(fileName); } @TestMetadata("localDeclarations") public void testLocalDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/localDeclarations/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/localDeclarations/"); doTest(fileName); } @TestMetadata("packageDeclarations") public void testPackageDeclarations() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/packageDeclarations/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/packageDeclarations/"); doTest(fileName); } @TestMetadata("simple") public void testSimple() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/simple/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/simple/"); doTest(fileName); } @TestMetadata("syntheticProperties") public void testSyntheticProperties() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/syntheticProperties/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/syntheticProperties/"); doTest(fileName); } - } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 920df5bb0b2..1ec16d5065e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -22,13 +22,13 @@ import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_LOG_PATH_PROPERTY import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { override fun setUp() { super.setUp() - workDir = JetTestUtils.tmpDirForTest(this) + workDir = KotlinTestUtils.tmpDirForTest(this) } public fun testLoadingKotlinFromDifferentModules() { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index b407aecbd46..5160563c68c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.serialization.jvm.BitEncoding -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.Printer import java.io.File @@ -28,7 +28,7 @@ import java.io.File public abstract class AbstractProtoComparisonTest : UsefulTestCase() { public fun doTest(testDataPath: String) { - val testDir = JetTestUtils.tmpDir("testDirectory") + val testDir = KotlinTestUtils.tmpDir("testDirectory") val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old") val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new") @@ -58,7 +58,7 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { p.printDifference(oldClassMap[name]!!, newClassMap[name]!!) } - JetTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()); + KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()); } private fun compileFileAndGetClasses(testPath: String, testDir: File, prefix: String): List { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index d6a6ae7a97d..6a90f0cbdb7 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.incremental; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,42 +34,42 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassSignatureChange extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassSignatureChange() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("classFlagsChanged") public void testClassFlagsChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/"); doTest(fileName); } @TestMetadata("classToFileFacade") public void testClassToFileFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classToFileFacade/"); doTest(fileName); } @TestMetadata("classTypeParameterListChanged") public void testClassTypeParameterListChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged/"); doTest(fileName); } @TestMetadata("classWithClassAnnotationListChanged") public void testClassWithClassAnnotationListChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/"); doTest(fileName); } @TestMetadata("classWithSuperTypeListChanged") public void testClassWithSuperTypeListChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/"); doTest(fileName); } @TestMetadata("packageFacadeToClass") public void testPackageFacadeToClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/packageFacadeToClass/"); doTest(fileName); } @@ -80,36 +80,36 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassPrivateOnlyChange extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassPrivateOnlyChange() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("classWithPrivateFunChanged") public void testClassWithPrivateFunChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged/"); doTest(fileName); } @TestMetadata("classWithPrivatePrimaryConstructorChanged") public void testClassWithPrivatePrimaryConstructorChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged/"); doTest(fileName); } @TestMetadata("classWithPrivateSecondaryConstructorChanged") public void testClassWithPrivateSecondaryConstructorChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged/"); doTest(fileName); } @TestMetadata("classWithPrivateValChanged") public void testClassWithPrivateValChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged/"); doTest(fileName); } @TestMetadata("classWithPrivateVarChanged") public void testClassWithPrivateVarChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged/"); doTest(fileName); } @@ -120,36 +120,36 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassMembersOnlyChanged extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassMembersOnlyChanged() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("classWithCompanionObjectChanged") public void testClassWithCompanionObjectChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/"); doTest(fileName); } @TestMetadata("classWithConstructorChanged") public void testClassWithConstructorChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/"); doTest(fileName); } @TestMetadata("classWithFunAndValChanged") public void testClassWithFunAndValChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged/"); doTest(fileName); } @TestMetadata("classWithNestedClassesChanged") public void testClassWithNestedClassesChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged/"); doTest(fileName); } @TestMetadata("classWitnEnumChanged") public void testClassWitnEnumChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/"); doTest(fileName); } @@ -160,24 +160,24 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractProtoComparisonTest { public void testAllFilesPresentInPackageMembers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("packageFacadeMultifileClassChanged") public void testPackageFacadeMultifileClassChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/"); doTest(fileName); } @TestMetadata("packageFacadePrivateOnlyChanges") public void testPackageFacadePrivateOnlyChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges/"); doTest(fileName); } @TestMetadata("packageFacadePublicChanges") public void testPackageFacadePublicChanges() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges/"); doTest(fileName); } @@ -188,18 +188,18 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class Unchanged extends AbstractProtoComparisonTest { public void testAllFilesPresentInUnchanged() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), true); } @TestMetadata("unchangedClass") public void testUnchangedClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedClass/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedClass/"); doTest(fileName); } @TestMetadata("unchangedPackageFacade") public void testUnchangedPackageFacade() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/"); + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade/"); doTest(fileName); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index ccc56bb75a3..7a9f6cfc73b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder -import org.jetbrains.kotlin.test.JetTestUtils +import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestCaseWithTmpdir import org.jetbrains.kotlin.utils.PathUtil @@ -31,7 +31,7 @@ import java.io.File */ public class ClasspathOrderTest : TestCaseWithTmpdir() { companion object { - val sourceDir = File(JetTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() + val sourceDir = File(KotlinTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() } public fun testClasspathOrderForCLI() { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index 8c53fb95d41..b6198737e3e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.modules; import junit.framework.TestCase; import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; -import org.jetbrains.kotlin.test.JetTestUtils; +import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; import java.util.Arrays; @@ -35,7 +35,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { JavaModuleBuildTargetType.PRODUCTION, Collections.emptySet() ).asText().toString(); - JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/basic.xml"), actual); + KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/basic.xml"), actual); } public void testFiltered() throws Exception { @@ -48,7 +48,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) ).asText().toString(); - JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/filtered.xml"), actual); + KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/filtered.xml"), actual); } public void testMultiple() throws Exception { @@ -72,6 +72,6 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.singleton(new File("cp12")) ); String actual = builder.asText().toString(); - JetTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/multiple.xml"), actual); + KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/multiple.xml"), actual); } } From 1f62b03f1348516bf7d7275c6a9428fd700d6cd3 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 30 Oct 2015 15:58:28 +0100 Subject: [PATCH 0613/1557] Enabling parallel builds in JPS without daemon, enabling application environment disposing in tests, introducing keepalive property constant Original commit: 10036d7ef3159dfced5164feaeb675c0f075e812 --- .../jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java | 2 +- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index cc97d0376f3..6f93cb03680 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -70,7 +70,7 @@ public class CompilerRunnerUtil { } @Nullable - public synchronized static Object invokeExecMethod( + public static Object invokeExecMethod( @NotNull String compilerClassName, @NotNull String[] arguments, @NotNull CompilerEnvironment environment, diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 19897e05a6c..314e780b65b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.compilerRunner import com.intellij.util.xmlb.XmlSerializerUtil import org.jetbrains.kotlin.cli.common.ExitCode +import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments @@ -111,6 +112,9 @@ public object KotlinCompilerRunner { val stream = ByteArrayOutputStream() val out = PrintStream(stream) + if (System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY) == null) + System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "") + val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out) // exec() returns an ExitCode object, class of which is loaded with a different class loader, @@ -139,7 +143,7 @@ public object KotlinCompilerRunner { // the property should be set by default for daemon builds to avoid parallel building problems // but it cannot be currently set by default globally, because it seems breaks many tests // TODO: find out how to get rid of the property and make it the default behavior - daemonJVMOptions.jvmParams.add("Dkotlin.environment.keepalive") + daemonJVMOptions.jvmParams.add("D$KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY") val daemonReportMessages = ArrayList() From 121caa0d4e888e3bbe61b3886114ba954125846e Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 3 Nov 2015 21:56:31 +0100 Subject: [PATCH 0614/1557] Adding possibility to skip params inheritance on daemon jvm options creation, refactoring appropriate api, using it to fix tests Original commit: b71fec985f79eeeebc27f05adde92c3bf12cbe1f --- .../org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 314e780b65b..7d50bdb5527 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -139,7 +139,7 @@ public object KotlinCompilerRunner { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) val daemonOptions = configureDaemonOptions() - val daemonJVMOptions = configureDaemonJVMOptions(true) + val daemonJVMOptions = configureDaemonJVMOptions(inheritMemoryLimits = true, inheritAdditionalProperties = true) // the property should be set by default for daemon builds to avoid parallel building problems // but it cannot be currently set by default globally, because it seems breaks many tests // TODO: find out how to get rid of the property and make it the default behavior From dbef2206560d2a4f6c1591f04c5f37e9245fb6a6 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Tue, 3 Nov 2015 21:49:03 +0300 Subject: [PATCH 0615/1557] Minor. fix testdata Original commit: 87f32ef07bdadcc9c89e03d2ea3c5fb3728e605d --- .../incremental/lookupTracker/classifierMembers/usages.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 4559284cced..89fd27c5ab8 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -9,15 +9,15 @@ import bar.* /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/d = "new value" /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/foo() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B()./*c:foo.A.B*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/B./*c:foo.A.B c:foo.A.B.CO*/CO./*c:foo.A.B.CO*/bar(1) /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/baz() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/Companion./*c:foo.A.Companion*/baz() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" i./*c:foo.I*/a = 2 /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/foo() From 1a566ee995d60ac1f48abb3c371d5bc9a6a23897 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 2 Nov 2015 20:21:18 +0300 Subject: [PATCH 0616/1557] Track lookups for nested/inner Java classes Original commit: a6855116b8b15bb3eb68b283742fdbd76030946e --- .../lookupTracker/classifierMembers/foo.kt | 4 ++++ .../lookupTracker/classifierMembers/usages.kt | 13 +++++++++++++ .../incremental/lookupTracker/java/init-build.log | 1 + .../incremental/lookupTracker/java/usages.kt | 10 ++++++++++ .../syntheticProperties/KotlinClass.kt | 2 +- 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 097daea53d9..34f67fad97a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -31,6 +31,8 @@ import bar.* } } + inner class C + companion object { val a = 1 fun baz() {} @@ -44,6 +46,8 @@ import bar.* /*p:foo*/interface I { var a: /*c:foo.I p:foo*/Int fun foo() + + class NI } /*p:foo*/object Obj : /*p:foo*/I { diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 89fd27c5ab8..7194c76f3f6 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -31,3 +31,16 @@ import bar.* /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() } + +/*p:foo*/fun classifiers( + a: /*p:foo*/A, + ab: /*p:foo*/A./*c:foo.A*/B, + ac: /*p:foo*/A./*c:foo.A*/C, + abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO, + aCompanion: /*p:foo*/A./*c:foo.A*/Companion, + aO: /*p:foo*/A./*c:foo.A*/O, + i: /*p:foo*/I, + ni: /*p:foo*/I./*c:foo.I*/NI, + obj: /*p:foo*/Obj, + e: /*p:foo*/E +) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log b/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log index 4ef7b46d7ba..02fb31f771b 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log @@ -3,3 +3,4 @@ src/usages.kt End of files COMPILATION FAILED Unresolved reference: IS +Unresolved reference: IS diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 128a8475cf3..f836b6e74c9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -33,3 +33,13 @@ import baz.* /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F./*c:baz.E*/field /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() } + +/*p:foo*/fun classifiers( + c: C, + b: C./*c:bar.C*/B, + s: C./*c:bar.C*/S, + cis: C./*c:bar.C*/IS, + i: /*p:foo*/I, + iis: /*p:foo*/I./*c:foo.I*/IS, + e: /*p:foo p:baz*/E +) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt index 1771c1d3c84..abc2cb3f81d 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt @@ -4,5 +4,5 @@ import /*p:*/JavaClass /*p:foo*/class KotlinClass : JavaClass() { override fun getFoo() = 2 - fun setFoo(i: /*c:foo.KotlinClass p:foo*/Int) {} + fun setFoo(i: /*c:foo.KotlinClass c:JavaClass p:foo*/Int) {} } From 35cb01217ee769aea84f1071497979fd3a99e4d6 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 2 Nov 2015 23:26:03 +0300 Subject: [PATCH 0617/1557] Add tests for lookups to enum static scope and to companion object scope Original commit: 04fed203e4df84f4bdbad7e0d91a755234350192 --- .../kotlin/jps/build/AbstractLookupTrackerTest.kt | 3 ++- .../lookupTracker/classifierMembers/init-build.log | 11 +++++++++++ .../lookupTracker/classifierMembers/usages.kt | 9 +++++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/init-build.log diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 649c9e544e4..1730b0be18d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -26,6 +26,7 @@ import java.io.File import java.util.* private val DECLARATION_KEYWORDS = listOf("interface", "class", "enum class", "object", "fun", "val", "var") +private val DECLARATION_STARTS_WITH = DECLARATION_KEYWORDS.map { it + " " } abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( allowNoFilesWithSuffixInTestData = true, @@ -74,7 +75,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( when { rest.startsWith(it.name) || // same name rest.startsWith("$" + it.name) || // backing field - DECLARATION_KEYWORDS.any { w -> rest.startsWith(w) } // it's declaration + DECLARATION_STARTS_WITH.any { rest.startsWith(it) } // it's declaration -> "" else -> "(" + it.name + ")" } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/init-build.log b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/init-build.log new file mode 100644 index 00000000000..3aacbd6c97e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/init-build.log @@ -0,0 +1,11 @@ +Compiling files: +src/bar.kt +src/constraints.kt +src/foo.kt +src/usages.kt +End of files +COMPILATION FAILED +Unresolved reference: vala +Unresolved reference: vara +Unresolved reference: foo +Unresolved reference: bar diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 7194c76f3f6..91c0eb2f084 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,6 +18,9 @@ import bar.* /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/Companion./*c:foo.A.Companion*/baz() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() + i./*c:foo.I*/a = 2 /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/foo() @@ -27,9 +30,15 @@ import bar.* /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/b val iii = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/bar() iii./*c:foo.I*/foo() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/values + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/values() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf("") + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( From 7e4395a173da37073b14c5fc85bf5801b8fd391d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 30 Oct 2015 16:50:27 +0300 Subject: [PATCH 0618/1557] Replace deprecated join with joinToString Original commit: f3ff2e2e76e05625ff4087fcf4fadae6f98d2e47 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 ++++---- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- .../kotlin/jps/build/AbstractLookupTrackerTest.kt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index cf165fdd2a2..489f7247f21 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -138,7 +138,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val dataManager = projectDescriptor.dataManager if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) { - LOG.info("Clearing caches for " + chunk.targets.map { it.presentableName }.join()) + LOG.info("Clearing caches for " + chunk.targets.joinToString { it.presentableName }) chunk.targets.forEach { dataManager.getKotlinCache(it).clean() } return CHUNK_REBUILD_REQUIRED } @@ -278,7 +278,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): OutputItemsCollectorImpl? { if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { - LOG.debug("Compiling to JS ${filesToCompile.values().size()} files in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) + LOG.debug("Compiling to JS ${filesToCompile.values().size()} files in ${filesToCompile.keySet().joinToString { it.presentableName }}") return compileToJs(chunk, commonArguments, environment, null, messageCollector, project) } @@ -563,7 +563,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val moduleFile = KotlinBuilderModuleScriptGenerator.generateModuleDescription(context, chunk, filesToCompile, totalRemovedFiles != 0) if (moduleFile == null) { - KotlinBuilder.LOG.debug("Not compiling, because no files affected: " + filesToCompile.keySet().map { it.getPresentableName() }.join()) + KotlinBuilder.LOG.debug("Not compiling, because no files affected: " + filesToCompile.keySet().joinToString { it.presentableName }) // No Kotlin sources found return null } @@ -574,7 +574,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR KotlinBuilder.LOG.debug("Compiling to JVM ${filesToCompile.values().size()} files" + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") - + " in " + filesToCompile.keySet().map { it.getPresentableName() }.join()) + + " in " + filesToCompile.keySet().joinToString { it.presentableName }) KotlinCompilerRunner.runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) moduleFile.delete() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 3de1a1a4800..d81670d633f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -110,7 +110,7 @@ public class IncrementalCacheImpl( @TestOnly public fun dump(): String { - return maps.map { it.dump() }.join("\n\n") + return maps.joinToString("\n\n") { it.dump() } } public fun markOutputClassesDirty(removedAndCompiledSources: List) { @@ -769,7 +769,7 @@ private fun , V> Map.dumpMap(dumpValue: (V)->String): St @TestOnly public fun > Collection.dumpCollection(): String = - "[${sorted().map(Any::toString).join(", ")}]" + "[${sorted().joinToString(", ", transform = Any::toString)}]" private class PathFunctionPair( public val path: String, diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 1730b0be18d..11d189dfa57 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -88,7 +88,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( start = end } - lines[line - 1] = parts.join("") + lineContent.subSequence(start, lineContent.length) + lines[line - 1] = parts.joinToString("") + lineContent.subSequence(start, lineContent.length) } val actual = lines.joinToString("\n") From 02543e165becda4a6b01ca3521de8c38e34dcc3b Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 5 Nov 2015 20:48:33 +0300 Subject: [PATCH 0619/1557] fix KT-9843 Bug in incremental compilation: module is not recompiled when optional parameter added and KT-8434 Removing parameter with default value from function in different module breaks incremental compilation #KT-9843 Fixed #KT-8434 Fixed Original commit: 981d471ebe1621b37aeaada029e35a7438f9ec9f --- .../build/IncrementalJpsTestGenerated.java | 24 +++++++++++++++++++ .../defaultParameterAdded/build.log | 13 ++++++++++ .../defaultParameterAdded/dependencies.txt | 2 ++ .../defaultParameterAdded/module1_a.kt | 6 +++++ .../defaultParameterAdded/module1_a.kt.new | 5 ++++ .../defaultParameterAdded/module2_usage.kt | 7 ++++++ .../build.log | 14 +++++++++++ .../dependencies.txt | 2 ++ .../module1_a.kt | 3 +++ .../module1_a.kt.new | 3 +++ .../module2_usage.kt | 5 ++++ .../defaultParameterRemoved/build.log | 13 ++++++++++ .../defaultParameterRemoved/dependencies.txt | 2 ++ .../defaultParameterRemoved/module1_a.kt | 6 +++++ .../defaultParameterRemoved/module1_a.kt.new | 7 ++++++ .../defaultParameterRemoved/module2_usage.kt | 6 +++++ .../build.log | 14 +++++++++++ .../dependencies.txt | 2 ++ .../module1_a.kt | 3 +++ .../module1_a.kt.new | 3 +++ .../module2_usage.kt | 5 ++++ 21 files changed, 145 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module2_usage.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module2_usage.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module2_usage.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module2_usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 72c7dff31e4..bd0218cefb6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -61,6 +61,30 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("defaultParameterAdded") + public void testDefaultParameterAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultParameterAddedForTopLevelFun") + public void testDefaultParameterAddedForTopLevelFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/"); + doTest(fileName); + } + + @TestMetadata("defaultParameterRemoved") + public void testDefaultParameterRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultParameterRemovedForTopLevelFun") + public void testDefaultParameterRemovedForTopLevelFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionInlined") public void testInlineFunctionInlined() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log new file mode 100644 index 00000000000..16518f5f414 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module1/a/A.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/usage/Module2_usageKt.class +End of files +Compiling files: +module2/src/module2_usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt new file mode 100644 index 00000000000..0d3a95d2ad1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt @@ -0,0 +1,6 @@ +package a + +class A { + fun foo(s: String, x: Int = 10) { + } +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt.new new file mode 100644 index 00000000000..b0f678a5175 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module1_a.kt.new @@ -0,0 +1,5 @@ +package a + +class A { + fun foo(s: String, x: Int = 10, y:Int = 20) {} +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module2_usage.kt new file mode 100644 index 00000000000..4eb0fae8143 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/module2_usage.kt @@ -0,0 +1,7 @@ +package usage + +import a.A + +fun main(args: Array) { + A().foo("") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log new file mode 100644 index 00000000000..b25e93d2f74 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/usage/Module2_usageKt.class +End of files +Compiling files: +module2/src/module2_usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt new file mode 100644 index 00000000000..642e76de376 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt @@ -0,0 +1,3 @@ +package a + +fun foo(s: String, x: Int = 10) {} diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt.new new file mode 100644 index 00000000000..d496f7777f7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module1_a.kt.new @@ -0,0 +1,3 @@ +package a + +fun foo(s: String, x: Int = 10, y:Int = 20) {} diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module2_usage.kt new file mode 100644 index 00000000000..c739a83b15e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/module2_usage.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + a.foo("") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log new file mode 100644 index 00000000000..16518f5f414 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module1/a/A.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/usage/Module2_usageKt.class +End of files +Compiling files: +module2/src/module2_usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt new file mode 100644 index 00000000000..1d902152567 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt @@ -0,0 +1,6 @@ +package a + +class A { + fun foo(x:Int = 10) { + } +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt.new new file mode 100644 index 00000000000..ecefb7d1c19 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module1_a.kt.new @@ -0,0 +1,7 @@ +package a + +class A { + fun foo() { + } +} + diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module2_usage.kt new file mode 100644 index 00000000000..7c3eb527bdc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/module2_usage.kt @@ -0,0 +1,6 @@ +package usage + +fun b(param: a.A) { + param.foo() +} + diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log new file mode 100644 index 00000000000..b25e93d2f74 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/usage/Module2_usageKt.class +End of files +Compiling files: +module2/src/module2_usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt new file mode 100644 index 00000000000..6678dd7608c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt @@ -0,0 +1,3 @@ +package a + +fun foo(x: Int = 10) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt.new new file mode 100644 index 00000000000..ae5ee652ccc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module1_a.kt.new @@ -0,0 +1,3 @@ +package a + +fun foo() {} diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module2_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module2_usage.kt new file mode 100644 index 00000000000..5c991459597 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/module2_usage.kt @@ -0,0 +1,5 @@ +package usage + +fun main(args: Array) { + a.foo() +} From 4e5b148bb1c0b787c862205ba96bf7b1561ec3a4 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 26 Oct 2015 20:40:43 +0300 Subject: [PATCH 0620/1557] Save lookups to incremental cache Original commit: c9663340c9808215ed0a6b354136f744126c1ba7 --- .../kotlin/jps/build/KotlinBuilder.kt | 14 ++- .../jps/incremental/IncrementalCacheImpl.kt | 2 +- .../jps/incremental/LookupTrackerImpl.kt | 94 +++++++++++++++++++ .../jps/incremental/LookupTrackerTarget.kt | 61 ++++++++++++ 4 files changed, 162 insertions(+), 9 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerTarget.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 489f7247f21..c3e78b615cb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -22,19 +22,22 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.util.containers.MultiMap import gnu.trove.THashSet import org.jetbrains.jps.ModuleChunk -import org.jetbrains.jps.builders.BuildTarget -import org.jetbrains.jps.builders.DirtyFilesHolder +import org.jetbrains.jps.builders.* import org.jetbrains.jps.builders.impl.BuildTargetRegistryImpl import org.jetbrains.jps.builders.impl.TargetOutputIndexImpl import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor import org.jetbrains.jps.builders.java.dependencyView.Mappings +import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage +import org.jetbrains.jps.indices.IgnoredFileIndex +import org.jetbrains.jps.indices.ModuleExcludeIndex +import org.jetbrains.jps.model.JpsModel import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.JpsSimpleElement import org.jetbrains.jps.model.ex.JpsElementChildRoleBase @@ -152,12 +155,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val project = projectDescriptor.project - val lookupTracker = - project.container.getChild(LOOKUP_TRACKER)?.let { - assert("true".equals(System.getProperty("kotlin.jps.tests"), ignoreCase = true)) { "LOOKUP_TRACKER allowed only for jps tests" } - it.data - } ?: LookupTracker.DO_NOTHING - + val lookupTracker = dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) val incrementalCaches = getIncrementalCaches(chunk, context) val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) if (!environment.success()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index d81670d633f..3c3aa58d4d7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -731,7 +731,7 @@ private object StringListExternalizer : DataExternalizer> { } } -private object PathCollectionExternalizer : DataExternalizer> { +object PathCollectionExternalizer : DataExternalizer> { override fun save(out: DataOutput, value: Collection) { for (str in value) { IOUtil.writeUTF(out, str) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt new file mode 100644 index 00000000000..5e11010e236 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -0,0 +1,94 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import com.intellij.util.io.KeyDescriptor +import org.jetbrains.jps.builders.storage.StorageProvider +import org.jetbrains.jps.incremental.storage.StorageOwner +import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.components.ScopeKind +import org.jetbrains.kotlin.jps.incremental.storage.BasicMap +import java.io.DataInput +import java.io.DataOutput +import java.io.File + +object LOOKUP_TRACKER_STORAGE_PROVIDER : StorageProvider() { + override fun createStorage(targetDataDir: File): LookupTrackerImpl = LookupTrackerImpl(targetDataDir) +} + +class LookupTrackerImpl(targetDataDir: File) : LookupTracker, StorageOwner { + private val lookupMap = LookupMap(File(targetDataDir, "lookups.tab")) + + override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { + lookupMap.add(name, scopeFqName, lookupContainingFile) + } + + override fun clean() { + lookupMap.clean() + } + + override fun close() { + lookupMap.close() + } + + override fun flush(memoryCachesOnly: Boolean) { + lookupMap.flush(memoryCachesOnly) + } +} + +private class LookupMap(file: File) : BasicMap>(file, INT_PAIR_KEY_DESCRIPTOR, PathCollectionExternalizer) { + override fun dumpKey(key: IntPair): String = key.toString() + + override fun dumpValue(value: Collection): String = value.toString() + + public fun add(name: String, scope: String, path: String) { + storage.append(HashPair(name, scope)) { out -> out.writeUTF(path) } + } + + public fun get(name: String, scope: String): Collection? = storage[HashPair(name, scope)] +} + +private data class IntPair(val first: Int, val second: Int) : Comparable { + override fun compareTo(other: IntPair): Int { + val firstCmp = first.compareTo(other.first) + + if (firstCmp != 0) return firstCmp + + return second.compareTo(other.second) + } +} + +private fun HashPair(a: Any, b: Any): IntPair = IntPair(a.hashCode(), b.hashCode()) + +private object INT_PAIR_KEY_DESCRIPTOR : KeyDescriptor { + override fun read(`in`: DataInput): IntPair { + val first = `in`.readInt() + val second = `in`.readInt() + return IntPair(first, second) + } + + override fun save(out: DataOutput, value: IntPair?) { + if (value == null) return + + out.writeInt(value.first) + out.writeInt(value.second) + } + + override fun getHashCode(value: IntPair?): Int = value?.hashCode() ?: 0 + + override fun isEqual(val1: IntPair?, val2: IntPair?): Boolean = val1 == val2 +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerTarget.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerTarget.kt new file mode 100644 index 00000000000..68ec5195399 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerTarget.kt @@ -0,0 +1,61 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import org.jetbrains.jps.builders.* +import org.jetbrains.jps.builders.storage.BuildDataPaths +import org.jetbrains.jps.incremental.CompileContext +import org.jetbrains.jps.indices.IgnoredFileIndex +import org.jetbrains.jps.indices.ModuleExcludeIndex +import org.jetbrains.jps.model.JpsModel +import java.io.File + +private val KOTLIN_LOOKUP_TRACKER = "kotlin-lookup-tracker" + +object LOOKUP_TRACKER_TARGET_TYPE : BuildTargetType(KOTLIN_LOOKUP_TRACKER) { + override fun computeAllTargets(model: JpsModel): List = listOf(LOOKUP_TRACKER_TARGET) + + override fun createLoader(model: JpsModel): BuildTargetLoader = + object : BuildTargetLoader() { + override fun createTarget(targetId: String): LOOKUP_TRACKER_TARGET? = LOOKUP_TRACKER_TARGET + } +} + +object LOOKUP_TRACKER_TARGET : BuildTarget(LOOKUP_TRACKER_TARGET_TYPE) { + override fun getId(): String? = KOTLIN_LOOKUP_TRACKER + override fun getPresentableName(): String = KOTLIN_LOOKUP_TRACKER + + override fun computeRootDescriptors( + model: JpsModel?, + index: ModuleExcludeIndex?, + ignoredFileIndex: IgnoredFileIndex?, + dataPaths: BuildDataPaths? + ): List = listOf() + + override fun getOutputRoots(context: CompileContext): Collection { + val dataManager = context.projectDescriptor.dataManager + val storageRoot = dataManager.dataPaths.dataStorageRoot + return listOf(File(storageRoot, KOTLIN_LOOKUP_TRACKER)) + } + + override fun findRootDescriptor(rootId: String?, rootIndex: BuildRootIndex?): BuildRootDescriptor? = null + + override fun computeDependencies( + targetRegistry: BuildTargetRegistry?, + outputIndex: TargetOutputIndex? + ): Collection>? = listOf() +} From 376fb151232a2ce4a117273dce9896d3c8a08e5c Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 29 Oct 2015 17:44:10 +0300 Subject: [PATCH 0621/1557] Move LookupMap Original commit: f6f300d903ed5016e9dd6a20c93d74371e29dd85 --- .../jps/incremental/LookupTrackerImpl.kt | 47 +---------------- .../kotlin/jps/incremental/storage/IntPair.kt | 52 +++++++++++++++++++ .../jps/incremental/storage/LookupMap.kt | 35 +++++++++++++ 3 files changed, 88 insertions(+), 46 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IntPair.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt index 5e11010e236..c65d559ece2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -16,14 +16,11 @@ package org.jetbrains.kotlin.jps.incremental -import com.intellij.util.io.KeyDescriptor import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind -import org.jetbrains.kotlin.jps.incremental.storage.BasicMap -import java.io.DataInput -import java.io.DataOutput +import org.jetbrains.kotlin.jps.incremental.storage.LookupMap import java.io.File object LOOKUP_TRACKER_STORAGE_PROVIDER : StorageProvider() { @@ -50,45 +47,3 @@ class LookupTrackerImpl(targetDataDir: File) : LookupTracker, StorageOwner { } } -private class LookupMap(file: File) : BasicMap>(file, INT_PAIR_KEY_DESCRIPTOR, PathCollectionExternalizer) { - override fun dumpKey(key: IntPair): String = key.toString() - - override fun dumpValue(value: Collection): String = value.toString() - - public fun add(name: String, scope: String, path: String) { - storage.append(HashPair(name, scope)) { out -> out.writeUTF(path) } - } - - public fun get(name: String, scope: String): Collection? = storage[HashPair(name, scope)] -} - -private data class IntPair(val first: Int, val second: Int) : Comparable { - override fun compareTo(other: IntPair): Int { - val firstCmp = first.compareTo(other.first) - - if (firstCmp != 0) return firstCmp - - return second.compareTo(other.second) - } -} - -private fun HashPair(a: Any, b: Any): IntPair = IntPair(a.hashCode(), b.hashCode()) - -private object INT_PAIR_KEY_DESCRIPTOR : KeyDescriptor { - override fun read(`in`: DataInput): IntPair { - val first = `in`.readInt() - val second = `in`.readInt() - return IntPair(first, second) - } - - override fun save(out: DataOutput, value: IntPair?) { - if (value == null) return - - out.writeInt(value.first) - out.writeInt(value.second) - } - - override fun getHashCode(value: IntPair?): Int = value?.hashCode() ?: 0 - - override fun isEqual(val1: IntPair?, val2: IntPair?): Boolean = val1 == val2 -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IntPair.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IntPair.kt new file mode 100644 index 00000000000..d285bdd3520 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IntPair.kt @@ -0,0 +1,52 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import com.intellij.util.io.KeyDescriptor +import java.io.DataInput +import java.io.DataOutput + +data class IntPair(val first: Int, val second: Int) : Comparable { + override fun compareTo(other: IntPair): Int { + val firstCmp = first.compareTo(other.first) + + if (firstCmp != 0) return firstCmp + + return second.compareTo(other.second) + } +} + +fun HashPair(a: Any, b: Any): IntPair = IntPair(a.hashCode(), b.hashCode()) + +internal object INT_PAIR_KEY_DESCRIPTOR : KeyDescriptor { + override fun read(`in`: DataInput): IntPair { + val first = `in`.readInt() + val second = `in`.readInt() + return IntPair(first, second) + } + + override fun save(out: DataOutput, value: IntPair?) { + if (value == null) return + + out.writeInt(value.first) + out.writeInt(value.second) + } + + override fun getHashCode(value: IntPair?): Int = value?.hashCode() ?: 0 + + override fun isEqual(val1: IntPair?, val2: IntPair?): Boolean = val1 == val2 +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt new file mode 100644 index 00000000000..e89741f75e9 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import org.jetbrains.kotlin.jps.incremental.PathCollectionExternalizer +import java.io.File + +class LookupMap(file: File) : BasicMap>(file, INT_PAIR_KEY_DESCRIPTOR, PathCollectionExternalizer) { + override fun dumpKey(key: IntPair): String = key.toString() + + override fun dumpValue(value: Collection): String = value.toString() + + public fun add(name: String, scope: String, path: String) { + storage.append(HashPair(name, scope)) { out -> out.writeUTF(path) } + } + + public fun get(name: String, scope: String): Collection? = storage[HashPair(name, scope)] +} + + + From e7ac1c839c31892bd05a50cc425f9cf26948bea6 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 2 Nov 2015 16:10:58 +0300 Subject: [PATCH 0622/1557] Extract BasicMapsOwner Original commit: 9564a7a828bbef3f4cebac5e54b8afa3f0bdfa6c --- .../kotlin/jps/incremental/BasicMapsOwner.kt | 45 +++++++++++++++++++ .../jps/incremental/IncrementalCacheImpl.kt | 29 ++---------- .../jps/incremental/LookupTrackerImpl.kt | 8 ++-- 3 files changed, 54 insertions(+), 28 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt new file mode 100644 index 00000000000..4aa11a21ac0 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt @@ -0,0 +1,45 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import org.jetbrains.annotations.TestOnly +import org.jetbrains.jps.incremental.storage.StorageOwner +import org.jetbrains.kotlin.jps.incremental.storage.BasicMap + +open class BasicMapsOwner : StorageOwner { + private val maps = arrayListOf>() + + protected fun > registerMap(map: M): M { + maps.add(map) + return map + } + + override fun clean() { + maps.forEach { it.clean() } + } + + override fun close() { + maps.forEach { it.close() } + } + + override fun flush(memoryCachesOnly: Boolean) { + maps.forEach { it.flush(memoryCachesOnly) } + } + + @TestOnly + public fun dump(): String = maps.map { it.dump() }.joinToString("\n\n") +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 3c3aa58d4d7..a5a6e5e3106 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -26,7 +26,6 @@ import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor -import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder @@ -37,7 +36,6 @@ import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.resolve.jvm.JvmClassName.byInternalName import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.org.objectweb.asm.* import java.io.DataInput @@ -56,9 +54,9 @@ public fun getCacheDirectoryName(): String = public class IncrementalCacheImpl( targetDataRoot: File, private val target: ModuleBuildTarget -) : StorageOwner, IncrementalCache { +) : BasicMapsOwner(), IncrementalCache { companion object { - val CACHE_EXTENSION = "tab" + val CACHE_EXTENSION = ".tab" val PROTO_MAP = "proto" val CONSTANTS_MAP = "constants" @@ -75,15 +73,9 @@ public class IncrementalCacheImpl( } private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) - private val maps = arrayListOf>() private val String.storageFile: File - get() = File(baseDir, this + "." + CACHE_EXTENSION) - - private fun > registerMap(map: M): M { - maps.add(map) - return map - } + get() = File(baseDir, this + CACHE_EXTENSION) private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) @@ -108,11 +100,6 @@ public class IncrementalCacheImpl( dependents.add(cache) } - @TestOnly - public fun dump(): String { - return maps.joinToString("\n\n") { it.dump() } - } - public fun markOutputClassesDirty(removedAndCompiledSources: List) { for (sourceFile in removedAndCompiledSources) { val classes = sourceToClassesMap[sourceFile] @@ -278,19 +265,11 @@ public class IncrementalCacheImpl( return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)]?.bytes } - override fun flush(memoryCachesOnly: Boolean) { - maps.forEach { it.flush(memoryCachesOnly) } - } - public override fun clean() { - maps.forEach { it.clean() } + super.clean() cacheFormatVersion.clean() } - public override fun close() { - maps.forEach { it.close () } - } - private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): ChangesInfo { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt index c65d559ece2..a7bc0eb6285 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jps.builders.storage.StorageProvider -import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.incremental.storage.LookupMap @@ -27,8 +26,11 @@ object LOOKUP_TRACKER_STORAGE_PROVIDER : StorageProvider() { override fun createStorage(targetDataDir: File): LookupTrackerImpl = LookupTrackerImpl(targetDataDir) } -class LookupTrackerImpl(targetDataDir: File) : LookupTracker, StorageOwner { - private val lookupMap = LookupMap(File(targetDataDir, "lookups.tab")) +class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), LookupTracker { + private val String.storageFile: File + get() = File(targetDataDir, this + IncrementalCacheImpl.CACHE_EXTENSION) + + private val lookupMap = registerMap(LookupMap("lookups".storageFile)) override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { lookupMap.add(name, scopeFqName, lookupContainingFile) From b65376a0162f41c9b5194832ca23904dc2070f52 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 29 Oct 2015 18:24:45 +0300 Subject: [PATCH 0623/1557] Move all incremental cache value/externalizing types to corresponding files Original commit: dae5b8e39e7cfa0788e0af8be9cf98bd710aa9c0 --- .../jps/incremental/IncrementalCacheImpl.kt | 214 +---------------- .../jps/incremental/protoDifferenceUtils.kt | 2 +- .../jps/incremental/storage/LookupMap.kt | 3 +- .../jps/incremental/storage/externalizers.kt | 218 ++++++++++++++++++ .../storage/{IntPair.kt => values.kt} | 38 +-- .../AbstractProtoComparisonTest.kt | 6 +- 6 files changed, 257 insertions(+), 224 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/{IntPair.kt => values.kt} (54%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index a5a6e5e3106..b75df33c9e7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -17,7 +17,9 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.openapi.util.io.FileUtil -import com.intellij.util.io.* +import com.intellij.util.io.BooleanDataDescriptor +import com.intellij.util.io.EnumeratorStringDescriptor +import com.intellij.util.io.IOUtil import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.BuildTarget @@ -29,8 +31,7 @@ import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder -import org.jetbrains.kotlin.jps.incremental.storage.BasicMap -import org.jetbrains.kotlin.jps.incremental.storage.BasicStringMap +import org.jetbrains.kotlin.jps.incremental.storage.* import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache @@ -38,9 +39,6 @@ import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartPro import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.org.objectweb.asm.* -import java.io.DataInput -import java.io.DataInputStream -import java.io.DataOutput import java.io.File import java.security.MessageDigest import java.util.* @@ -270,7 +268,7 @@ public class IncrementalCacheImpl( cacheFormatVersion.clean() } - private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { + private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, PROTO_MAP_VALUE_EXTERNALIZER) { public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): ChangesInfo { val header = kotlinClass.classHeader @@ -316,7 +314,7 @@ public class IncrementalCacheImpl( } } - private inner class ConstantsMap(storageFile: File) : BasicStringMap>(storageFile, ConstantsMapExternalizer) { + private inner class ConstantsMap(storageFile: File) : BasicStringMap>(storageFile, CONSTANTS_MAP_EXTERNALIZER) { private fun getConstantsMap(bytes: ByteArray): Map? { val result = HashMap() @@ -364,65 +362,7 @@ public class IncrementalCacheImpl( value.dumpMap(Any::toString) } - private object ConstantsMapExternalizer : DataExternalizer> { - override fun save(out: DataOutput, map: Map?) { - out.writeInt(map!!.size()) - for (name in map.keySet().sorted()) { - IOUtil.writeString(name, out) - val value = map[name]!! - when (value) { - is Int -> { - out.writeByte(Kind.INT.ordinal()) - out.writeInt(value) - } - is Float -> { - out.writeByte(Kind.FLOAT.ordinal()) - out.writeFloat(value) - } - is Long -> { - out.writeByte(Kind.LONG.ordinal()) - out.writeLong(value) - } - is Double -> { - out.writeByte(Kind.DOUBLE.ordinal()) - out.writeDouble(value) - } - is String -> { - out.writeByte(Kind.STRING.ordinal()) - IOUtil.writeString(value, out) - } - else -> throw IllegalStateException("Unexpected constant class: ${value.javaClass}") - } - } - } - - override fun read(`in`: DataInput): Map? { - val size = `in`.readInt() - val map = HashMap(size) - - repeat(size) { - val name = IOUtil.readString(`in`)!! - - val kind = Kind.values()[`in`.readByte().toInt()] - val value = when (kind) { - Kind.INT -> `in`.readInt() - Kind.FLOAT -> `in`.readFloat() - Kind.LONG -> `in`.readLong() - Kind.DOUBLE -> `in`.readDouble() - Kind.STRING -> IOUtil.readString(`in`)!! - } - map[name] = value - } - - return map - } - - private enum class Kind { - INT, FLOAT, LONG, DOUBLE, STRING - } - } - - private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringToLongMapExternalizer) { + private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, STRING_TO_LONG_MAP_EXTERNALIZER) { private fun getInlineFunctionsMap(bytes: ByteArray): Map { val result = HashMap() @@ -508,7 +448,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { + private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, STRING_LIST_EXTERNALIZER) { public fun add(facadeName: JvmClassName, partNames: List) { storage[facadeName.internalName] = partNames } @@ -538,7 +478,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: String): String = value } - private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringListExternalizer) { + private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, STRING_LIST_EXTERNALIZER) { public fun clearOutputsForSource(sourceFile: File) { storage.remove(sourceFile.absolutePath) } @@ -571,7 +511,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { + private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, STRING_LIST_EXTERNALIZER) { public fun getEntries(): Map> = storage.keys.toMap(JvmClassName::byInternalName) { storage[it]!! } @@ -592,7 +532,7 @@ public class IncrementalCacheImpl( * * inlineFunction - jvmSignature of some inline function in source file * * target files - collection of files inlineFunction has been inlined to */ - private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { + private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PATH_FUNCTION_PAIR_KEY_DESCRIPTOR, PATH_COLLECTION_EXTERNALIZER) { public fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val key = PathFunctionPair(sourcePath, jvmSignature) storage.append(key) { out -> @@ -661,73 +601,6 @@ private fun ByteArray.md5(): Long { ) } -private abstract class StringMapExternalizer : DataExternalizer> { - override fun save(out: DataOutput, map: Map?) { - out.writeInt(map!!.size()) - - for ((key, value) in map.entrySet()) { - IOUtil.writeString(key, out) - writeValue(out, value) - } - } - - override fun read(`in`: DataInput): Map? { - val size = `in`.readInt() - val map = HashMap(size) - - repeat(size) { - val name = IOUtil.readString(`in`)!! - map[name] = readValue(`in`) - } - - return map - } - - protected abstract fun writeValue(output: DataOutput, value: T) - protected abstract fun readValue(input: DataInput): T -} - -private object StringToLongMapExternalizer : StringMapExternalizer() { - override fun readValue(input: DataInput): Long = - input.readLong() - - override fun writeValue(output: DataOutput, value: Long) { - output.writeLong(value) - } -} - -private object StringListExternalizer : DataExternalizer> { - override fun save(out: DataOutput, value: List) { - value.forEach { IOUtil.writeUTF(out, it) } - } - - override fun read(`in`: DataInput): List { - val result = ArrayList() - while ((`in` as DataInputStream).available() > 0) { - result.add(IOUtil.readUTF(`in`)) - } - return result - } -} - -object PathCollectionExternalizer : DataExternalizer> { - override fun save(out: DataOutput, value: Collection) { - for (str in value) { - IOUtil.writeUTF(out, str) - } - } - - override fun read(`in`: DataInput): Collection { - val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) - val stream = `in` as DataInputStream - while (stream.available() > 0) { - val str = IOUtil.readUTF(stream) - result.add(str) - } - return result - } -} - private val File.normalizedPath: String get() = FileUtil.toSystemIndependentName(canonicalPath) @@ -749,68 +622,3 @@ private fun , V> Map.dumpMap(dumpValue: (V)->String): St @TestOnly public fun > Collection.dumpCollection(): String = "[${sorted().joinToString(", ", transform = Any::toString)}]" - -private class PathFunctionPair( - public val path: String, - public val function: String -): Comparable { - override fun compareTo(other: PathFunctionPair): Int { - val pathComp = FileUtil.comparePaths(path, other.path) - - if (pathComp != 0) return pathComp - - return function.compareTo(other.function) - } - - override fun equals(other: Any?): Boolean = - when (other) { - is PathFunctionPair -> - FileUtil.pathsEqual(path, other.path) && function == other.function - else -> - false - } - - override fun hashCode(): Int = 31 * FileUtil.pathHashCode(path) + function.hashCode() -} - -private object PathFunctionPairKeyDescriptor : KeyDescriptor { - override fun getHashCode(value: PathFunctionPair): Int = - value.hashCode() - - override fun isEqual(val1: PathFunctionPair, val2: PathFunctionPair): Boolean = - val1 == val2 - - override fun read(`in`: DataInput): PathFunctionPair { - val path = IOUtil.readUTF(`in`) - val function = IOUtil.readUTF(`in`) - return PathFunctionPair(path, function) - } - - override fun save(out: DataOutput, value: PathFunctionPair) { - IOUtil.writeUTF(out, value.path) - IOUtil.writeUTF(out, value.function) - } - -} - -private object ProtoMapValueExternalizer : DataExternalizer { - override fun save(out: DataOutput, value: ProtoMapValue) { - out.writeBoolean(value.isPackageFacade) - out.writeInt(value.bytes.size()) - out.write(value.bytes) - out.writeInt(value.strings.size()) - for (string in value.strings) { - out.writeUTF(string) - } - } - - override fun read(`in`: DataInput): ProtoMapValue { - val isPackageFacade = `in`.readBoolean() - val bytesLength = `in`.readInt() - val bytes = ByteArray(bytesLength) - `in`.readFully(bytes, 0, bytesLength) - val stringsLength = `in`.readInt() - val strings = Array(stringsLength) { `in`.readUTF() } - return ProtoMapValue(isPackageFacade, bytes, strings) - } -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 60954d7d26e..771f7b78739 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -20,6 +20,7 @@ import com.google.protobuf.MessageLite import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.jps.incremental.ProtoCompareGenerated.ProtoBufClassKind import org.jetbrains.kotlin.jps.incremental.ProtoCompareGenerated.ProtoBufPackageKind +import org.jetbrains.kotlin.jps.incremental.storage.ProtoMapValue import org.jetbrains.kotlin.serialization.Flags import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.Deserialization @@ -34,7 +35,6 @@ public sealed class DifferenceKind() { public class MEMBERS(val names: Collection): DifferenceKind() } -data class ProtoMapValue(val isPackageFacade: Boolean, val bytes: ByteArray, val strings: Array) public fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): DifferenceKind { if (oldData.isPackageFacade != newData.isPackageFacade) return DifferenceKind.CLASS_SIGNATURE diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index e89741f75e9..adc104dba2d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -16,10 +16,9 @@ package org.jetbrains.kotlin.jps.incremental.storage -import org.jetbrains.kotlin.jps.incremental.PathCollectionExternalizer import java.io.File -class LookupMap(file: File) : BasicMap>(file, INT_PAIR_KEY_DESCRIPTOR, PathCollectionExternalizer) { +class LookupMap(file: File) : BasicMap>(file, INT_PAIR_KEY_DESCRIPTOR, PATH_COLLECTION_EXTERNALIZER) { override fun dumpKey(key: IntPair): String = key.toString() override fun dumpValue(value: Collection): String = value.toString() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt new file mode 100644 index 00000000000..f8cfd2ed137 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt @@ -0,0 +1,218 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import com.intellij.openapi.util.io.FileUtil +import com.intellij.util.io.DataExternalizer +import com.intellij.util.io.IOUtil +import com.intellij.util.io.KeyDescriptor +import gnu.trove.THashSet +import java.io.DataInput +import java.io.DataInputStream +import java.io.DataOutput +import java.util.* + +object INT_PAIR_KEY_DESCRIPTOR : KeyDescriptor { + override fun read(`in`: DataInput): IntPair { + val first = `in`.readInt() + val second = `in`.readInt() + return IntPair(first, second) + } + + override fun save(out: DataOutput, value: IntPair?) { + if (value == null) return + + out.writeInt(value.first) + out.writeInt(value.second) + } + + override fun getHashCode(value: IntPair?): Int = value?.hashCode() ?: 0 + + override fun isEqual(val1: IntPair?, val2: IntPair?): Boolean = val1 == val2 +} + + +object PATH_FUNCTION_PAIR_KEY_DESCRIPTOR : KeyDescriptor { + override fun getHashCode(value: PathFunctionPair): Int = + value.hashCode() + + override fun isEqual(val1: PathFunctionPair, val2: PathFunctionPair): Boolean = + val1 == val2 + + override fun read(`in`: DataInput): PathFunctionPair { + val path = IOUtil.readUTF(`in`) + val function = IOUtil.readUTF(`in`) + return PathFunctionPair(path, function) + } + + override fun save(out: DataOutput, value: PathFunctionPair) { + IOUtil.writeUTF(out, value.path) + IOUtil.writeUTF(out, value.function) + } +} + + +object PROTO_MAP_VALUE_EXTERNALIZER : DataExternalizer { + override fun save(out: DataOutput, value: ProtoMapValue) { + out.writeBoolean(value.isPackageFacade) + out.writeInt(value.bytes.size()) + out.write(value.bytes) + out.writeInt(value.strings.size()) + for (string in value.strings) { + out.writeUTF(string) + } + } + + override fun read(`in`: DataInput): ProtoMapValue { + val isPackageFacade = `in`.readBoolean() + val bytesLength = `in`.readInt() + val bytes = ByteArray(bytesLength) + `in`.readFully(bytes, 0, bytesLength) + val stringsLength = `in`.readInt() + val strings = Array(stringsLength) { `in`.readUTF() } + return ProtoMapValue(isPackageFacade, bytes, strings) + } +} + + +abstract class StringMapExternalizer : DataExternalizer> { + override fun save(out: DataOutput, map: Map?) { + out.writeInt(map!!.size()) + + for ((key, value) in map.entrySet()) { + IOUtil.writeString(key, out) + writeValue(out, value) + } + } + + override fun read(`in`: DataInput): Map? { + val size = `in`.readInt() + val map = HashMap(size) + + repeat(size) { + val name = IOUtil.readString(`in`)!! + map[name] = readValue(`in`) + } + + return map + } + + protected abstract fun writeValue(output: DataOutput, value: T) + protected abstract fun readValue(input: DataInput): T +} + + +object STRING_TO_LONG_MAP_EXTERNALIZER : StringMapExternalizer() { + override fun readValue(input: DataInput): Long = + input.readLong() + + override fun writeValue(output: DataOutput, value: Long) { + output.writeLong(value) + } +} + + +object STRING_LIST_EXTERNALIZER : DataExternalizer> { + override fun save(out: DataOutput, value: List) { + value.forEach { IOUtil.writeUTF(out, it) } + } + + override fun read(`in`: DataInput): List { + val result = ArrayList() + while ((`in` as DataInputStream).available() > 0) { + result.add(IOUtil.readUTF(`in`)) + } + return result + } +} + + +object PATH_COLLECTION_EXTERNALIZER : DataExternalizer> { + override fun save(out: DataOutput, value: Collection) { + for (str in value) { + IOUtil.writeUTF(out, str) + } + } + + override fun read(`in`: DataInput): Collection { + val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) + val stream = `in` as DataInputStream + while (stream.available() > 0) { + val str = IOUtil.readUTF(stream) + result.add(str) + } + return result + } +} + +object CONSTANTS_MAP_EXTERNALIZER : DataExternalizer> { + override fun save(out: DataOutput, map: Map?) { + out.writeInt(map!!.size()) + for (name in map.keySet().sorted()) { + IOUtil.writeString(name, out) + val value = map[name]!! + when (value) { + is Int -> { + out.writeByte(Kind.INT.ordinal()) + out.writeInt(value) + } + is Float -> { + out.writeByte(Kind.FLOAT.ordinal()) + out.writeFloat(value) + } + is Long -> { + out.writeByte(Kind.LONG.ordinal()) + out.writeLong(value) + } + is Double -> { + out.writeByte(Kind.DOUBLE.ordinal()) + out.writeDouble(value) + } + is String -> { + out.writeByte(Kind.STRING.ordinal()) + IOUtil.writeString(value, out) + } + else -> throw IllegalStateException("Unexpected constant class: ${value.javaClass}") + } + } + } + + override fun read(`in`: DataInput): Map? { + val size = `in`.readInt() + val map = HashMap(size) + + repeat(size) { + val name = IOUtil.readString(`in`)!! + + val kind = Kind.values()[`in`.readByte().toInt()] + val value = when (kind) { + Kind.INT -> `in`.readInt() + Kind.FLOAT -> `in`.readFloat() + Kind.LONG -> `in`.readLong() + Kind.DOUBLE -> `in`.readDouble() + Kind.STRING -> IOUtil.readString(`in`)!! + } + map[name] = value + } + + return map + } + + private enum class Kind { + INT, FLOAT, LONG, DOUBLE, STRING + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IntPair.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt similarity index 54% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IntPair.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt index d285bdd3520..d2eea15c472 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IntPair.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt @@ -16,9 +16,7 @@ package org.jetbrains.kotlin.jps.incremental.storage -import com.intellij.util.io.KeyDescriptor -import java.io.DataInput -import java.io.DataOutput +import com.intellij.openapi.util.io.FileUtil data class IntPair(val first: Int, val second: Int) : Comparable { override fun compareTo(other: IntPair): Int { @@ -32,21 +30,27 @@ data class IntPair(val first: Int, val second: Int) : Comparable { fun HashPair(a: Any, b: Any): IntPair = IntPair(a.hashCode(), b.hashCode()) -internal object INT_PAIR_KEY_DESCRIPTOR : KeyDescriptor { - override fun read(`in`: DataInput): IntPair { - val first = `in`.readInt() - val second = `in`.readInt() - return IntPair(first, second) +class PathFunctionPair( + public val path: String, + public val function: String +): Comparable { + override fun compareTo(other: PathFunctionPair): Int { + val pathComp = FileUtil.comparePaths(path, other.path) + + if (pathComp != 0) return pathComp + + return function.compareTo(other.function) } - override fun save(out: DataOutput, value: IntPair?) { - if (value == null) return + override fun equals(other: Any?): Boolean = + when (other) { + is PathFunctionPair -> + FileUtil.pathsEqual(path, other.path) && function == other.function + else -> + false + } - out.writeInt(value.first) - out.writeInt(value.second) - } + override fun hashCode(): Int = 31 * FileUtil.pathHashCode(path) + function.hashCode() +} - override fun getHashCode(value: IntPair?): Int = value?.hashCode() ?: 0 - - override fun isEqual(val1: IntPair?, val2: IntPair?): Boolean = val1 == val2 -} \ No newline at end of file +data class ProtoMapValue(val isPackageFacade: Boolean, val bytes: ByteArray, val strings: Array) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 5160563c68c..5b95c7899f6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -18,7 +18,11 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase -import org.jetbrains.kotlin.load.kotlin.header.* +import org.jetbrains.kotlin.jps.incremental.storage.ProtoMapValue +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassPartKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil From 90e7de940b836cd8fdf6119a300d87b812603833 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 29 Oct 2015 18:25:55 +0300 Subject: [PATCH 0624/1557] Move BasicMapsOwner Original commit: 2160948980ca39be3df3874dc2c615805adb15d3 --- .../org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt | 1 + .../kotlin/jps/incremental/{ => storage}/BasicMapsOwner.kt | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/{ => storage}/BasicMapsOwner.kt (92%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt index a7bc0eb6285..b250b6df913 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind +import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.jps.incremental.storage.LookupMap import java.io.File diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt similarity index 92% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt index 4aa11a21ac0..36cda8b5fc5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/BasicMapsOwner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt @@ -14,11 +14,10 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.incremental +package org.jetbrains.kotlin.jps.incremental.storage import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.incremental.storage.StorageOwner -import org.jetbrains.kotlin.jps.incremental.storage.BasicMap open class BasicMapsOwner : StorageOwner { private val maps = arrayListOf>() From 700170c2dff6bc4acce36a5429a3d2e402ed0e0e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 29 Oct 2015 19:56:31 +0300 Subject: [PATCH 0625/1557] Hash file names Original commit: 87d836cd6715b328c6a0ed86fb39ed4fdf8e0c89 --- .../jps/incremental/LookupTrackerImpl.kt | 4 +- .../jps/incremental/storage/FilesMap.kt | 38 +++++++++++++++++++ .../jps/incremental/storage/LookupMap.kt | 12 ++++-- .../jps/incremental/storage/externalizers.kt | 21 ++++++++++ 4 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt index b250b6df913..c8ad2681dc2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -20,6 +20,7 @@ import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner +import org.jetbrains.kotlin.jps.incremental.storage.FilesMap import org.jetbrains.kotlin.jps.incremental.storage.LookupMap import java.io.File @@ -31,7 +32,8 @@ class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), Loo private val String.storageFile: File get() = File(targetDataDir, this + IncrementalCacheImpl.CACHE_EXTENSION) - private val lookupMap = registerMap(LookupMap("lookups".storageFile)) + private val filesMap = registerMap(FilesMap("files".storageFile)) + private val lookupMap = registerMap(LookupMap("lookups".storageFile, filesMap)) override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { lookupMap.add(name, scopeFqName, lookupContainingFile) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt new file mode 100644 index 00000000000..05c98405d2c --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt @@ -0,0 +1,38 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import com.intellij.openapi.util.io.FileUtil +import com.intellij.util.io.ExternalIntegerKeyDescriptor +import java.io.File + +class FilesMap(file: File) : BasicMap>(file, ExternalIntegerKeyDescriptor(), PATH_COLLECTION_EXTERNALIZER) { + override fun dumpKey(key: Int): String = key.toString() + + override fun dumpValue(value: Collection): String = value.toString() + + public fun get(hash: Int): Collection? = storage[hash] + + public fun add(path: String): Int { + val hash = FileUtil.PATH_HASHING_STRATEGY.computeHashCode(path) + storage.append(hash) { it.writeUTF(path) } + return hash + } +} + + + diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index adc104dba2d..374451c2609 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -18,16 +18,20 @@ package org.jetbrains.kotlin.jps.incremental.storage import java.io.File -class LookupMap(file: File) : BasicMap>(file, INT_PAIR_KEY_DESCRIPTOR, PATH_COLLECTION_EXTERNALIZER) { +class LookupMap( + storage: File, + private val filesMap: FilesMap +) : BasicMap>(storage, INT_PAIR_KEY_DESCRIPTOR, INT_SET_EXTERNALIZER) { override fun dumpKey(key: IntPair): String = key.toString() - override fun dumpValue(value: Collection): String = value.toString() + override fun dumpValue(value: Set): String = value.toString() public fun add(name: String, scope: String, path: String) { - storage.append(HashPair(name, scope)) { out -> out.writeUTF(path) } + val pathHash = filesMap.add(path) + storage.append(HashPair(name, scope)) { out -> out.writeInt(pathHash) } } - public fun get(name: String, scope: String): Collection? = storage[HashPair(name, scope)] + public fun get(name: String, scope: String): Set? = storage[HashPair(name, scope)] } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt index f8cfd2ed137..68618da5a45 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt @@ -21,6 +21,8 @@ import com.intellij.util.io.DataExternalizer import com.intellij.util.io.IOUtil import com.intellij.util.io.KeyDescriptor import gnu.trove.THashSet +import gnu.trove.TIntHashSet +import gnu.trove.decorator.TIntHashSetDecorator import java.io.DataInput import java.io.DataInputStream import java.io.DataOutput @@ -215,4 +217,23 @@ object CONSTANTS_MAP_EXTERNALIZER : DataExternalizer> { private enum class Kind { INT, FLOAT, LONG, DOUBLE, STRING } +} + + +object INT_SET_EXTERNALIZER : DataExternalizer> { + override fun save(out: DataOutput, value: Set) { + value.forEach { out.writeInt(it) } + } + + override fun read(`in`: DataInput): Set { + val result = TIntHashSet() + val stream = `in` as DataInputStream + + while (stream.available() > 0) { + val str = stream.readInt() + result.add(str) + } + + return TIntHashSetDecorator(result) + } } \ No newline at end of file From a72be353e20ab6b6a91b16df746e1d05f1332f5d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 29 Oct 2015 21:35:11 +0300 Subject: [PATCH 0626/1557] Remove entries when files are removed Original commit: 7572fb47d31cad711b737062e5811d528640cad7 --- .../kotlin/jps/build/KotlinBuilder.kt | 13 ++++++------- .../jps/incremental/IncrementalCacheImpl.kt | 18 ++++++++++++++++-- .../jps/incremental/LookupTrackerImpl.kt | 4 ++++ .../kotlin/jps/incremental/storage/BasicMap.kt | 2 +- .../kotlin/jps/incremental/storage/FilesMap.kt | 10 ++++++++++ 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index c3e78b615cb..9c9a09d13ad 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -22,22 +22,19 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.util.containers.MultiMap import gnu.trove.THashSet import org.jetbrains.jps.ModuleChunk -import org.jetbrains.jps.builders.* +import org.jetbrains.jps.builders.BuildTarget +import org.jetbrains.jps.builders.DirtyFilesHolder import org.jetbrains.jps.builders.impl.BuildTargetRegistryImpl import org.jetbrains.jps.builders.impl.TargetOutputIndexImpl import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor import org.jetbrains.jps.builders.java.dependencyView.Mappings -import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage -import org.jetbrains.jps.indices.IgnoredFileIndex -import org.jetbrains.jps.indices.ModuleExcludeIndex -import org.jetbrains.jps.model.JpsModel import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.JpsSimpleElement import org.jetbrains.jps.model.ex.JpsElementChildRoleBase @@ -156,7 +153,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val project = projectDescriptor.project val lookupTracker = dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) - val incrementalCaches = getIncrementalCaches(chunk, context) + val incrementalCaches = getIncrementalCaches(chunk, context, lookupTracker) val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) if (!environment.success()) { environment.reportErrorsTo(messageCollector) @@ -626,7 +623,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private val Iterable>.moduleTargets: Iterable get() = filterIsInstance(javaClass()) -private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map { +private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext, lookupTrackerImpl: LookupTrackerImpl?): Map { val dataManager = context.projectDescriptor.dataManager val targets = chunk.targets @@ -656,6 +653,8 @@ private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): M dependents[target]?.forEach { cache.addDependentCache(caches[it]!!) } + + cache.setLookupTracker(lookupTrackerImpl) } return caches diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index b75df33c9e7..4967914b28f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -89,6 +89,11 @@ public class IncrementalCacheImpl( private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val dependents = arrayListOf() private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } + private var lookupTrackerImpl: LookupTrackerImpl? = null + + public fun setLookupTracker(lookupTrackerImpl: LookupTrackerImpl?) { + this.lookupTrackerImpl = lookupTrackerImpl + } override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { inlinedTo.add(fromPath, jvmSignature, toPath) @@ -480,17 +485,26 @@ public class IncrementalCacheImpl( private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, STRING_LIST_EXTERNALIZER) { public fun clearOutputsForSource(sourceFile: File) { - storage.remove(sourceFile.absolutePath) + remove(sourceFile.absolutePath) } public fun add(sourceFile: File, className: JvmClassName) { - storage.append(sourceFile.absolutePath, { out -> IOUtil.writeUTF(out, className.getInternalName()) }) + storage.append(sourceFile.absolutePath, { out -> IOUtil.writeUTF(out, className.internalName) }) } public fun get(sourceFile: File): Collection = storage[sourceFile.absolutePath].orEmpty().map { JvmClassName.byInternalName(it) } override fun dumpValue(value: List) = value.toString() + + override fun clean() { + storage.keys.forEach { remove(it) } + } + + private fun remove(path: String) { + storage.remove(path) + lookupTrackerImpl?.removeLookupsFrom(path) + } } private inner class DirtyOutputClassesMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt index c8ad2681dc2..5a80420b2a5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -50,5 +50,9 @@ class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), Loo override fun flush(memoryCachesOnly: Boolean) { lookupMap.flush(memoryCachesOnly) } + + fun removeLookupsFrom(path: String) { + filesMap.remove(path) + } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index da3c8aac047..839e645b726 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -30,7 +30,7 @@ internal abstract class BasicMap, V>( ) { protected val storage = LazyStorage(storageFile, keyDescriptor, valueExternalizer) - fun clean() { + open fun clean() { storage.clean() } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt index 05c98405d2c..61329338eba 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt @@ -32,6 +32,16 @@ class FilesMap(file: File) : BasicMap>(file, ExternalInt storage.append(hash) { it.writeUTF(path) } return hash } + + public fun remove(path: String) { + val hash = FileUtil.PATH_HASHING_STRATEGY.computeHashCode(path) + val collection = storage[hash] as? MutableCollection ?: return + collection.remove(path) + + if (collection.isNotEmpty()) { + storage.remove(hash) + } + } } From 4e99ad81a5ea3f0d84e3bbcdb4f963da3371876a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 30 Oct 2015 00:11:07 +0300 Subject: [PATCH 0627/1557] Hash files without collisions Original commit: 7ebc58c69096e1edf3244c476fbeac755bda312a --- .../jps/incremental/IncrementalCacheImpl.kt | 2 +- .../jps/incremental/LookupTrackerImpl.kt | 76 ++++++++++++++++--- .../jps/incremental/storage/FileToIdMap.kt | 38 ++++++++++ .../jps/incremental/storage/FilesMap.kt | 48 ------------ .../jps/incremental/storage/IdToFileMap.kt | 38 ++++++++++ .../jps/incremental/storage/LookupMap.kt | 24 +++--- .../jps/incremental/storage/externalizers.kt | 31 ++++++++ 7 files changed, 186 insertions(+), 71 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 4967914b28f..45fa8477dc7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -503,7 +503,7 @@ public class IncrementalCacheImpl( private fun remove(path: String) { storage.remove(path) - lookupTrackerImpl?.removeLookupsFrom(path) + lookupTrackerImpl?.removeLookupsFrom(File(path)) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt index 5a80420b2a5..9b973baef95 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -20,7 +20,8 @@ import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner -import org.jetbrains.kotlin.jps.incremental.storage.FilesMap +import org.jetbrains.kotlin.jps.incremental.storage.FileToIdMap +import org.jetbrains.kotlin.jps.incremental.storage.IdToFileMap import org.jetbrains.kotlin.jps.incremental.storage.LookupMap import java.io.File @@ -29,30 +30,83 @@ object LOOKUP_TRACKER_STORAGE_PROVIDER : StorageProvider() { } class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), LookupTracker { + + companion object { + private val DELETED_TO_SIZE_TRESHOLD = 0.5 + private val MINIMUM_GARBAGE_COLLECTIBLE_SIZE = 10000 + } + private val String.storageFile: File get() = File(targetDataDir, this + IncrementalCacheImpl.CACHE_EXTENSION) - private val filesMap = registerMap(FilesMap("files".storageFile)) - private val lookupMap = registerMap(LookupMap("lookups".storageFile, filesMap)) + private val countersFile = "counters".storageFile + private val idToFile = registerMap(IdToFileMap("id-to-file".storageFile)) + private val fileToId = registerMap(FileToIdMap("file-to-id".storageFile)) + private val lookupMap = registerMap(LookupMap("lookups".storageFile)) + private var size: Int = 0 + private var deletedCount: Int = 0 + + init { + if (countersFile.exists()) { + val lines = countersFile.readLines() + size = lines[0].toInt() + deletedCount = lines[1].toInt() + } + } override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { - lookupMap.add(name, scopeFqName, lookupContainingFile) + val file = File(lookupContainingFile) + val fileId = fileToId[file] ?: addFile(file) + lookupMap.add(name, scopeFqName, fileId) + } + + fun removeLookupsFrom(file: File) { + val id = fileToId[file] ?: return + idToFile.remove(id) + fileToId.remove(file) + deletedCount++ } override fun clean() { - lookupMap.clean() - } + if (countersFile.exists()) { + countersFile.delete() + } - override fun close() { - lookupMap.close() + size = 0 + deletedCount = 0 + + super.clean() } override fun flush(memoryCachesOnly: Boolean) { - lookupMap.flush(memoryCachesOnly) + try { + removeGarbageIfNeeded() + countersFile.writeText("$size\n$deletedCount") + } + finally { + super.flush(memoryCachesOnly) + } } - fun removeLookupsFrom(path: String) { - filesMap.remove(path) + private fun addFile(file: File): Int { + val id = size++ + fileToId[file] = id + idToFile[id] = file + return id + } + + private fun removeGarbageIfNeeded() { + if (size <= MINIMUM_GARBAGE_COLLECTIBLE_SIZE && deletedCount.toDouble() / size <= DELETED_TO_SIZE_TRESHOLD) return + + for (hash in lookupMap.lookupHashes) { + lookupMap[hash] = lookupMap[hash]!!.filter { it in idToFile }.toSet() + } + + size = 0 + deletedCount = 0 + idToFile.clean() + + fileToId.files.forEach { addFile(it) } } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt new file mode 100644 index 00000000000..6517167089e --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt @@ -0,0 +1,38 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import java.io.File + +class FileToIdMap(file: File) : BasicMap(file, FILE_KEY_DESCRIPTOR, INT_EXTERNALIZER) { + override fun dumpKey(key: File): String = key.toString() + + override fun dumpValue(value: Int): String = value.toString() + + public operator fun get(file: File): Int? = storage[file] + + public operator fun set(file: File, id: Int) { + storage[file] = id + } + + public fun remove(file: File) { + storage.remove(file) + } + + public val files: Collection + get() = storage.keys +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt deleted file mode 100644 index 61329338eba..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FilesMap.kt +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import com.intellij.openapi.util.io.FileUtil -import com.intellij.util.io.ExternalIntegerKeyDescriptor -import java.io.File - -class FilesMap(file: File) : BasicMap>(file, ExternalIntegerKeyDescriptor(), PATH_COLLECTION_EXTERNALIZER) { - override fun dumpKey(key: Int): String = key.toString() - - override fun dumpValue(value: Collection): String = value.toString() - - public fun get(hash: Int): Collection? = storage[hash] - - public fun add(path: String): Int { - val hash = FileUtil.PATH_HASHING_STRATEGY.computeHashCode(path) - storage.append(hash) { it.writeUTF(path) } - return hash - } - - public fun remove(path: String) { - val hash = FileUtil.PATH_HASHING_STRATEGY.computeHashCode(path) - val collection = storage[hash] as? MutableCollection ?: return - collection.remove(path) - - if (collection.isNotEmpty()) { - storage.remove(hash) - } - } -} - - - diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt new file mode 100644 index 00000000000..48e93441363 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt @@ -0,0 +1,38 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import com.intellij.util.io.ExternalIntegerKeyDescriptor +import java.io.File + +class IdToFileMap(file: File) : BasicMap(file, ExternalIntegerKeyDescriptor(), FILE_EXTERNALIZER) { + override fun dumpKey(key: Int): String = key.toString() + + override fun dumpValue(value: File): String = value.toString() + + public operator fun get(id: Int): File? = storage[id] + + public operator fun contains(id: Int): Boolean = id in storage + + public operator fun set(id: Int, file: File) { + storage[id] = file + } + + public fun remove(id: Int) { + storage.remove(id) + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index 374451c2609..8c8e1006150 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -18,21 +18,23 @@ package org.jetbrains.kotlin.jps.incremental.storage import java.io.File -class LookupMap( - storage: File, - private val filesMap: FilesMap -) : BasicMap>(storage, INT_PAIR_KEY_DESCRIPTOR, INT_SET_EXTERNALIZER) { +class LookupMap(storage: File) : BasicMap>(storage, INT_PAIR_KEY_DESCRIPTOR, INT_SET_EXTERNALIZER) { override fun dumpKey(key: IntPair): String = key.toString() override fun dumpValue(value: Set): String = value.toString() - public fun add(name: String, scope: String, path: String) { - val pathHash = filesMap.add(path) - storage.append(HashPair(name, scope)) { out -> out.writeInt(pathHash) } + public fun add(name: String, scope: String, fileId: Int) { + storage.append(HashPair(name, scope)) { out -> out.writeInt(fileId) } } - public fun get(name: String, scope: String): Set? = storage[HashPair(name, scope)] + public operator fun get(name: String, scope: String): Set? = storage[HashPair(name, scope)] + + public operator fun get(lookupHash: IntPair): Set? = storage[lookupHash] + + public operator fun set(key: IntPair, fileIds: Set) { + storage.set(key, fileIds) + } + + public val lookupHashes: Collection + get() = storage.keys } - - - diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt index 68618da5a45..00ed99663b4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt @@ -26,6 +26,7 @@ import gnu.trove.decorator.TIntHashSetDecorator import java.io.DataInput import java.io.DataInputStream import java.io.DataOutput +import java.io.File import java.util.* object INT_PAIR_KEY_DESCRIPTOR : KeyDescriptor { @@ -236,4 +237,34 @@ object INT_SET_EXTERNALIZER : DataExternalizer> { return TIntHashSetDecorator(result) } +} + +object INT_EXTERNALIZER : DataExternalizer { + override fun read(`in`: DataInput): Int = `in`.readInt() + + override fun save(out: DataOutput, value: Int) { + out.writeInt(value) + } +} + +object FILE_EXTERNALIZER : DataExternalizer { + override fun read(`in`: DataInput): File = File(`in`.readUTF()) + + override fun save(out: DataOutput, value: File) { + out.writeUTF(value.canonicalPath) + } +} + +object FILE_KEY_DESCRIPTOR : KeyDescriptor { + override fun read(`in`: DataInput): File = File(`in`.readUTF()) + + override fun save(out: DataOutput, value: File) { + out.writeUTF(value.canonicalPath) + } + + override fun getHashCode(value: File?): Int = + FileUtil.FILE_HASHING_STRATEGY.computeHashCode(value) + + override fun isEqual(val1: File?, val2: File?): Boolean = + FileUtil.FILE_HASHING_STRATEGY.equals(val1, val2) } \ No newline at end of file From 7fc692710f84fef468e7a737f76d0e600a9cf7f8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 30 Oct 2015 17:46:32 +0300 Subject: [PATCH 0628/1557] Use new lookup tracker only when experimental incremental compilation is enabled Original commit: 67878fe13ac8dcf1692d49459090f5eede3221a9 --- .../kotlin/jps/build/KotlinBuilder.kt | 41 ++++++++++++++++--- .../jps/incremental/IncrementalCacheImpl.kt | 8 ++-- .../jps/incremental/LookupTrackerImpl.kt | 14 ++++++- 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 9c9a09d13ad..1b30c609e12 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -35,6 +35,7 @@ import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage +import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.JpsSimpleElement import org.jetbrains.jps.model.ex.JpsElementChildRoleBase @@ -53,6 +54,7 @@ import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.load.kotlin.ModuleMapping @@ -151,9 +153,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION) val project = projectDescriptor.project - - val lookupTracker = dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) - val incrementalCaches = getIncrementalCaches(chunk, context, lookupTracker) + val (lookupTracker, lookupStorage) = getLookupTrackerAndStorage(dataManager, project) + val incrementalCaches = getIncrementalCaches(chunk, context, lookupStorage) val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) if (!environment.success()) { environment.reportErrorsTo(messageCollector) @@ -623,7 +624,37 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private val Iterable>.moduleTargets: Iterable get() = filterIsInstance(javaClass()) -private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext, lookupTrackerImpl: LookupTrackerImpl?): Map { +private fun getLookupTrackerAndStorage(dataManager: BuildDataManager, project: JpsProject): Pair { + var lookupTracker = LookupTracker.DO_NOTHING + var lookupStorage = LookupStorage.DO_NOTHING + + if (IncrementalCompilation.isExperimental()) { + val lookupTrackerImpl = dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) + lookupTracker = lookupTrackerImpl + lookupStorage = lookupTrackerImpl + } + + val inTest = "true".equals(System.getProperty("kotlin.jps.tests"), ignoreCase = true) + if (inTest) { + val testTracker = project.container.getChild(KotlinBuilder.LOOKUP_TRACKER)?.data + + if (testTracker != null) { + lookupTracker = CopyingLookupTracker(lookupTracker, testTracker) + } + } + + return lookupTracker to lookupStorage +} + +private class CopyingLookupTracker(private val lookupTrackers: Collection) : LookupTracker { + constructor(vararg lookupTrackers: LookupTracker) : this(lookupTrackers.toList()) + + override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { + lookupTrackers.forEach { it.record(lookupContainingFile, lookupLine, lookupColumn, scopeFqName, scopeKind, name) } + } +} + +private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext, lookupStorage: LookupStorage): Map { val dataManager = context.projectDescriptor.dataManager val targets = chunk.targets @@ -654,7 +685,7 @@ private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext, lo cache.addDependentCache(caches[it]!!) } - cache.setLookupTracker(lookupTrackerImpl) + cache.setLookupStorage(lookupStorage) } return caches diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 45fa8477dc7..09fbd149110 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -89,10 +89,10 @@ public class IncrementalCacheImpl( private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val dependents = arrayListOf() private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } - private var lookupTrackerImpl: LookupTrackerImpl? = null + private var _lookupStorage: LookupStorage = LookupStorage.DO_NOTHING - public fun setLookupTracker(lookupTrackerImpl: LookupTrackerImpl?) { - this.lookupTrackerImpl = lookupTrackerImpl + public fun setLookupStorage(lookupStorage: LookupStorage) { + this._lookupStorage = lookupStorage } override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { @@ -503,7 +503,7 @@ public class IncrementalCacheImpl( private fun remove(path: String) { storage.remove(path) - lookupTrackerImpl?.removeLookupsFrom(File(path)) + _lookupStorage.removeLookupsFrom(File(path)) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt index 9b973baef95..4b4b36a7db4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -29,7 +29,17 @@ object LOOKUP_TRACKER_STORAGE_PROVIDER : StorageProvider() { override fun createStorage(targetDataDir: File): LookupTrackerImpl = LookupTrackerImpl(targetDataDir) } -class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), LookupTracker { +interface LookupStorage { + fun removeLookupsFrom(file: File) + + companion object { + val DO_NOTHING: LookupStorage = object : LookupStorage { + override fun removeLookupsFrom(file: File) {} + } + } +} + +class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), LookupTracker, LookupStorage { companion object { private val DELETED_TO_SIZE_TRESHOLD = 0.5 @@ -60,7 +70,7 @@ class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), Loo lookupMap.add(name, scopeFqName, fileId) } - fun removeLookupsFrom(file: File) { + override fun removeLookupsFrom(file: File) { val id = fileToId[file] ?: return idToFile.remove(id) fileToId.remove(file) From 1f574462f546602c06adedf6a52616eeb152e670 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 30 Oct 2015 23:01:38 +0300 Subject: [PATCH 0629/1557] Fix minor naming/formatting issues after review Original commit: 322815c7de3c38233071972ecf73ab0cf4131054 --- .../jps/incremental/IncrementalCacheImpl.kt | 18 +- .../jps/incremental/LookupTrackerImpl.kt | 4 +- .../jps/incremental/protoDifferenceUtils.kt | 1 - .../jps/incremental/storage/BasicMapsOwner.kt | 4 + .../jps/incremental/storage/FileToIdMap.kt | 2 +- .../jps/incremental/storage/IdToFileMap.kt | 2 +- .../jps/incremental/storage/LookupMap.kt | 14 +- .../jps/incremental/storage/externalizers.kt | 204 +++++++++--------- .../kotlin/jps/incremental/storage/values.kt | 14 +- .../AbstractIncrementalLazyCachesTest.kt | 4 +- 10 files changed, 130 insertions(+), 137 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 09fbd149110..4026da779cd 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -54,8 +54,6 @@ public class IncrementalCacheImpl( private val target: ModuleBuildTarget ) : BasicMapsOwner(), IncrementalCache { companion object { - val CACHE_EXTENSION = ".tab" - val PROTO_MAP = "proto" val CONSTANTS_MAP = "constants" val INLINE_FUNCTIONS = "inline-functions" @@ -73,7 +71,7 @@ public class IncrementalCacheImpl( private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) private val String.storageFile: File - get() = File(baseDir, this + CACHE_EXTENSION) + get() = File(baseDir, this + "." + CACHE_EXTENSION) private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) @@ -273,7 +271,7 @@ public class IncrementalCacheImpl( cacheFormatVersion.clean() } - private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, PROTO_MAP_VALUE_EXTERNALIZER) { + private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): ChangesInfo { val header = kotlinClass.classHeader @@ -319,7 +317,7 @@ public class IncrementalCacheImpl( } } - private inner class ConstantsMap(storageFile: File) : BasicStringMap>(storageFile, CONSTANTS_MAP_EXTERNALIZER) { + private inner class ConstantsMap(storageFile: File) : BasicStringMap>(storageFile, ConstantsMapExternalizer) { private fun getConstantsMap(bytes: ByteArray): Map? { val result = HashMap() @@ -367,7 +365,7 @@ public class IncrementalCacheImpl( value.dumpMap(Any::toString) } - private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, STRING_TO_LONG_MAP_EXTERNALIZER) { + private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringToLongMapExternalizer) { private fun getInlineFunctionsMap(bytes: ByteArray): Map { val result = HashMap() @@ -453,7 +451,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, STRING_LIST_EXTERNALIZER) { + private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { public fun add(facadeName: JvmClassName, partNames: List) { storage[facadeName.internalName] = partNames } @@ -483,7 +481,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: String): String = value } - private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, STRING_LIST_EXTERNALIZER) { + private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringListExternalizer) { public fun clearOutputsForSource(sourceFile: File) { remove(sourceFile.absolutePath) } @@ -525,7 +523,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, STRING_LIST_EXTERNALIZER) { + private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { public fun getEntries(): Map> = storage.keys.toMap(JvmClassName::byInternalName) { storage[it]!! } @@ -546,7 +544,7 @@ public class IncrementalCacheImpl( * * inlineFunction - jvmSignature of some inline function in source file * * target files - collection of files inlineFunction has been inlined to */ - private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PATH_FUNCTION_PAIR_KEY_DESCRIPTOR, PATH_COLLECTION_EXTERNALIZER) { + private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { public fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val key = PathFunctionPair(sourcePath, jvmSignature) storage.append(key) { out -> diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt index 4b4b36a7db4..682718d5e26 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt @@ -47,7 +47,7 @@ class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), Loo } private val String.storageFile: File - get() = File(targetDataDir, this + IncrementalCacheImpl.CACHE_EXTENSION) + get() = File(targetDataDir, this + "." + CACHE_EXTENSION) private val countersFile = "counters".storageFile private val idToFile = registerMap(IdToFileMap("id-to-file".storageFile)) @@ -108,7 +108,7 @@ class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), Loo private fun removeGarbageIfNeeded() { if (size <= MINIMUM_GARBAGE_COLLECTIBLE_SIZE && deletedCount.toDouble() / size <= DELETED_TO_SIZE_TRESHOLD) return - for (hash in lookupMap.lookupHashes) { + for (hash in lookupMap.keys) { lookupMap[hash] = lookupMap[hash]!!.filter { it in idToFile }.toSet() } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 771f7b78739..09191759457 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -35,7 +35,6 @@ public sealed class DifferenceKind() { public class MEMBERS(val names: Collection): DifferenceKind() } - public fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): DifferenceKind { if (oldData.isPackageFacade != newData.isPackageFacade) return DifferenceKind.CLASS_SIGNATURE diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt index 36cda8b5fc5..c0d6f0903cb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt @@ -22,6 +22,10 @@ import org.jetbrains.jps.incremental.storage.StorageOwner open class BasicMapsOwner : StorageOwner { private val maps = arrayListOf>() + companion object { + val CACHE_EXTENSION = "tab" + } + protected fun > registerMap(map: M): M { maps.add(map) return map diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt index 6517167089e..e87406b0188 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.incremental.storage import java.io.File -class FileToIdMap(file: File) : BasicMap(file, FILE_KEY_DESCRIPTOR, INT_EXTERNALIZER) { +class FileToIdMap(file: File) : BasicMap(file, FileKeyDescriptor, IntExternalizer) { override fun dumpKey(key: File): String = key.toString() override fun dumpValue(value: Int): String = value.toString() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt index 48e93441363..7c41b295964 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.incremental.storage import com.intellij.util.io.ExternalIntegerKeyDescriptor import java.io.File -class IdToFileMap(file: File) : BasicMap(file, ExternalIntegerKeyDescriptor(), FILE_EXTERNALIZER) { +class IdToFileMap(file: File) : BasicMap(file, ExternalIntegerKeyDescriptor(), FileKeyDescriptor) { override fun dumpKey(key: Int): String = key.toString() override fun dumpValue(value: File): String = value.toString() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index 8c8e1006150..eccc90d1c1f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -18,23 +18,21 @@ package org.jetbrains.kotlin.jps.incremental.storage import java.io.File -class LookupMap(storage: File) : BasicMap>(storage, INT_PAIR_KEY_DESCRIPTOR, INT_SET_EXTERNALIZER) { - override fun dumpKey(key: IntPair): String = key.toString() +class LookupMap(storage: File) : BasicMap>(storage, LookupHashPairKeyDescriptor, IntSetExternalizer) { + override fun dumpKey(key: LookupHashPair): String = key.toString() override fun dumpValue(value: Set): String = value.toString() public fun add(name: String, scope: String, fileId: Int) { - storage.append(HashPair(name, scope)) { out -> out.writeInt(fileId) } + storage.append(LookupHashPair(name, scope)) { out -> out.writeInt(fileId) } } - public operator fun get(name: String, scope: String): Set? = storage[HashPair(name, scope)] + public operator fun get(lookupHash: LookupHashPair): Set? = storage[lookupHash] - public operator fun get(lookupHash: IntPair): Set? = storage[lookupHash] - - public operator fun set(key: IntPair, fileIds: Set) { + public operator fun set(key: LookupHashPair, fileIds: Set) { storage.set(key, fileIds) } - public val lookupHashes: Collection + public val keys: Collection get() = storage.keys } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt index 00ed99663b4..9888fd957fc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt @@ -29,86 +29,84 @@ import java.io.DataOutput import java.io.File import java.util.* -object INT_PAIR_KEY_DESCRIPTOR : KeyDescriptor { - override fun read(`in`: DataInput): IntPair { - val first = `in`.readInt() - val second = `in`.readInt() - return IntPair(first, second) +object LookupHashPairKeyDescriptor : KeyDescriptor { + override fun read(input: DataInput): LookupHashPair { + val first = input.readInt() + val second = input.readInt() + + return LookupHashPair(first, second) } - override fun save(out: DataOutput, value: IntPair?) { - if (value == null) return - - out.writeInt(value.first) - out.writeInt(value.second) + override fun save(output: DataOutput, value: LookupHashPair) { + output.writeInt(value.nameHash) + output.writeInt(value.scopeHash) } - override fun getHashCode(value: IntPair?): Int = value?.hashCode() ?: 0 + override fun getHashCode(value: LookupHashPair): Int = value.hashCode() - override fun isEqual(val1: IntPair?, val2: IntPair?): Boolean = val1 == val2 + override fun isEqual(val1: LookupHashPair, val2: LookupHashPair): Boolean = val1 == val2 } -object PATH_FUNCTION_PAIR_KEY_DESCRIPTOR : KeyDescriptor { - override fun getHashCode(value: PathFunctionPair): Int = - value.hashCode() - - override fun isEqual(val1: PathFunctionPair, val2: PathFunctionPair): Boolean = - val1 == val2 - - override fun read(`in`: DataInput): PathFunctionPair { - val path = IOUtil.readUTF(`in`) - val function = IOUtil.readUTF(`in`) +object PathFunctionPairKeyDescriptor : KeyDescriptor { + override fun read(input: DataInput): PathFunctionPair { + val path = IOUtil.readUTF(input) + val function = IOUtil.readUTF(input) return PathFunctionPair(path, function) } - override fun save(out: DataOutput, value: PathFunctionPair) { - IOUtil.writeUTF(out, value.path) - IOUtil.writeUTF(out, value.function) + override fun save(output: DataOutput, value: PathFunctionPair) { + IOUtil.writeUTF(output, value.path) + IOUtil.writeUTF(output, value.function) } + + override fun getHashCode(value: PathFunctionPair): Int = value.hashCode() + + override fun isEqual(val1: PathFunctionPair, val2: PathFunctionPair): Boolean = val1 == val2 } -object PROTO_MAP_VALUE_EXTERNALIZER : DataExternalizer { - override fun save(out: DataOutput, value: ProtoMapValue) { - out.writeBoolean(value.isPackageFacade) - out.writeInt(value.bytes.size()) - out.write(value.bytes) - out.writeInt(value.strings.size()) +object ProtoMapValueExternalizer : DataExternalizer { + override fun save(output: DataOutput, value: ProtoMapValue) { + output.writeBoolean(value.isPackageFacade) + output.writeInt(value.bytes.size()) + output.write(value.bytes) + output.writeInt(value.strings.size()) + for (string in value.strings) { - out.writeUTF(string) + output.writeUTF(string) } } - override fun read(`in`: DataInput): ProtoMapValue { - val isPackageFacade = `in`.readBoolean() - val bytesLength = `in`.readInt() + override fun read(input: DataInput): ProtoMapValue { + val isPackageFacade = input.readBoolean() + val bytesLength = input.readInt() val bytes = ByteArray(bytesLength) - `in`.readFully(bytes, 0, bytesLength) - val stringsLength = `in`.readInt() - val strings = Array(stringsLength) { `in`.readUTF() } + input.readFully(bytes, 0, bytesLength) + val stringsLength = input.readInt() + val strings = Array(stringsLength) { input.readUTF() } return ProtoMapValue(isPackageFacade, bytes, strings) } } abstract class StringMapExternalizer : DataExternalizer> { - override fun save(out: DataOutput, map: Map?) { - out.writeInt(map!!.size()) + override fun save(output: DataOutput, map: Map?) { + output.writeInt(map!!.size()) for ((key, value) in map.entrySet()) { - IOUtil.writeString(key, out) - writeValue(out, value) + IOUtil.writeString(key, output) + writeValue(output, value) } } - override fun read(`in`: DataInput): Map? { - val size = `in`.readInt() + override fun read(input: DataInput): Map? { + val size = input.readInt() val map = HashMap(size) repeat(size) { - val name = IOUtil.readString(`in`)!! - map[name] = readValue(`in`) + val name = IOUtil.readString(input)!! + map[name] = readValue(input) } return map @@ -119,9 +117,8 @@ abstract class StringMapExternalizer : DataExternalizer> { } -object STRING_TO_LONG_MAP_EXTERNALIZER : StringMapExternalizer() { - override fun readValue(input: DataInput): Long = - input.readLong() +object StringToLongMapExternalizer : StringMapExternalizer() { + override fun readValue(input: DataInput): Long = input.readLong() override fun writeValue(output: DataOutput, value: Long) { output.writeLong(value) @@ -129,86 +126,91 @@ object STRING_TO_LONG_MAP_EXTERNALIZER : StringMapExternalizer() { } -object STRING_LIST_EXTERNALIZER : DataExternalizer> { - override fun save(out: DataOutput, value: List) { - value.forEach { IOUtil.writeUTF(out, it) } +object StringListExternalizer : DataExternalizer> { + override fun save(output: DataOutput, value: List) { + value.forEach { IOUtil.writeUTF(output, it) } } - override fun read(`in`: DataInput): List { + override fun read(input: DataInput): List { val result = ArrayList() - while ((`in` as DataInputStream).available() > 0) { - result.add(IOUtil.readUTF(`in`)) + + while ((input as DataInputStream).available() > 0) { + result.add(IOUtil.readUTF(input)) } + return result } } -object PATH_COLLECTION_EXTERNALIZER : DataExternalizer> { - override fun save(out: DataOutput, value: Collection) { +object PathCollectionExternalizer : DataExternalizer> { + override fun save(output: DataOutput, value: Collection) { for (str in value) { - IOUtil.writeUTF(out, str) + IOUtil.writeUTF(output, str) } } - override fun read(`in`: DataInput): Collection { + override fun read(input: DataInput): Collection { val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) - val stream = `in` as DataInputStream + val stream = input as DataInputStream + while (stream.available() > 0) { val str = IOUtil.readUTF(stream) result.add(str) } + return result } } -object CONSTANTS_MAP_EXTERNALIZER : DataExternalizer> { - override fun save(out: DataOutput, map: Map?) { - out.writeInt(map!!.size()) +object ConstantsMapExternalizer : DataExternalizer> { + override fun save(output: DataOutput, map: Map?) { + output.writeInt(map!!.size()) for (name in map.keySet().sorted()) { - IOUtil.writeString(name, out) + IOUtil.writeString(name, output) val value = map[name]!! when (value) { is Int -> { - out.writeByte(Kind.INT.ordinal()) - out.writeInt(value) + output.writeByte(Kind.INT.ordinal()) + output.writeInt(value) } is Float -> { - out.writeByte(Kind.FLOAT.ordinal()) - out.writeFloat(value) + output.writeByte(Kind.FLOAT.ordinal()) + output.writeFloat(value) } is Long -> { - out.writeByte(Kind.LONG.ordinal()) - out.writeLong(value) + output.writeByte(Kind.LONG.ordinal()) + output.writeLong(value) } is Double -> { - out.writeByte(Kind.DOUBLE.ordinal()) - out.writeDouble(value) + output.writeByte(Kind.DOUBLE.ordinal()) + output.writeDouble(value) } is String -> { - out.writeByte(Kind.STRING.ordinal()) - IOUtil.writeString(value, out) + output.writeByte(Kind.STRING.ordinal()) + IOUtil.writeString(value, output) } else -> throw IllegalStateException("Unexpected constant class: ${value.javaClass}") } } } - override fun read(`in`: DataInput): Map? { - val size = `in`.readInt() + override fun read(input: DataInput): Map? { + val size = input.readInt() val map = HashMap(size) repeat(size) { - val name = IOUtil.readString(`in`)!! + val name = IOUtil.readString(input)!! + val kind = Kind.values()[input.readByte().toInt()] - val kind = Kind.values()[`in`.readByte().toInt()] - val value = when (kind) { - Kind.INT -> `in`.readInt() - Kind.FLOAT -> `in`.readFloat() - Kind.LONG -> `in`.readLong() - Kind.DOUBLE -> `in`.readDouble() - Kind.STRING -> IOUtil.readString(`in`)!! + val value: Any = when (kind) { + Kind.INT -> input.readInt() + Kind.FLOAT -> input.readFloat() + Kind.LONG -> input.readLong() + Kind.DOUBLE -> input.readDouble() + Kind.STRING -> IOUtil.readString(input)!! } + map[name] = value } @@ -221,14 +223,14 @@ object CONSTANTS_MAP_EXTERNALIZER : DataExternalizer> { } -object INT_SET_EXTERNALIZER : DataExternalizer> { - override fun save(out: DataOutput, value: Set) { - value.forEach { out.writeInt(it) } +object IntSetExternalizer : DataExternalizer> { + override fun save(output: DataOutput, value: Set) { + value.forEach { output.writeInt(it) } } - override fun read(`in`: DataInput): Set { + override fun read(input: DataInput): Set { val result = TIntHashSet() - val stream = `in` as DataInputStream + val stream = input as DataInputStream while (stream.available() > 0) { val str = stream.readInt() @@ -239,27 +241,19 @@ object INT_SET_EXTERNALIZER : DataExternalizer> { } } -object INT_EXTERNALIZER : DataExternalizer { - override fun read(`in`: DataInput): Int = `in`.readInt() +object IntExternalizer : DataExternalizer { + override fun read(input: DataInput): Int = input.readInt() - override fun save(out: DataOutput, value: Int) { - out.writeInt(value) + override fun save(output: DataOutput, value: Int) { + output.writeInt(value) } } -object FILE_EXTERNALIZER : DataExternalizer { - override fun read(`in`: DataInput): File = File(`in`.readUTF()) +object FileKeyDescriptor : KeyDescriptor { + override fun read(input: DataInput): File = File(input.readUTF()) - override fun save(out: DataOutput, value: File) { - out.writeUTF(value.canonicalPath) - } -} - -object FILE_KEY_DESCRIPTOR : KeyDescriptor { - override fun read(`in`: DataInput): File = File(`in`.readUTF()) - - override fun save(out: DataOutput, value: File) { - out.writeUTF(value.canonicalPath) + override fun save(output: DataOutput, value: File) { + output.writeUTF(value.canonicalPath) } override fun getHashCode(value: File?): Int = diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt index d2eea15c472..7ebc2c8e6d7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt @@ -18,18 +18,18 @@ package org.jetbrains.kotlin.jps.incremental.storage import com.intellij.openapi.util.io.FileUtil -data class IntPair(val first: Int, val second: Int) : Comparable { - override fun compareTo(other: IntPair): Int { - val firstCmp = first.compareTo(other.first) +data class LookupHashPair(val nameHash: Int, val scopeHash: Int) : Comparable { + public constructor(name: String, scope: String) : this(name.hashCode(), scope.hashCode()) - if (firstCmp != 0) return firstCmp + override fun compareTo(other: LookupHashPair): Int { + val nameCmp = nameHash.compareTo(other.nameHash) - return second.compareTo(other.second) + if (nameCmp != 0) return nameCmp + + return scopeHash.compareTo(other.scopeHash) } } -fun HashPair(a: Any, b: Any): IntPair = IntPair(a.hashCode(), b.hashCode()) - class PathFunctionPair( public val path: String, public val function: String diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 83bda764732..60aee9e01f2 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -18,9 +18,9 @@ package org.jetbrains.kotlin.jps.build import com.intellij.testFramework.UsefulTestCase import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.jps.incremental.IncrementalCacheImpl import org.jetbrains.kotlin.jps.incremental.getCacheDirectoryName import org.jetbrains.kotlin.jps.incremental.getKotlinCacheVersion +import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.utils.Printer import java.io.File @@ -96,7 +96,7 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps val fileNames = cacheDir.list() ?: arrayOf() val cacheFiles = fileNames .map { File(cacheDir, it) } - .filter { it.isFile && it.extension == IncrementalCacheImpl.CACHE_EXTENSION } + .filter { it.isFile && it.extension == BasicMapsOwner.CACHE_EXTENSION } return cacheFiles.map { it.name } } } \ No newline at end of file From 5f22d0088d02e2ab7241ad3a3150d0113ccad038 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 5 Nov 2015 19:23:13 +0300 Subject: [PATCH 0630/1557] Minor: rename file LookupTrackerImpl.kt -> LookupStorage.kt Original commit: 8b4d0ea0778d126b7e233fd1b3284ef7bdc8b0ce --- .../jps/incremental/{LookupTrackerImpl.kt => LookupStorage.kt} | 1 - 1 file changed, 1 deletion(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/{LookupTrackerImpl.kt => LookupStorage.kt} (99%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt similarity index 99% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt index 682718d5e26..918262eb32b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt @@ -119,4 +119,3 @@ class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), Loo fileToId.files.forEach { addFile(it) } } } - From 7616176ca629198caec1c1de609338ded6e90a65 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 5 Nov 2015 19:48:04 +0300 Subject: [PATCH 0631/1557] Extract LookupStorage from LookupTrackerImpl Original commit: a3aa91551cbc88856bfcc3dce045b604ac792560 --- .../kotlin/jps/build/KotlinBuilder.kt | 58 ++++++------ .../jps/incremental/IncrementalCacheImpl.kt | 6 -- .../kotlin/jps/incremental/LookupStorage.kt | 89 +++++++++++++------ .../jps/incremental/storage/BasicMap.kt | 3 + .../jps/incremental/storage/FileToIdMap.kt | 3 - .../jps/incremental/storage/LookupMap.kt | 4 + 6 files changed, 97 insertions(+), 66 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1b30c609e12..a894a1fad5c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -54,7 +54,6 @@ import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.load.kotlin.ModuleMapping @@ -153,8 +152,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION) val project = projectDescriptor.project - val (lookupTracker, lookupStorage) = getLookupTrackerAndStorage(dataManager, project) - val incrementalCaches = getIncrementalCaches(chunk, context, lookupStorage) + val lookupTracker = getLookupTracker(project) + val incrementalCaches = getIncrementalCaches(chunk, context) val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) if (!environment.success()) { environment.reportErrorsTo(messageCollector) @@ -166,7 +165,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val allCompiledFiles = getAllCompiledFilesContainer(context) val filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) - val start = System.nanoTime() val outputItemCollector = doCompileModuleChunk(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, incrementalCaches, messageCollector, project) @@ -177,7 +175,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return NOTHING_DONE } - val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] if (compilationErrors) { LOG.info("Compiled with errors") @@ -199,6 +196,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val generatedClasses = generatedFiles.filterIsInstance() val info = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles, chunk) updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) + updateLookupStorage(chunk, lookupTracker, dataManager, dirtyFilesHolder, filesToCompile) info } } @@ -468,6 +466,26 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return changesInfo } + private fun updateLookupStorage( + chunk: ModuleChunk, + lookupTracker: LookupTracker, + dataManager: BuildDataManager, + dirtyFilesHolder: DirtyFilesHolder, + filesToCompile: MultiMap + ) { + if (!IncrementalCompilation.isExperimental()) return + + if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker.javaClass}") + + val lookupStorage = dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) + + filesToCompile.values().forEach { lookupStorage.removeLookupsFrom(it) } + val removedFiles = chunk.targets.flatMap { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it) } + removedFiles.forEach { lookupStorage.removeLookupsFrom(it) } + + lookupTracker.lookups.entrySet().forEach { lookupStorage.add(it.key, it.value) } + } + private fun File.isModuleMappingFile() = extension == ModuleMapping.MAPPING_FILE_EXT && parentFile.name == "META-INF" // if null is returned, nothing was done @@ -624,37 +642,23 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private val Iterable>.moduleTargets: Iterable get() = filterIsInstance(javaClass()) -private fun getLookupTrackerAndStorage(dataManager: BuildDataManager, project: JpsProject): Pair { +private fun getLookupTracker(project: JpsProject): LookupTracker { var lookupTracker = LookupTracker.DO_NOTHING - var lookupStorage = LookupStorage.DO_NOTHING - if (IncrementalCompilation.isExperimental()) { - val lookupTrackerImpl = dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) - lookupTracker = lookupTrackerImpl - lookupStorage = lookupTrackerImpl - } - - val inTest = "true".equals(System.getProperty("kotlin.jps.tests"), ignoreCase = true) - if (inTest) { + if ("true".equals(System.getProperty("kotlin.jps.tests"), ignoreCase = true)) { val testTracker = project.container.getChild(KotlinBuilder.LOOKUP_TRACKER)?.data if (testTracker != null) { - lookupTracker = CopyingLookupTracker(lookupTracker, testTracker) + lookupTracker = testTracker } } - return lookupTracker to lookupStorage + if (IncrementalCompilation.isExperimental()) return LookupTrackerImpl(lookupTracker) + + return lookupTracker } -private class CopyingLookupTracker(private val lookupTrackers: Collection) : LookupTracker { - constructor(vararg lookupTrackers: LookupTracker) : this(lookupTrackers.toList()) - - override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { - lookupTrackers.forEach { it.record(lookupContainingFile, lookupLine, lookupColumn, scopeFqName, scopeKind, name) } - } -} - -private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext, lookupStorage: LookupStorage): Map { +private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map { val dataManager = context.projectDescriptor.dataManager val targets = chunk.targets @@ -684,8 +688,6 @@ private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext, lo dependents[target]?.forEach { cache.addDependentCache(caches[it]!!) } - - cache.setLookupStorage(lookupStorage) } return caches diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 4026da779cd..a16b0012439 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -87,11 +87,6 @@ public class IncrementalCacheImpl( private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val dependents = arrayListOf() private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } - private var _lookupStorage: LookupStorage = LookupStorage.DO_NOTHING - - public fun setLookupStorage(lookupStorage: LookupStorage) { - this._lookupStorage = lookupStorage - } override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { inlinedTo.add(fromPath, jvmSignature, toPath) @@ -501,7 +496,6 @@ public class IncrementalCacheImpl( private fun remove(path: String) { storage.remove(path) - _lookupStorage.removeLookupsFrom(File(path)) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt index 918262eb32b..bdfb99a5ed3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt @@ -16,31 +16,20 @@ package org.jetbrains.kotlin.jps.incremental +import com.intellij.util.containers.MultiMap import org.jetbrains.jps.builders.storage.StorageProvider +import org.jetbrains.kotlin.incremental.components.LocationInfo import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind -import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner -import org.jetbrains.kotlin.jps.incremental.storage.FileToIdMap -import org.jetbrains.kotlin.jps.incremental.storage.IdToFileMap -import org.jetbrains.kotlin.jps.incremental.storage.LookupMap +import org.jetbrains.kotlin.jps.incremental.storage.* import java.io.File +import java.util.* -object LOOKUP_TRACKER_STORAGE_PROVIDER : StorageProvider() { - override fun createStorage(targetDataDir: File): LookupTrackerImpl = LookupTrackerImpl(targetDataDir) +object LOOKUP_TRACKER_STORAGE_PROVIDER : StorageProvider() { + override fun createStorage(targetDataDir: File): LookupStorage = LookupStorage(targetDataDir) } -interface LookupStorage { - fun removeLookupsFrom(file: File) - - companion object { - val DO_NOTHING: LookupStorage = object : LookupStorage { - override fun removeLookupsFrom(file: File) {} - } - } -} - -class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), LookupTracker, LookupStorage { - +class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { companion object { private val DELETED_TO_SIZE_TRESHOLD = 0.5 private val MINIMUM_GARBAGE_COLLECTIBLE_SIZE = 10000 @@ -64,13 +53,14 @@ class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), Loo } } - override fun record(lookupContainingFile: String, lookupLine: Int?, lookupColumn: Int?, scopeFqName: String, scopeKind: ScopeKind, name: String) { - val file = File(lookupContainingFile) - val fileId = fileToId[file] ?: addFile(file) - lookupMap.add(name, scopeFqName, fileId) + public fun add(lookupSymbol: LookupSymbol, containingFiles: Collection) { + val key = lookupSymbol.toHashPair() + val fileIds = containingFiles.map { addFileIfNeeded(it) }.toHashSet() + fileIds.addAll(lookupMap[key] ?: emptySet()) + lookupMap[key] = fileIds } - override fun removeLookupsFrom(file: File) { + public fun removeLookupsFrom(file: File) { val id = fileToId[file] ?: return idToFile.remove(id) fileToId.remove(file) @@ -91,31 +81,72 @@ class LookupTrackerImpl(private val targetDataDir: File) : BasicMapsOwner(), Loo override fun flush(memoryCachesOnly: Boolean) { try { removeGarbageIfNeeded() - countersFile.writeText("$size\n$deletedCount") + + if (size > 0) { + if (!countersFile.exists()) { + countersFile.parentFile.mkdirs() + countersFile.createNewFile() + } + + countersFile.writeText("$size\n$deletedCount") + } } finally { super.flush(memoryCachesOnly) } } - private fun addFile(file: File): Int { + private fun addFileIfNeeded(file: File): Int { + val existing = fileToId[file] + if (existing != null) return existing + val id = size++ fileToId[file] = id idToFile[id] = file return id } - private fun removeGarbageIfNeeded() { - if (size <= MINIMUM_GARBAGE_COLLECTIBLE_SIZE && deletedCount.toDouble() / size <= DELETED_TO_SIZE_TRESHOLD) return + private fun removeGarbageIfNeeded(force: Boolean = false) { + if (!force && size <= MINIMUM_GARBAGE_COLLECTIBLE_SIZE && deletedCount.toDouble() / size <= DELETED_TO_SIZE_TRESHOLD) return for (hash in lookupMap.keys) { lookupMap[hash] = lookupMap[hash]!!.filter { it in idToFile }.toSet() } + val oldFileToId = fileToId.copyAsMap() + val oldIdToNewId = HashMap(oldFileToId.size) + idToFile.clean() + fileToId.clean() size = 0 deletedCount = 0 - idToFile.clean() - fileToId.files.forEach { addFile(it) } + for ((file, oldId) in oldFileToId.entries) { + val newId = addFileIfNeeded(file) + oldIdToNewId[oldId] = newId + } + + for (lookup in lookupMap.keys) { + val fileIds = lookupMap[lookup]!!.map { oldIdToNewId[it] }.filterNotNull().toSet() + + if (fileIds.isEmpty()) { + lookupMap.remove(lookup) + } + else { + lookupMap[lookup] = fileIds + } + } } } + +class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker { + val lookups = MultiMap() + + override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) { + lookups.putValue(LookupSymbol(name, scopeFqName), File(locationInfo.filePath)) + delegate.record(locationInfo, scopeFqName, scopeKind, name) + } +} + +data class LookupSymbol(val name: String, val scope: String) + +fun LookupSymbol.toHashPair() = LookupHashPair(name, scope) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 839e645b726..7ac1c2188f8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -21,6 +21,7 @@ import com.intellij.util.io.EnumeratorStringDescriptor import com.intellij.util.io.KeyDescriptor import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.utils.Printer +import org.jetbrains.kotlin.utils.keysToMap import java.io.File internal abstract class BasicMap, V>( @@ -42,6 +43,8 @@ internal abstract class BasicMap, V>( storage.close() } + public fun copyAsMap(): Map = storage.keys.keysToMap { storage[it]!! } + @TestOnly fun dump(): String { return with(StringBuilder()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt index e87406b0188..5b67eff5664 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt @@ -32,7 +32,4 @@ class FileToIdMap(file: File) : BasicMap(file, FileKeyDescriptor, Int public fun remove(file: File) { storage.remove(file) } - - public val files: Collection - get() = storage.keys } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index eccc90d1c1f..5a79a9ae5c1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -33,6 +33,10 @@ class LookupMap(storage: File) : BasicMap>(storage, Loo storage.set(key, fileIds) } + public fun remove(key: LookupHashPair) { + storage.remove(key) + } + public val keys: Collection get() = storage.keys } From dae92589112cab1c074103570ea468eda63c9db0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 5 Nov 2015 19:16:09 +0300 Subject: [PATCH 0632/1557] Add incremental compilation tests with lookup cache enabled Original commit: ce7d1eb8e23c7565cded40c75df43b1144667cde --- .../kotlin/jps/incremental/LookupStorage.kt | 32 +++++++++++++++ .../jps/build/AbstractIncrementalJpsTest.kt | 39 ++++++++++++++++++- .../jps/build/AbstractLookupTrackerTest.kt | 22 +++++------ ...experimentalIncrementalCompilationTests.kt | 29 ++++++++++++++ 4 files changed, 109 insertions(+), 13 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt index bdfb99a5ed3..994789d4290 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt @@ -17,11 +17,13 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.util.containers.MultiMap +import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.kotlin.incremental.components.LocationInfo import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.incremental.storage.* +import org.jetbrains.kotlin.utils.Printer import java.io.File import java.util.* @@ -136,6 +138,36 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { } } } + + @TestOnly + public fun forceGC() { + removeGarbageIfNeeded(force = true) + flush(false) + } + + @TestOnly + public fun dump(lookupSymbols: Set): String { + flush(false) + + val sb = StringBuilder() + val p = Printer(sb) + val lookupsStrings = lookupSymbols.groupBy { LookupHashPair(it.name, it.scope) } + val lookups = lookupMap.copyAsMap() + + for ((lookup, fileIds) in lookups.entries.sortedBy { it.key }) { + val key = if (lookup in lookupsStrings) { + lookupsStrings[lookup]!!.map { "${it.scope}#${it.name}" }.sorted().joinToString(", ") + } + else { + lookup.toString() + } + + val value = fileIds.map { idToFile[it]?.absolutePath ?: it.toString() }.sorted().joinToString(", ") + p.println("$key -> $value") + } + + return sb.toString() + } } class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index f7dc0e32a67..10d80382687 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -43,8 +43,12 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil +import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories +import org.jetbrains.kotlin.jps.incremental.LOOKUP_TRACKER_STORAGE_PROVIDER +import org.jetbrains.kotlin.jps.incremental.LOOKUP_TRACKER_TARGET +import org.jetbrains.kotlin.jps.incremental.LookupSymbol import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.Printer @@ -75,12 +79,16 @@ public abstract class AbstractIncrementalJpsTest( private val COMMANDS_AS_MESSAGE_PART = COMMANDS.joinToString("/") { "\".$it\"" } } + protected open val enableExperimentalIncrementalCompilation = false + protected var testDataDir: File by Delegates.notNull() protected var workDir: File by Delegates.notNull() protected var projectDescriptor: ProjectDescriptor by Delegates.notNull() + protected var lookupsDuringTest: MutableSet by Delegates.notNull() + protected val mapWorkingToOriginalFile: MutableMap = hashMapOf() private fun enableDebugLogging() { @@ -98,6 +106,11 @@ public abstract class AbstractIncrementalJpsTest( override fun setUp() { super.setUp() System.setProperty("kotlin.jps.tests", "true") + lookupsDuringTest = hashSetOf() + + if (enableExperimentalIncrementalCompilation) { + IncrementalCompilation.enableExperimental() + } if (DEBUG_LOGGING_ENABLED) { enableDebugLogging() @@ -106,13 +119,18 @@ public abstract class AbstractIncrementalJpsTest( override fun tearDown() { System.clearProperty("kotlin.jps.tests") + + if (enableExperimentalIncrementalCompilation) { + IncrementalCompilation.disableExperimental() + } + super.tearDown() } protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver? get() = null - protected open fun createLookupTracker(): LookupTracker = LookupTracker.DO_NOTHING + private fun createLookupTracker(): TestLookupTracker = TestLookupTracker() protected open fun checkLookups(@Suppress("UNUSED_PARAMETER") lookupTracker: LookupTracker, compiledFiles: Set) { } @@ -136,6 +154,9 @@ public abstract class AbstractIncrementalJpsTest( checkLookups(lookupTracker, logger.compiledFiles) } + val lookups = lookupTracker.lookups.map { LookupSymbol(it.name, it.scopeFqName) } + lookupsDuringTest.addAll(lookups) + if (!buildResult.isSuccessful) { val errorMessages = buildResult @@ -314,6 +335,7 @@ public abstract class AbstractIncrementalJpsTest( private fun createMappingsDump(project: ProjectDescriptor) = createKotlinIncrementalCacheDump(project) + "\n\n\n" + + createLookupCacheDump(project) + "\n\n\n" + createCommonMappingsDump(project) + "\n\n\n" + createJavaMappingsDump(project) @@ -327,6 +349,21 @@ public abstract class AbstractIncrementalJpsTest( }.toString() } + private fun createLookupCacheDump(project: ProjectDescriptor): String { + val sb = StringBuilder() + val p = Printer(sb) + p.println("Begin of Lookup Maps") + p.println() + + val lookupStorage = project.dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) + lookupStorage.forceGC() + p.print(lookupStorage.dump(lookupsDuringTest)) + + p.println() + p.println("End of Lookup Maps") + return sb.toString() + } + private fun createCommonMappingsDump(project: ProjectDescriptor): String { val resultBuf = StringBuilder() val result = Printer(resultBuf) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 11d189dfa57..3bac0319008 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -35,8 +35,6 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( // ignore KDoc like comments which starts with `/**`, example: /** text */ val COMMENT_WITH_LOOKUP_INFO = "/\\*[^*]+\\*/".toRegex() - override fun createLookupTracker(): LookupTracker = TestLookupTracker() - override fun checkLookups(lookupTracker: LookupTracker, compiledFiles: Set) { if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker.javaClass}") @@ -119,22 +117,22 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( } } -private data class LookupInfo( - val lookupContainingFile: String, - val lookupLine: Int, - val lookupColumn: Int, - val scopeFqName: String, - val scopeKind: ScopeKind, - val name: String -) - -private class TestLookupTracker : LookupTracker { +class TestLookupTracker : LookupTracker { val lookups = arrayListOf() override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) { val (line, column) = locationInfo.position lookups.add(LookupInfo(locationInfo.filePath, line, column, scopeFqName, scopeKind, name)) } + + data class LookupInfo( + val lookupContainingFile: String, + val lookupLine: Int, + val lookupColumn: Int, + val scopeFqName: String, + val scopeKind: ScopeKind, + val name: String + ) } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt new file mode 100644 index 00000000000..5276918aa7c --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -0,0 +1,29 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() { + override val enableExperimentalIncrementalCompilation = true +} + +abstract class AbstractExperimentalIncrementalLazyCachesTest : AbstractIncrementalLazyCachesTest() { + override val enableExperimentalIncrementalCompilation = true +} + +abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() { + override val enableExperimentalIncrementalCompilation = true +} \ No newline at end of file From f116f4907f21d88931bb395d39af3e0037097205 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 5 Nov 2015 18:51:39 +0300 Subject: [PATCH 0633/1557] Generate tests Original commit: 7d104d02dd4fdeffbbd549718116c3f27bc05012 --- ...entalCacheVersionChangedTestGenerated.java | 80 ++ ...perimentalIncrementalJpsTestGenerated.java | 955 ++++++++++++++++++ ...talIncrementalLazyCachesTestGenerated.java | 80 ++ 3 files changed, 1115 insertions(+) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java new file mode 100644 index 00000000000..3292698f37d --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java @@ -0,0 +1,80 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class ExperimentalIncrementalCacheVersionChangedTestGenerated extends AbstractExperimentalIncrementalCacheVersionChangedTest { + public void testAllFilesPresentInCacheVersionChanged() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("exportedModule") + public void testExportedModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); + doTest(fileName); + } + + @TestMetadata("module1Modified") + public void testModule1Modified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); + doTest(fileName); + } + + @TestMetadata("module2Modified") + public void testModule2Modified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/"); + doTest(fileName); + } + + @TestMetadata("moduleWithConstantModified") + public void testModuleWithConstantModified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/"); + doTest(fileName); + } + + @TestMetadata("moduleWithInlineModified") + public void testModuleWithInlineModified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/"); + doTest(fileName); + } + + @TestMetadata("touchedFile") + public void testTouchedFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); + doTest(fileName); + } + + @TestMetadata("untouchedFiles") + public void testUntouchedFiles() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); + doTest(fileName); + } + +} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java new file mode 100644 index 00000000000..c129acb1b90 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -0,0 +1,955 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@RunWith(JUnit3RunnerWithInners.class) +public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimentalIncrementalJpsTest { + @TestMetadata("jps-plugin/testData/incremental/multiModule") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class MultiModule extends AbstractExperimentalIncrementalJpsTest { + public void testAllFilesPresentInMultiModule() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("circularDependencyClasses") + public void testCircularDependencyClasses() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyClasses/"); + doTest(fileName); + } + + @TestMetadata("circularDependencySamePackageUnchanged") + public void testCircularDependencySamePackageUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/"); + doTest(fileName); + } + + @TestMetadata("circularDependencyTopLevelFunctions") + public void testCircularDependencyTopLevelFunctions() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/"); + doTest(fileName); + } + + @TestMetadata("constantValueChanged") + public void testConstantValueChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionInlined") + public void testInlineFunctionInlined() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionTwoPackageParts") + public void testInlineFunctionTwoPackageParts() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/"); + doTest(fileName); + } + + @TestMetadata("simpleDependency") + public void testSimpleDependency() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); + doTest(fileName); + } + + @TestMetadata("simpleDependencyErrorOnAccessToInternal1") + public void testSimpleDependencyErrorOnAccessToInternal1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/"); + doTest(fileName); + } + + @TestMetadata("simpleDependencyErrorOnAccessToInternal2") + public void testSimpleDependencyErrorOnAccessToInternal2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/"); + doTest(fileName); + } + + @TestMetadata("simpleDependencyUnchanged") + public void testSimpleDependencyUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/"); + doTest(fileName); + } + + @TestMetadata("transitiveDependency") + public void testTransitiveDependency() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveDependency/"); + doTest(fileName); + } + + @TestMetadata("transitiveInlining") + public void testTransitiveInlining() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/transitiveInlining/"); + doTest(fileName); + } + + @TestMetadata("twoDependants") + public void testTwoDependants() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/twoDependants/"); + doTest(fileName); + } + + } + + @TestMetadata("jps-plugin/testData/incremental/pureKotlin") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class PureKotlin extends AbstractExperimentalIncrementalJpsTest { + @TestMetadata("accessingFunctionsViaPackagePart") + public void testAccessingFunctionsViaPackagePart() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/"); + doTest(fileName); + } + + @TestMetadata("accessingFunctionsViaRenamedFileClass") + public void testAccessingFunctionsViaRenamedFileClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/"); + doTest(fileName); + } + + @TestMetadata("accessingPropertiesViaField") + public void testAccessingPropertiesViaField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/"); + doTest(fileName); + } + + @TestMetadata("allConstants") + public void testAllConstants() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); + doTest(fileName); + } + + public void testAllFilesPresentInPureKotlin() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("annotations") + public void testAnnotations() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/annotations/"); + doTest(fileName); + } + + @TestMetadata("anonymousObjectChanged") + public void testAnonymousObjectChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/"); + doTest(fileName); + } + + @TestMetadata("classInlineFunctionChanged") + public void testClassInlineFunctionChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); + doTest(fileName); + } + + @TestMetadata("classObjectConstantChanged") + public void testClassObjectConstantChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/"); + doTest(fileName); + } + + @TestMetadata("classRecreated") + public void testClassRecreated() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRecreated/"); + doTest(fileName); + } + + @TestMetadata("classRedeclaration") + public void testClassRedeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classRedeclaration/"); + doTest(fileName); + } + + @TestMetadata("classSignatureChanged") + public void testClassSignatureChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/"); + doTest(fileName); + } + + @TestMetadata("classSignatureUnchanged") + public void testClassSignatureUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/"); + doTest(fileName); + } + + @TestMetadata("compilationErrorThenFixedOtherPackage") + public void testCompilationErrorThenFixedOtherPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/"); + doTest(fileName); + } + + @TestMetadata("compilationErrorThenFixedSamePackage") + public void testCompilationErrorThenFixedSamePackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/"); + doTest(fileName); + } + + @TestMetadata("compilationErrorThenFixedWithPhantomPart") + public void testCompilationErrorThenFixedWithPhantomPart() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/"); + doTest(fileName); + } + + @TestMetadata("compilationErrorThenFixedWithPhantomPart2") + public void testCompilationErrorThenFixedWithPhantomPart2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/"); + doTest(fileName); + } + + @TestMetadata("compilationErrorThenFixedWithPhantomPart3") + public void testCompilationErrorThenFixedWithPhantomPart3() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/"); + doTest(fileName); + } + + @TestMetadata("conflictingPlatformDeclarations") + public void testConflictingPlatformDeclarations() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/"); + doTest(fileName); + } + + @TestMetadata("constantRemoved") + public void testConstantRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantRemoved/"); + doTest(fileName); + } + + @TestMetadata("constantsUnchanged") + public void testConstantsUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/"); + doTest(fileName); + } + + @TestMetadata("defaultArguments") + public void testDefaultArguments() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + doTest(fileName); + } + + @TestMetadata("delegatedPropertyInlineExtensionAccessor") + public void testDelegatedPropertyInlineExtensionAccessor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/"); + doTest(fileName); + } + + @TestMetadata("delegatedPropertyInlineMethodAccessor") + public void testDelegatedPropertyInlineMethodAccessor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/"); + doTest(fileName); + } + + @TestMetadata("dependencyClassReferenced") + public void testDependencyClassReferenced() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/"); + doTest(fileName); + } + + @TestMetadata("fileWithConstantRemoved") + public void testFileWithConstantRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/"); + doTest(fileName); + } + + @TestMetadata("fileWithInlineFunctionRemoved") + public void testFileWithInlineFunctionRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/"); + doTest(fileName); + } + + @TestMetadata("filesExchangePackages") + public void testFilesExchangePackages() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/"); + doTest(fileName); + } + + @TestMetadata("funRedeclaration") + public void testFunRedeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funRedeclaration/"); + doTest(fileName); + } + + @TestMetadata("functionBecameInline") + public void testFunctionBecameInline() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/"); + doTest(fileName); + } + + @TestMetadata("independentClasses") + public void testIndependentClasses() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/independentClasses/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionRemoved") + public void testInlineFunctionRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionsCircularDependency") + public void testInlineFunctionsCircularDependency() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionsUnchanged") + public void testInlineFunctionsUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/"); + doTest(fileName); + } + + @TestMetadata("inlineLinesChanged") + public void testInlineLinesChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/"); + doTest(fileName); + } + + @TestMetadata("inlineTwoFunctionsOneChanged") + public void testInlineTwoFunctionsOneChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); + doTest(fileName); + } + + @TestMetadata("internalClassChanged") + public void testInternalClassChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); + doTest(fileName); + } + + @TestMetadata("internalMemberInClassChanged") + public void testInternalMemberInClassChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/"); + doTest(fileName); + } + + @TestMetadata("localClassChanged") + public void testLocalClassChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/localClassChanged/"); + doTest(fileName); + } + + @TestMetadata("moveClass") + public void testMoveClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileAdded") + public void testMultifileClassFileAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileChanged") + public void testMultifileClassFileChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/"); + doTest(fileName); + } + + @TestMetadata("multifileClassFileMovedToAnotherMultifileClass") + public void testMultifileClassFileMovedToAnotherMultifileClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/"); + doTest(fileName); + } + + @TestMetadata("multifileClassInlineFunction") + public void testMultifileClassInlineFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/"); + doTest(fileName); + } + + @TestMetadata("multifileClassInlineFunctionAccessingField") + public void testMultifileClassInlineFunctionAccessingField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRecreated") + public void testMultifileClassRecreated() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRecreatedAfterRenaming") + public void testMultifileClassRecreatedAfterRenaming() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/"); + doTest(fileName); + } + + @TestMetadata("multifileClassRemoved") + public void testMultifileClassRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/"); + doTest(fileName); + } + + @TestMetadata("multiplePackagesModified") + public void testMultiplePackagesModified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/"); + doTest(fileName); + } + + @TestMetadata("objectConstantChanged") + public void testObjectConstantChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/"); + doTest(fileName); + } + + @TestMetadata("optionalParameter") + public void testOptionalParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/optionalParameter/"); + doTest(fileName); + } + + @TestMetadata("ourClassReferenced") + public void testOurClassReferenced() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/"); + doTest(fileName); + } + + @TestMetadata("packageConstantChanged") + public void testPackageConstantChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/"); + doTest(fileName); + } + + @TestMetadata("packageFileAdded") + public void testPackageFileAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileAdded/"); + doTest(fileName); + } + + @TestMetadata("packageFileChangedPackage") + public void testPackageFileChangedPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/"); + doTest(fileName); + } + + @TestMetadata("packageFileChangedThenOtherRemoved") + public void testPackageFileChangedThenOtherRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/"); + doTest(fileName); + } + + @TestMetadata("packageFileRemoved") + public void testPackageFileRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/"); + doTest(fileName); + } + + @TestMetadata("packageFilesChangedInTurn") + public void testPackageFilesChangedInTurn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/"); + doTest(fileName); + } + + @TestMetadata("packageInlineFunctionAccessingField") + public void testPackageInlineFunctionAccessingField() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/"); + doTest(fileName); + } + + @TestMetadata("packageInlineFunctionFromOurPackage") + public void testPackageInlineFunctionFromOurPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/"); + doTest(fileName); + } + + @TestMetadata("packageMultifileClassOneFileWithPublicChanges") + public void testPackageMultifileClassOneFileWithPublicChanges() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/"); + doTest(fileName); + } + + @TestMetadata("packageMultifileClassPrivateOnlyChanged") + public void testPackageMultifileClassPrivateOnlyChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/"); + doTest(fileName); + } + + @TestMetadata("packagePrivateOnlyChanged") + public void testPackagePrivateOnlyChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/"); + doTest(fileName); + } + + @TestMetadata("packageRecreated") + public void testPackageRecreated() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreated/"); + doTest(fileName); + } + + @TestMetadata("packageRecreatedAfterRenaming") + public void testPackageRecreatedAfterRenaming() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/"); + doTest(fileName); + } + + @TestMetadata("packageRemoved") + public void testPackageRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); + doTest(fileName); + } + + @TestMetadata("privateConstantsChanged") + public void testPrivateConstantsChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/"); + doTest(fileName); + } + + @TestMetadata("privateMethodAdded") + public void testPrivateMethodAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/"); + doTest(fileName); + } + + @TestMetadata("privateMethodDeleted") + public void testPrivateMethodDeleted() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/"); + doTest(fileName); + } + + @TestMetadata("privateMethodSignatureChanged") + public void testPrivateMethodSignatureChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/"); + doTest(fileName); + } + + @TestMetadata("privateSecondaryConstructorAdded") + public void testPrivateSecondaryConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("privateSecondaryConstructorDeleted") + public void testPrivateSecondaryConstructorDeleted() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/"); + doTest(fileName); + } + + @TestMetadata("privateValAccessorChanged") + public void testPrivateValAccessorChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/"); + doTest(fileName); + } + + @TestMetadata("privateValAdded") + public void testPrivateValAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValAdded/"); + doTest(fileName); + } + + @TestMetadata("privateValDeleted") + public void testPrivateValDeleted() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValDeleted/"); + doTest(fileName); + } + + @TestMetadata("privateValSignatureChanged") + public void testPrivateValSignatureChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/"); + doTest(fileName); + } + + @TestMetadata("privateVarAdded") + public void testPrivateVarAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarAdded/"); + doTest(fileName); + } + + @TestMetadata("privateVarDeleted") + public void testPrivateVarDeleted() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/"); + doTest(fileName); + } + + @TestMetadata("privateVarSignatureChanged") + public void testPrivateVarSignatureChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/"); + doTest(fileName); + } + + @TestMetadata("propertyRedeclaration") + public void testPropertyRedeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/"); + doTest(fileName); + } + + @TestMetadata("returnTypeChanged") + public void testReturnTypeChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); + doTest(fileName); + } + + @TestMetadata("simpleClassDependency") + public void testSimpleClassDependency() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/"); + doTest(fileName); + } + + @TestMetadata("soleFileChangesPackage") + public void testSoleFileChangesPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/"); + doTest(fileName); + } + + @TestMetadata("subpackage") + public void testSubpackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/subpackage/"); + doTest(fileName); + } + + @TestMetadata("topLevelFunctionSameSignature") + public void testTopLevelFunctionSameSignature() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); + doTest(fileName); + } + + @TestMetadata("topLevelMembersInTwoFiles") + public void testTopLevelMembersInTwoFiles() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); + doTest(fileName); + } + + @TestMetadata("topLevelPrivateValUsageAdded") + public void testTopLevelPrivateValUsageAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/"); + doTest(fileName); + } + + @TestMetadata("traitClassObjectConstantChanged") + public void testTraitClassObjectConstantChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); + doTest(fileName); + } + + @TestMetadata("valAddCustomAccessor") + public void testValAddCustomAccessor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/"); + doTest(fileName); + } + + @TestMetadata("valRemoveCustomAccessor") + public void testValRemoveCustomAccessor() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/"); + doTest(fileName); + } + + } + + @TestMetadata("jps-plugin/testData/incremental/withJava") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class WithJava extends AbstractExperimentalIncrementalJpsTest { + public void testAllFilesPresentInWithJava() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ConvertBetweenJavaAndKotlin extends AbstractExperimentalIncrementalJpsTest { + public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("javaToKotlin") + public void testJavaToKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/"); + doTest(fileName); + } + + @TestMetadata("javaToKotlinAndBack") + public void testJavaToKotlinAndBack() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/"); + doTest(fileName); + } + + @TestMetadata("javaToKotlinAndRemove") + public void testJavaToKotlinAndRemove() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/"); + doTest(fileName); + } + + @TestMetadata("kotlinToJava") + public void testKotlinToJava() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/"); + doTest(fileName); + } + + } + + @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class JavaUsedInKotlin extends AbstractExperimentalIncrementalJpsTest { + public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("changeNotUsedSignature") + public void testChangeNotUsedSignature() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/"); + doTest(fileName); + } + + @TestMetadata("changeSignature") + public void testChangeSignature() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/"); + doTest(fileName); + } + + @TestMetadata("constantChanged") + public void testConstantChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/"); + doTest(fileName); + } + + @TestMetadata("constantUnchanged") + public void testConstantUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/"); + doTest(fileName); + } + + @TestMetadata("javaAndKotlinChangedSimultaneously") + public void testJavaAndKotlinChangedSimultaneously() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/"); + doTest(fileName); + } + + @TestMetadata("methodAddedInSuper") + public void testMethodAddedInSuper() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/"); + doTest(fileName); + } + + @TestMetadata("methodRenamed") + public void testMethodRenamed() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/"); + doTest(fileName); + } + + @TestMetadata("notChangeSignature") + public void testNotChangeSignature() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/"); + doTest(fileName); + } + + @TestMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class SamConversions extends AbstractExperimentalIncrementalJpsTest { + public void testAllFilesPresentInSamConversions() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("methodAdded") + public void testMethodAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/"); + doTest(fileName); + } + + @TestMetadata("methodSignatureChanged") + public void testMethodSignatureChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/"); + doTest(fileName); + } + + } + } + + @TestMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class KotlinUsedInJava extends AbstractExperimentalIncrementalJpsTest { + @TestMetadata("addOptionalParameter") + public void testAddOptionalParameter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/"); + doTest(fileName); + } + + public void testAllFilesPresentInKotlinUsedInJava() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("changeNotUsedSignature") + public void testChangeNotUsedSignature() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/"); + doTest(fileName); + } + + @TestMetadata("changeSignature") + public void testChangeSignature() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/"); + doTest(fileName); + } + + @TestMetadata("constantChanged") + public void testConstantChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/"); + doTest(fileName); + } + + @TestMetadata("constantUnchanged") + public void testConstantUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/"); + doTest(fileName); + } + + @TestMetadata("funRenamed") + public void testFunRenamed() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/"); + doTest(fileName); + } + + @TestMetadata("methodAddedInSuper") + public void testMethodAddedInSuper() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); + doTest(fileName); + } + + @TestMetadata("notChangeSignature") + public void testNotChangeSignature() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/"); + doTest(fileName); + } + + @TestMetadata("onlyTopLevelFunctionInFileRemoved") + public void testOnlyTopLevelFunctionInFileRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/"); + doTest(fileName); + } + + @TestMetadata("packageFileAdded") + public void testPackageFileAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/"); + doTest(fileName); + } + + @TestMetadata("privateChanges") + public void testPrivateChanges() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/"); + doTest(fileName); + } + + @TestMetadata("propertyRenamed") + public void testPropertyRenamed() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/"); + doTest(fileName); + } + + } + } + + @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InlineFunCallSite extends AbstractExperimentalIncrementalJpsTest { + public void testAllFilesPresentInInlineFunCallSite() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("classProperty") + public void testClassProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty/"); + doTest(fileName); + } + + @TestMetadata("companionObjectProperty") + public void testCompanionObjectProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/"); + doTest(fileName); + } + + @TestMetadata("function") + public void testFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); + doTest(fileName); + } + + @TestMetadata("getter") + public void testGetter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter/"); + doTest(fileName); + } + + @TestMetadata("lambda") + public void testLambda() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda/"); + doTest(fileName); + } + + @TestMetadata("localFun") + public void testLocalFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun/"); + doTest(fileName); + } + + @TestMetadata("method") + public void testMethod() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method/"); + doTest(fileName); + } + + @TestMetadata("parameterDefaultValue") + public void testParameterDefaultValue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/"); + doTest(fileName); + } + + @TestMetadata("primaryConstructorParameterDefaultValue") + public void testPrimaryConstructorParameterDefaultValue() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/"); + doTest(fileName); + } + + @TestMetadata("superCall") + public void testSuperCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall/"); + doTest(fileName); + } + + @TestMetadata("thisCall") + public void testThisCall() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall/"); + doTest(fileName); + } + + @TestMetadata("topLevelObjectProperty") + public void testTopLevelObjectProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/"); + doTest(fileName); + } + + @TestMetadata("topLevelProperty") + public void testTopLevelProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); + doTest(fileName); + } + + } +} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java new file mode 100644 index 00000000000..1cacaaa5088 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java @@ -0,0 +1,80 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/lazyKotlinCaches") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class ExperimentalIncrementalLazyCachesTestGenerated extends AbstractExperimentalIncrementalLazyCachesTest { + public void testAllFilesPresentInLazyKotlinCaches() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("class") + public void testClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/class/"); + doTest(fileName); + } + + @TestMetadata("constant") + public void testConstant() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); + doTest(fileName); + } + + @TestMetadata("function") + public void testFunction() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/function/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionWithUsage") + public void testInlineFunctionWithUsage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/"); + doTest(fileName); + } + + @TestMetadata("inlineFunctionWithoutUsage") + public void testInlineFunctionWithoutUsage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/"); + doTest(fileName); + } + + @TestMetadata("noKotlin") + public void testNoKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/"); + doTest(fileName); + } + + @TestMetadata("topLevelPropertyAccess") + public void testTopLevelPropertyAccess() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/"); + doTest(fileName); + } + +} From e6c13d7fef1d1e3c1b15000e6c63ed8d68a5ab77 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 6 Nov 2015 16:41:14 +0300 Subject: [PATCH 0634/1557] Fix minor issues after review Original commit: 8f43714c49266940c31329c20aee8904c7c57b85 --- .../kotlin/jps/build/KotlinBuilder.kt | 2 +- ...et.kt => KotlinDataContainerTargetType.kt} | 21 +++++++++-------- .../kotlin/jps/incremental/LookupStorage.kt | 23 +++++++++---------- .../jps/incremental/storage/BasicMap.kt | 3 --- .../jps/incremental/storage/FileToIdMap.kt | 3 +++ .../jps/incremental/storage/LookupMap.kt | 16 ++++++------- .../jps/incremental/storage/externalizers.kt | 12 +++++----- .../kotlin/jps/incremental/storage/values.kt | 4 ++-- .../jps/build/AbstractIncrementalJpsTest.kt | 6 ++--- 9 files changed, 45 insertions(+), 45 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/{LookupTrackerTarget.kt => KotlinDataContainerTargetType.kt} (67%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a894a1fad5c..b863f64c767 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -477,7 +477,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker.javaClass}") - val lookupStorage = dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) + val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) filesToCompile.values().forEach { lookupStorage.removeLookupsFrom(it) } val removedFiles = chunk.targets.flatMap { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerTarget.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinDataContainerTargetType.kt similarity index 67% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerTarget.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinDataContainerTargetType.kt index 68ec5195399..bbaee2504ef 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupTrackerTarget.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/KotlinDataContainerTargetType.kt @@ -24,20 +24,21 @@ import org.jetbrains.jps.indices.ModuleExcludeIndex import org.jetbrains.jps.model.JpsModel import java.io.File -private val KOTLIN_LOOKUP_TRACKER = "kotlin-lookup-tracker" +private val KOTLIN_DATA_CONTAINER = "kotlin-data-container" -object LOOKUP_TRACKER_TARGET_TYPE : BuildTargetType(KOTLIN_LOOKUP_TRACKER) { - override fun computeAllTargets(model: JpsModel): List = listOf(LOOKUP_TRACKER_TARGET) +object KotlinDataContainerTargetType : BuildTargetType(KOTLIN_DATA_CONTAINER) { + override fun computeAllTargets(model: JpsModel): List = listOf(KotlinDataContainerTarget) - override fun createLoader(model: JpsModel): BuildTargetLoader = - object : BuildTargetLoader() { - override fun createTarget(targetId: String): LOOKUP_TRACKER_TARGET? = LOOKUP_TRACKER_TARGET + override fun createLoader(model: JpsModel): BuildTargetLoader = + object : BuildTargetLoader() { + override fun createTarget(targetId: String): KotlinDataContainerTarget? = KotlinDataContainerTarget } } -object LOOKUP_TRACKER_TARGET : BuildTarget(LOOKUP_TRACKER_TARGET_TYPE) { - override fun getId(): String? = KOTLIN_LOOKUP_TRACKER - override fun getPresentableName(): String = KOTLIN_LOOKUP_TRACKER +// Fake target to store data per project for incremental compilation +object KotlinDataContainerTarget : BuildTarget(KotlinDataContainerTargetType) { + override fun getId(): String? = KOTLIN_DATA_CONTAINER + override fun getPresentableName(): String = KOTLIN_DATA_CONTAINER override fun computeRootDescriptors( model: JpsModel?, @@ -49,7 +50,7 @@ object LOOKUP_TRACKER_TARGET : BuildTarget(LOOKUP_TRACKER_T override fun getOutputRoots(context: CompileContext): Collection { val dataManager = context.projectDescriptor.dataManager val storageRoot = dataManager.dataPaths.dataStorageRoot - return listOf(File(storageRoot, KOTLIN_LOOKUP_TRACKER)) + return listOf(File(storageRoot, KOTLIN_DATA_CONTAINER)) } override fun findRootDescriptor(rootId: String?, rootIndex: BuildRootIndex?): BuildRootDescriptor? = null diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt index 994789d4290..349981a99e9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.utils.Printer import java.io.File import java.util.* -object LOOKUP_TRACKER_STORAGE_PROVIDER : StorageProvider() { +object LookupStorageProvider : StorageProvider() { override fun createStorage(targetDataDir: File): LookupStorage = LookupStorage(targetDataDir) } @@ -55,9 +55,9 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { } } - public fun add(lookupSymbol: LookupSymbol, containingFiles: Collection) { - val key = lookupSymbol.toHashPair() - val fileIds = containingFiles.map { addFileIfNeeded(it) }.toHashSet() + public fun add(lookupSymbol: LookupSymbol, containingPaths: Collection) { + val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope) + val fileIds = containingPaths.map { addFileIfNeeded(File(it)) }.toHashSet() fileIds.addAll(lookupMap[key] ?: emptySet()) lookupMap[key] = fileIds } @@ -115,7 +115,7 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { lookupMap[hash] = lookupMap[hash]!!.filter { it in idToFile }.toSet() } - val oldFileToId = fileToId.copyAsMap() + val oldFileToId = fileToId.toMap() val oldIdToNewId = HashMap(oldFileToId.size) idToFile.clean() fileToId.clean() @@ -151,10 +151,11 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { val sb = StringBuilder() val p = Printer(sb) - val lookupsStrings = lookupSymbols.groupBy { LookupHashPair(it.name, it.scope) } - val lookups = lookupMap.copyAsMap() + val lookupsStrings = lookupSymbols.groupBy { LookupSymbolKey(it.name, it.scope) } + + for (lookup in lookupMap.keys.sorted()) { + val fileIds = lookupMap[lookup]!! - for ((lookup, fileIds) in lookups.entries.sortedBy { it.key }) { val key = if (lookup in lookupsStrings) { lookupsStrings[lookup]!!.map { "${it.scope}#${it.name}" }.sorted().joinToString(", ") } @@ -171,14 +172,12 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { } class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker { - val lookups = MultiMap() + val lookups = MultiMap() override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) { - lookups.putValue(LookupSymbol(name, scopeFqName), File(locationInfo.filePath)) + lookups.putValue(LookupSymbol(name, scopeFqName), locationInfo.filePath) delegate.record(locationInfo, scopeFqName, scopeKind, name) } } data class LookupSymbol(val name: String, val scope: String) - -fun LookupSymbol.toHashPair() = LookupHashPair(name, scope) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 7ac1c2188f8..839e645b726 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -21,7 +21,6 @@ import com.intellij.util.io.EnumeratorStringDescriptor import com.intellij.util.io.KeyDescriptor import org.jetbrains.annotations.TestOnly import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.kotlin.utils.keysToMap import java.io.File internal abstract class BasicMap, V>( @@ -43,8 +42,6 @@ internal abstract class BasicMap, V>( storage.close() } - public fun copyAsMap(): Map = storage.keys.keysToMap { storage[it]!! } - @TestOnly fun dump(): String { return with(StringBuilder()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt index 5b67eff5664..021768d0fcb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.incremental.storage +import org.jetbrains.kotlin.utils.keysToMap import java.io.File class FileToIdMap(file: File) : BasicMap(file, FileKeyDescriptor, IntExternalizer) { @@ -32,4 +33,6 @@ class FileToIdMap(file: File) : BasicMap(file, FileKeyDescriptor, Int public fun remove(file: File) { storage.remove(file) } + + public fun toMap(): Map = storage.keys.keysToMap { storage[it]!! } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index 5a79a9ae5c1..c20f00541a4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -18,25 +18,25 @@ package org.jetbrains.kotlin.jps.incremental.storage import java.io.File -class LookupMap(storage: File) : BasicMap>(storage, LookupHashPairKeyDescriptor, IntSetExternalizer) { - override fun dumpKey(key: LookupHashPair): String = key.toString() +class LookupMap(storage: File) : BasicMap>(storage, LookupSymbolKeyDescriptor, IntSetExternalizer) { + override fun dumpKey(key: LookupSymbolKey): String = key.toString() override fun dumpValue(value: Set): String = value.toString() public fun add(name: String, scope: String, fileId: Int) { - storage.append(LookupHashPair(name, scope)) { out -> out.writeInt(fileId) } + storage.append(LookupSymbolKey(name, scope)) { out -> out.writeInt(fileId) } } - public operator fun get(lookupHash: LookupHashPair): Set? = storage[lookupHash] + public operator fun get(key: LookupSymbolKey): Set? = storage[key] - public operator fun set(key: LookupHashPair, fileIds: Set) { - storage.set(key, fileIds) + public operator fun set(key: LookupSymbolKey, fileIds: Set) { + storage[key] = fileIds } - public fun remove(key: LookupHashPair) { + public fun remove(key: LookupSymbolKey) { storage.remove(key) } - public val keys: Collection + public val keys: Collection get() = storage.keys } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt index 9888fd957fc..96a5071a136 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt @@ -29,22 +29,22 @@ import java.io.DataOutput import java.io.File import java.util.* -object LookupHashPairKeyDescriptor : KeyDescriptor { - override fun read(input: DataInput): LookupHashPair { +object LookupSymbolKeyDescriptor : KeyDescriptor { + override fun read(input: DataInput): LookupSymbolKey { val first = input.readInt() val second = input.readInt() - return LookupHashPair(first, second) + return LookupSymbolKey(first, second) } - override fun save(output: DataOutput, value: LookupHashPair) { + override fun save(output: DataOutput, value: LookupSymbolKey) { output.writeInt(value.nameHash) output.writeInt(value.scopeHash) } - override fun getHashCode(value: LookupHashPair): Int = value.hashCode() + override fun getHashCode(value: LookupSymbolKey): Int = value.hashCode() - override fun isEqual(val1: LookupHashPair, val2: LookupHashPair): Boolean = val1 == val2 + override fun isEqual(val1: LookupSymbolKey, val2: LookupSymbolKey): Boolean = val1 == val2 } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt index 7ebc2c8e6d7..3eb85f4bb34 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt @@ -18,10 +18,10 @@ package org.jetbrains.kotlin.jps.incremental.storage import com.intellij.openapi.util.io.FileUtil -data class LookupHashPair(val nameHash: Int, val scopeHash: Int) : Comparable { +data class LookupSymbolKey(val nameHash: Int, val scopeHash: Int) : Comparable { public constructor(name: String, scope: String) : this(name.hashCode(), scope.hashCode()) - override fun compareTo(other: LookupHashPair): Int { + override fun compareTo(other: LookupSymbolKey): Int { val nameCmp = nameHash.compareTo(other.nameHash) if (nameCmp != 0) return nameCmp diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 10d80382687..fb378feb85f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -46,8 +46,8 @@ import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories -import org.jetbrains.kotlin.jps.incremental.LOOKUP_TRACKER_STORAGE_PROVIDER -import org.jetbrains.kotlin.jps.incremental.LOOKUP_TRACKER_TARGET +import org.jetbrains.kotlin.jps.incremental.LookupStorageProvider +import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.jps.incremental.LookupSymbol import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.test.KotlinTestUtils @@ -355,7 +355,7 @@ public abstract class AbstractIncrementalJpsTest( p.println("Begin of Lookup Maps") p.println() - val lookupStorage = project.dataManager.getStorage(LOOKUP_TRACKER_TARGET, LOOKUP_TRACKER_STORAGE_PROVIDER) + val lookupStorage = project.dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) lookupStorage.forceGC() p.print(lookupStorage.dump(lookupsDuringTest)) From bc29f0618715185b983f4ec96751c47e1c718111 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 6 Nov 2015 20:29:31 +0300 Subject: [PATCH 0635/1557] Minor: generate tests Original commit: 7c752c14638528bb1655c1d3d9dcf2f17ae5605d --- ...perimentalIncrementalJpsTestGenerated.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index c129acb1b90..3c555c78eae 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -61,6 +61,30 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("defaultParameterAdded") + public void testDefaultParameterAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultParameterAddedForTopLevelFun") + public void testDefaultParameterAddedForTopLevelFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/"); + doTest(fileName); + } + + @TestMetadata("defaultParameterRemoved") + public void testDefaultParameterRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultParameterRemovedForTopLevelFun") + public void testDefaultParameterRemovedForTopLevelFun() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionInlined") public void testInlineFunctionInlined() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/"); From 048725c3f0e55eb7ed5b475af153fc61e647ab00 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Sun, 8 Nov 2015 19:54:46 +0300 Subject: [PATCH 0636/1557] Add prefix information for Java source root (KT-9167 in progress) #KT-9167 In Progress Original commit: c0739ef53c6fecccede925de7fbc57ca88693257 --- .../kotlin/jps/build/JvmSourceRoot.kt | 21 +++++++++++++++++++ .../KotlinBuilderModuleScriptGenerator.java | 7 ++++--- .../modules/KotlinModuleXmlBuilder.java | 17 +++++++++++---- .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 3 ++- .../modules/KotlinModuleXmlGeneratorTest.java | 9 ++++---- 5 files changed, 45 insertions(+), 12 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JvmSourceRoot.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JvmSourceRoot.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JvmSourceRoot.kt new file mode 100644 index 00000000000..6dba446f049 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JvmSourceRoot.kt @@ -0,0 +1,21 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +import java.io.File + +data class JvmSourceRoot(val file: File, val packagePrefix: String? = null) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 3425490f7c7..6d146f3274f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -127,13 +127,14 @@ public class KotlinBuilderModuleScriptGenerator { } @NotNull - private static List findSourceRoots(@NotNull CompileContext context, @NotNull ModuleBuildTarget target) { + private static List findSourceRoots(@NotNull CompileContext context, @NotNull ModuleBuildTarget target) { List roots = context.getProjectDescriptor().getBuildRootIndex().getTargetRoots(target, context); - List result = ContainerUtil.newArrayList(); + List result = ContainerUtil.newArrayList(); for (JavaSourceRootDescriptor root : roots) { File file = root.getRootFile(); + String prefix = root.getPackagePrefix(); if (file.exists()) { - result.add(file); + result.add(new JvmSourceRoot(file, prefix.isEmpty() ? null : prefix)); } } return result; diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java index a74c1a2f29b..73cdd88fd4b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.modules; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; import org.jetbrains.kotlin.config.IncrementalCompilation; +import org.jetbrains.kotlin.jps.build.JvmSourceRoot; import org.jetbrains.kotlin.utils.Printer; import java.io.File; @@ -43,7 +44,7 @@ public class KotlinModuleXmlBuilder { String moduleName, String outputDir, List sourceFiles, - List javaSourceRoots, + List javaSourceRoots, Collection classpathRoots, JavaModuleBuildTargetType targetType, Set directoriesToFilterOut @@ -100,10 +101,18 @@ public class KotlinModuleXmlBuilder { } } - private void processJavaSourceRoots(@NotNull List files) { + private void processJavaSourceRoots(@NotNull List roots) { p.println(""); - for (File file : files) { - p.println("<", JAVA_SOURCE_ROOTS, " ", PATH, "=\"", getEscapedPath(file), "\"/>"); + for (JvmSourceRoot root : roots) { + p.print("<"); + p.printWithNoIndent(JAVA_SOURCE_ROOTS, " ", PATH, "=\"", getEscapedPath(root.getFile()), "\""); + + if (root.getPackagePrefix() != null) { + p.printWithNoIndent(" ", JAVA_SOURCE_PACKAGE_PREFIX, "=\"", root.getPackagePrefix(), "\""); + } + + p.printWithNoIndent("/>"); + p.println(); } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 7a9f6cfc73b..67d05520359 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType +import org.jetbrains.kotlin.jps.build.JvmSourceRoot import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil @@ -43,7 +44,7 @@ public class ClasspathOrderTest : TestCaseWithTmpdir() { "name", File(tmpdir, "output").getAbsolutePath(), listOf(sourceDir), - listOf(sourceDir), + listOf(JvmSourceRoot(sourceDir)), listOf(PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()), JavaModuleBuildTargetType.PRODUCTION, setOf() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index b6198737e3e..a16f2d3ce01 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.modules; import junit.framework.TestCase; import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; +import org.jetbrains.kotlin.jps.build.JvmSourceRoot; import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; @@ -30,7 +31,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { "name", "output", Arrays.asList(new File("s1"), new File("s2")), - Collections.singletonList(new File("java")), + Collections.singletonList(new JvmSourceRoot(new File("java"), null)), Arrays.asList(new File("cp1"), new File("cp2")), JavaModuleBuildTargetType.PRODUCTION, Collections.emptySet() @@ -43,7 +44,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { "name", "output", Arrays.asList(new File("s1"), new File("s2")), - Collections.emptyList(), + Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) @@ -57,7 +58,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { "name", "output", Arrays.asList(new File("s1"), new File("s2")), - Collections.emptyList(), + Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), JavaModuleBuildTargetType.PRODUCTION, Collections.singleton(new File("cp1")) @@ -66,7 +67,7 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { "name2", "output2", Arrays.asList(new File("s12"), new File("s22")), - Collections.emptyList(), + Collections.emptyList(), Arrays.asList(new File("cp12"), new File("cp22")), JavaModuleBuildTargetType.TEST, Collections.singleton(new File("cp12")) From b77f4ffe9f4e58c56dcd0cd4157720f77f26922a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Sun, 8 Nov 2015 20:58:55 +0300 Subject: [PATCH 0637/1557] Teach index working with source roots with package prefix #KT-9167 Fixed Original commit: 23e35ab1128f83ae83cbd1bc8a3e899863e552c3 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 13 ++++++++ .../SourcePackageLongPrefix/kotlinProject.ipr | 32 +++++++++++++++++++ .../module1/module1.iml | 13 ++++++++ .../module1/src/JavaDependency.java | 6 ++++ .../module1/src/JavaTest.java | 6 ++++ .../module1/src/inBadPrefix.kt | 4 +++ .../module1/src/isGoodPrefix.kt | 3 ++ .../module1/src/test/other/otherTest.kt | 9 ++++++ .../module2/module2.iml | 14 ++++++++ .../module2/src/module2.kt | 13 ++++++++ .../module2/src/test/JavaRef.java | 9 ++++++ .../SourcePackagePrefix/kotlinProject.iml | 12 +++++++ .../SourcePackagePrefix/kotlinProject.ipr | 14 ++++++++ .../SourcePackagePrefix/src/OtherJava.java | 4 +++ .../general/SourcePackagePrefix/src/Test.java | 7 ++++ .../general/SourcePackagePrefix/src/test.kt | 3 ++ 16 files changed, 162 insertions(+) create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/JavaDependency.java create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/JavaTest.java create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/inBadPrefix.kt create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/isGoodPrefix.kt create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/test/other/otherTest.kt create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/module2.kt create mode 100644 jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/test/JavaRef.java create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefix/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefix/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefix/src/OtherJava.java create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefix/src/Test.java create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefix/src/test.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index f8d4f8cec66..3b31cf01de5 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -225,6 +225,19 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "Test1Kt")) } + public fun testSourcePackagePrefix() { + doTest() + } + + public fun testSourcePackageLongPrefix() { + initProject() + val buildResult = makeAll() + buildResult.assertSuccessful() + val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) + assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 2, warnings.size) + assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText) + } + public fun testKotlinJavaScriptProject() { initProject() addKotlinJavaScriptStdlibDependency() diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/module1.iml b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/module1.iml new file mode 100644 index 00000000000..0e80071dec9 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/module1.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/JavaDependency.java b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/JavaDependency.java new file mode 100644 index 00000000000..a62f5d9cb15 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/JavaDependency.java @@ -0,0 +1,6 @@ +package good.prefix; + +public class JavaDependency { + public void bar() {} +} + diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/JavaTest.java b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/JavaTest.java new file mode 100644 index 00000000000..3274d3549d7 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/JavaTest.java @@ -0,0 +1,6 @@ +package good.prefix; + +public class JavaTest extends JavaDependency { + +} + diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/inBadPrefix.kt b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/inBadPrefix.kt new file mode 100644 index 00000000000..609e07b4c73 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/inBadPrefix.kt @@ -0,0 +1,4 @@ +package bad.prefix + +class KotlinTestInBadPrefix + diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/isGoodPrefix.kt b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/isGoodPrefix.kt new file mode 100644 index 00000000000..90c847137fa --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/isGoodPrefix.kt @@ -0,0 +1,3 @@ +package good.prefix + +class KotlinTestInGoodPrefix \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/test/other/otherTest.kt b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/test/other/otherTest.kt new file mode 100644 index 00000000000..d27a3ac6bf5 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module1/src/test/other/otherTest.kt @@ -0,0 +1,9 @@ +package test.other + +import bad.prefix.KotlinTestInBadPrefix +import good.prefix.KotlinTestInGoodPrefix +import good.prefix.JavaTest; + +val goodTest = KotlinTestInGoodPrefix() +val badTest = KotlinTestInBadPrefix() +val javaTest = JavaTest().bar() diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/module2.iml b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/module2.iml new file mode 100644 index 00000000000..5517bfe3dd6 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/module2.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/module2.kt b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/module2.kt new file mode 100644 index 00000000000..9204cc97b43 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/module2.kt @@ -0,0 +1,13 @@ +package some + +import bad.prefix.KotlinTestInBadPrefix +import good.prefix.KotlinTestInGoodPrefix +import good.prefix.JavaTest; +import test.JavaRef + +val goodTest = KotlinTestInGoodPrefix() +val badTest = KotlinTestInBadPrefix() +val javaTest = JavaTest().bar() +val javaRef = JavaRef().foo(null) + + diff --git a/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/test/JavaRef.java b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/test/JavaRef.java new file mode 100644 index 00000000000..cecb63b8131 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackageLongPrefix/module2/src/test/JavaRef.java @@ -0,0 +1,9 @@ +package test; + +import good.prefix.JavaTest; + +public class JavaRef { + public void foo(JavaTest javaTest) { + + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefix/kotlinProject.iml b/jps/jps-plugin/testData/general/SourcePackagePrefix/kotlinProject.iml new file mode 100644 index 00000000000..cbc89b8246b --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefix/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefix/kotlinProject.ipr b/jps/jps-plugin/testData/general/SourcePackagePrefix/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefix/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefix/src/OtherJava.java b/jps/jps-plugin/testData/general/SourcePackagePrefix/src/OtherJava.java new file mode 100644 index 00000000000..0bb1d196b40 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefix/src/OtherJava.java @@ -0,0 +1,4 @@ +package xxx; + +public class OtherJava { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefix/src/Test.java b/jps/jps-plugin/testData/general/SourcePackagePrefix/src/Test.java new file mode 100644 index 00000000000..7588040949b --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefix/src/Test.java @@ -0,0 +1,7 @@ +package xxx; + +public class Test { + String test(OtherJava otherJava) { + return ""; + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefix/src/test.kt b/jps/jps-plugin/testData/general/SourcePackagePrefix/src/test.kt new file mode 100644 index 00000000000..1059b01fe47 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefix/src/test.kt @@ -0,0 +1,3 @@ +package xxx + +val test = Test().test(null) \ No newline at end of file From 934a969c2fec36ff00c8ceb5df1ad1032816f401 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 9 Nov 2015 20:07:15 +0300 Subject: [PATCH 0638/1557] Restore correct sorting order (after cleanup in eec9d11a) Original commit: 7844030ba4d648cf0795d28f209057e17152674e --- .../jps/build/classFilesComparison/classFilesComparison.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index 4025ae926fd..d9958f56881 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -53,7 +53,7 @@ fun getDirectoryString(dir: File, interestingPaths: List): String { val listFiles = dir.listFiles() assertNotNull(listFiles) - val children = listFiles!!.sortedWith(compareBy ({ it.directory }, { it.name } )) + val children = listFiles!!.sortedWith(compareBy ({ it.isDirectory }, { it.name } )) for (child in children) { if (child.isDirectory()) { p.println(child.name) From ba12afbbb9e4ca52665c6727e4f6d16d1e22a90c Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 9 Nov 2015 15:42:16 +0300 Subject: [PATCH 0639/1557] fix access from tests to internal elements in production code in case of circular dependency Original commit: 5b59fc74bc34c1afe14abd797ae07be6cc05b498 --- .../KotlinBuilderModuleScriptGenerator.java | 20 +++++++++++- .../modules/KotlinModuleXmlBuilder.java | 8 ++++- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 22 +++++++++++++ .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 3 +- .../modules/KotlinModuleXmlGeneratorTest.java | 12 ++++--- .../kotlinProject.ipr | 32 +++++++++++++++++++ .../module1/module1.iml | 15 +++++++++ .../module1/src/a.kt | 9 ++++++ .../module1/test/test_a_1.kt | 3 ++ .../module1/test/test_a_2.kt | 6 ++++ .../module2/module2.iml | 15 +++++++++ .../module2/src/b.kt | 9 ++++++ .../module2/test/test_b_1.kt | 3 ++ .../module2/test/test_b_2.kt | 6 ++++ .../errors.txt | 4 +++ .../kotlinProject.ipr | 32 +++++++++++++++++++ .../module1/module1.iml | 15 +++++++++ .../module1/src/a.kt | 9 ++++++ .../module1/test/test_a_1.kt | 3 ++ .../module1/test/test_a_2.kt | 6 ++++ .../module2/module2.iml | 15 +++++++++ .../module2/src/b.kt | 9 ++++++ .../module2/test/test_b_1.kt | 3 ++ .../module2/test/test_b_2.kt | 6 ++++ 24 files changed, 258 insertions(+), 7 deletions(-) create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/src/a.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_1.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_2.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/src/b.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_1.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_2.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/src/a.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_1.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_2.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/src/b.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_1.kt create mode 100644 jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_2.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 6d146f3274f..13c4b4f7cfe 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -32,6 +32,7 @@ import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.ProjectBuildException; +import org.jetbrains.jps.model.java.JpsJavaExtensionService; import org.jetbrains.kotlin.config.IncrementalCompilation; import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder; @@ -61,6 +62,11 @@ public class KotlinBuilderModuleScriptGenerator { ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger(); for (ModuleBuildTarget target : chunk.getTargets()) { File outputDir = getOutputDirSafe(target); + List friendDirs = new ArrayList(); + File friendDir = getFriendDirSafe(target); + if (friendDir != null) { + friendDirs.add(friendDir); + } List moduleSources = new ArrayList( IncrementalCompilation.isEnabled() @@ -85,7 +91,8 @@ public class KotlinBuilderModuleScriptGenerator { findClassPathRoots(target), (JavaModuleBuildTargetType) targetType, // this excludes the output directories from the class path, to be removed for true incremental compilation - outputDirs + outputDirs, + friendDirs ); } @@ -107,6 +114,17 @@ public class KotlinBuilderModuleScriptGenerator { return outputDir; } + @Nullable + public static File getFriendDirSafe(@NotNull ModuleBuildTarget target) throws ProjectBuildException { + if (!target.isTests()) return null; + + File outputDirForProduction = JpsJavaExtensionService.getInstance().getOutputDirectory(target.getModule(), false); + if (outputDirForProduction == null) { + throw new ProjectBuildException("No output production directory found for " + target); + } + return outputDirForProduction; + } + @NotNull private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { return ContainerUtil.filter(getAllDependencies(target).classes().getRoots(), new Condition() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java index 73cdd88fd4b..4b48e2340e5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.utils.Printer; import java.io.File; import java.util.Collection; +import java.util.Collections; import java.util.List; import java.util.Set; @@ -47,7 +48,8 @@ public class KotlinModuleXmlBuilder { List javaSourceRoots, Collection classpathRoots, JavaModuleBuildTargetType targetType, - Set directoriesToFilterOut + Set directoriesToFilterOut, + @NotNull List friendDirs ) { assert !done : "Already done"; @@ -65,6 +67,10 @@ public class KotlinModuleXmlBuilder { ); p.pushIndent(); + for (File friendDir : friendDirs) { + p.println("<", FRIEND_DIR, " ", PATH, "=\"", getEscapedPath(friendDir), "\"/>"); + } + for (File sourceFile : sourceFiles) { p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>"); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 3b31cf01de5..f6a96f4e6e4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -503,6 +503,21 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) } + public fun testCircularDependenciesSamePackageWithTests() { + initProject() + val result = makeAll() + result.assertSuccessful() + + // Check that outputs are located properly + val facadeWithA = findFileInOutputDir(findModule("module1"), "test/AKt.class") + val facadeWithB = findFileInOutputDir(findModule("module2"), "test/BKt.class") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "funA", "getA") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "funB", "getB", "setB") + + checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage")) + checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) + } + public fun testInternalFromAnotherModule() { initProject() val result = makeAll() @@ -517,6 +532,13 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.checkErrors() } + public fun testCircularDependenciesWrongInternalFromTests() { + initProject() + val result = makeAll() + result.assertFailed() + result.checkErrors() + } + public fun testCircularDependencyWithReferenceToOldVersionLib() { initProject() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 67d05520359..3408e3537e8 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -47,7 +47,8 @@ public class ClasspathOrderTest : TestCaseWithTmpdir() { listOf(JvmSourceRoot(sourceDir)), listOf(PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()), JavaModuleBuildTargetType.PRODUCTION, - setOf() + setOf(), + emptyList() ).asText().toString() val xml = File(tmpdir, "module.xml") diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index a16f2d3ce01..a30b6c775ad 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -34,7 +34,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.singletonList(new JvmSourceRoot(new File("java"), null)), Arrays.asList(new File("cp1"), new File("cp2")), JavaModuleBuildTargetType.PRODUCTION, - Collections.emptySet() + Collections.emptySet(), + Collections.emptyList() ).asText().toString(); KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/basic.xml"), actual); } @@ -47,7 +48,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), JavaModuleBuildTargetType.PRODUCTION, - Collections.singleton(new File("cp1")) + Collections.singleton(new File("cp1")), + Collections.emptyList() ).asText().toString(); KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/filtered.xml"), actual); } @@ -61,7 +63,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), JavaModuleBuildTargetType.PRODUCTION, - Collections.singleton(new File("cp1")) + Collections.singleton(new File("cp1")), + Collections.emptyList() ); builder.addModule( "name2", @@ -70,7 +73,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Collections.emptyList(), Arrays.asList(new File("cp12"), new File("cp22")), JavaModuleBuildTargetType.TEST, - Collections.singleton(new File("cp12")) + Collections.singleton(new File("cp12")), + Collections.emptyList() ); String actual = builder.asText().toString(); KotlinTestUtils.assertEqualsToFile(new File("idea/testData/modules.xml/multiple.xml"), actual); diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/kotlinProject.ipr b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/module1.iml b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/module1.iml new file mode 100644 index 00000000000..a28a2f8285e --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/module1.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/src/a.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/src/a.kt new file mode 100644 index 00000000000..4da8772ebba --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/src/a.kt @@ -0,0 +1,9 @@ +package test + +fun a() { + +} + +internal fun funA() {} + +val a = "" diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_1.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_1.kt new file mode 100644 index 00000000000..e3526b4ac21 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_1.kt @@ -0,0 +1,3 @@ +package test + +internal fun testFunA() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_2.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_2.kt new file mode 100644 index 00000000000..028f7dbaa66 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module1/test/test_a_2.kt @@ -0,0 +1,6 @@ +package test + +fun foo() { + funA() + testFunA() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/module2.iml new file mode 100644 index 00000000000..a2e977d345b --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/module2.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/src/b.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/src/b.kt new file mode 100644 index 00000000000..395d5075411 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/src/b.kt @@ -0,0 +1,9 @@ +package test + +fun b() { + +} + +internal fun funB() {} + +var b = b() diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_1.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_1.kt new file mode 100644 index 00000000000..d6360452cef --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_1.kt @@ -0,0 +1,3 @@ +package test + +internal fun testFunB() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_2.kt b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_2.kt new file mode 100644 index 00000000000..b2dc2d25119 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesSamePackageWithTests/module2/test/test_b_2.kt @@ -0,0 +1,6 @@ +package test + +fun bar() { + funB() + testFunB() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt new file mode 100644 index 00000000000..f6a8fb3be27 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt @@ -0,0 +1,4 @@ +Cannot access 'funA': it is 'internal' in 'test' at line 4, column 5 +Cannot access 'funB': it is 'internal' in 'test' at line 4, column 5 +Cannot access 'testFunA': it is 'internal' in 'test' at line 5, column 5 +Cannot access 'testFunB': it is 'internal' in 'test' at line 5, column 5 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/kotlinProject.ipr b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/module1.iml b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/module1.iml new file mode 100644 index 00000000000..a28a2f8285e --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/module1.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/src/a.kt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/src/a.kt new file mode 100644 index 00000000000..4da8772ebba --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/src/a.kt @@ -0,0 +1,9 @@ +package test + +fun a() { + +} + +internal fun funA() {} + +val a = "" diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_1.kt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_1.kt new file mode 100644 index 00000000000..e3526b4ac21 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_1.kt @@ -0,0 +1,3 @@ +package test + +internal fun testFunA() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_2.kt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_2.kt new file mode 100644 index 00000000000..fb8416d39d3 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module1/test/test_a_2.kt @@ -0,0 +1,6 @@ +package test + +fun foo() { + funB() + testFunB() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/module2.iml b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/module2.iml new file mode 100644 index 00000000000..a2e977d345b --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/module2.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/src/b.kt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/src/b.kt new file mode 100644 index 00000000000..395d5075411 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/src/b.kt @@ -0,0 +1,9 @@ +package test + +fun b() { + +} + +internal fun funB() {} + +var b = b() diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_1.kt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_1.kt new file mode 100644 index 00000000000..d6360452cef --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_1.kt @@ -0,0 +1,3 @@ +package test + +internal fun testFunB() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_2.kt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_2.kt new file mode 100644 index 00000000000..e9ce5c96421 --- /dev/null +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/module2/test/test_b_2.kt @@ -0,0 +1,6 @@ +package test + +fun bar() { + funA() + testFunA() +} \ No newline at end of file From 98bfb09cc03c531435a6edc452c4d5304609feaa Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 6 Nov 2015 18:09:45 +0300 Subject: [PATCH 0640/1557] Minor: get rid of KotlinBuilder.ChangesProcessor Original commit: 3ce84d04e6a9d455f14854f78f025e0f7013b028 --- .../kotlin/jps/build/KotlinBuilder.kt | 36 +++++++++---------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b863f64c767..c9863e67af5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -214,22 +214,28 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } - val marker = ChangesProcessor(context, chunk, allCompiledFiles, caches) - marker.processChanges(changesInfo) + processChanges(context, chunk, allCompiledFiles, caches, changesInfo) return ADDITIONAL_PASS_REQUIRED } - class ChangesProcessor( - val context: CompileContext, - val chunk: ModuleChunk, - val allCompiledFiles: MutableSet, - val caches: List + fun processChanges( + context: CompileContext, + chunk: ModuleChunk, + allCompiledFiles: MutableSet, + caches: List, + changesInfo: ChangesInfo ) { - fun processChanges(changesInfo: ChangesInfo) { - changesInfo.doProcessChanges() + fun recompileInlined() { + for (cache in caches) { + val filesToReinline = cache.getFilesToReinline() + + filesToReinline.forEach { + FSOperations.markDirty(context, CompilationRound.NEXT, it) + } + } } - private fun ChangesInfo.doProcessChanges() { + fun ChangesInfo.doProcessChanges() { fun isKotlin(file: File) = KotlinSourceFileCollector.isKotlinSourceFile(file) fun isNotCompiled(file: File) = file !in allCompiledFiles @@ -253,15 +259,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - private fun recompileInlined() { - for (cache in caches) { - val filesToReinline = cache.getFilesToReinline() - - filesToReinline.forEach { - FSOperations.markDirty(context, CompilationRound.NEXT, it) - } - } - } + changesInfo.doProcessChanges() } private fun doCompileModuleChunk( From 961e8e249dca88206825c29b72145909e19ec3b0 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 10 Nov 2015 15:55:46 +0300 Subject: [PATCH 0641/1557] Minor: re-sort statements in KotlinBuilder::doBuild Original commit: 4caf1b54f70ceb4dbaa852ce9683b7fd3e0cf699 --- .../kotlin/jps/build/KotlinBuilder.kt | 38 +++++++------------ 1 file changed, 13 insertions(+), 25 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index c9863e67af5..8586614bbdd 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -178,6 +178,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val compilationErrors = Utils.ERRORS_DETECTED_KEY[context, false] if (compilationErrors) { LOG.info("Compiled with errors") + return ABORT } else { LOG.info("Compiled successfully") @@ -187,32 +188,22 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR registerOutputItems(outputConsumer, generatedFiles) - context.checkCanceled() - - val isJsModule = JpsUtils.isJsKotlinModule(chunk.representativeTarget()) - val changesInfo: ChangesInfo = when { - isJsModule -> ChangesInfo.NO_CHANGES - else -> { - val generatedClasses = generatedFiles.filterIsInstance() - val info = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles, chunk) - updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) - updateLookupStorage(chunk, lookupTracker, dataManager, dirtyFilesHolder, filesToCompile) - info - } - } - - if (compilationErrors) { - return ABORT - } - - if (isJsModule) { + if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { copyJsLibraryFilesIfNeeded(chunk, project) + return OK } if (!IncrementalCompilation.isEnabled()) { return OK } + context.checkCanceled() + + val generatedClasses = generatedFiles.filterIsInstance() + val changesInfo = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles, chunk) + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) + updateLookupStorage(chunk, lookupTracker, dataManager, dirtyFilesHolder, filesToCompile) + val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } processChanges(context, chunk, allCompiledFiles, caches, changesInfo) return ADDITIONAL_PASS_REQUIRED @@ -393,9 +384,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return sources } - if (!IncrementalCompilation.isEnabled()) { - return - } + assert(IncrementalCompilation.isEnabled()) { "updateJavaMappings should not be called when incremental compilation disabled" } val previousMappings = context.getProjectDescriptor().dataManager.getMappings() val delta = previousMappings.createDelta() @@ -431,9 +420,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR generatedFiles: List, chunk: ModuleChunk ): ChangesInfo { - if (!IncrementalCompilation.isEnabled()) { - return ChangesInfo.NO_CHANGES - } + + assert(IncrementalCompilation.isEnabled()) { "updateKotlinIncrementalCache should not be called when incremental compilation disabled" } chunk.targets.forEach { incrementalCaches[it]!!.saveCacheFormatVersion() } From 6380fab69a15961283fcf191ce2a3426e3cfa10e Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 10 Nov 2015 18:20:22 +0300 Subject: [PATCH 0642/1557] Integrate components of the new incremental compilation Original commit: d4a18a3ef2b06e6ccae52ba6702cb84e649b3d16 --- .../kotlin/jps/build/KotlinBuilder.kt | 36 ++++- .../jps/incremental/IncrementalCacheImpl.kt | 145 ++++++++++++++---- .../kotlin/jps/incremental/LookupStorage.kt | 10 ++ .../jps/incremental/protoDifferenceUtils.kt | 41 +++-- 4 files changed, 181 insertions(+), 51 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 8586614bbdd..d8bf653bbab 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -205,14 +205,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR updateLookupStorage(chunk, lookupTracker, dataManager, dirtyFilesHolder, filesToCompile) val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } - processChanges(context, chunk, allCompiledFiles, caches, changesInfo) + processChanges(context, chunk, filesToCompile.values(), allCompiledFiles, dataManager, caches, changesInfo) + return ADDITIONAL_PASS_REQUIRED } - fun processChanges( + private fun processChanges( context: CompileContext, chunk: ModuleChunk, + compiledFiles: Collection, allCompiledFiles: MutableSet, + dataManager: BuildDataManager, caches: List, changesInfo: ChangesInfo ) { @@ -250,7 +253,34 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - changesInfo.doProcessChanges() + fun ChangesInfo.doProcessChangesUsingLookups() { + val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) + + // TODO group by fqName? + for (change in changes) { + + if (change !is ChangeInfo.MembersChanged) continue + + val files = change.names + .flatMap { lookupStorage.get(LookupSymbol(it, change.fqName.asString())) } + .asSequence() + .map { File(it) } + .filter { it !in compiledFiles && it.exists() } + + files.forEach { + FSOperations.markDirty(context, CompilationRound.NEXT, it) + } + } + + caches.forEach { it.cleanDirtyInlineFunctions() } + } + + if (IncrementalCompilation.isExperimental()) { + changesInfo.doProcessChangesUsingLookups() + } + else { + changesInfo.doProcessChanges() + } } private fun doCompileModuleChunk( diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index a16b0012439..2692a562e7a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.incremental +import com.google.protobuf.MessageLite import com.intellij.openapi.util.io.FileUtil import com.intellij.util.io.BooleanDataDescriptor import com.intellij.util.io.EnumeratorStringDescriptor @@ -28,6 +29,7 @@ import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor +import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder @@ -36,8 +38,12 @@ import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.header.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.kotlin.serialization.ProtoBuf +import org.jetbrains.kotlin.serialization.deserialization.NameResolver import org.jetbrains.kotlin.serialization.jvm.BitEncoding +import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.org.objectweb.asm.* import java.io.File import java.security.MessageDigest @@ -122,10 +128,14 @@ public class IncrementalCacheImpl( dependents.forEach(::addFilesAffectedByChangedInlineFuns) } - dirtyInlineFunctionsMap.clean() + cleanDirtyInlineFunctions() return result.map { File(it) } } + public fun cleanDirtyInlineFunctions() { + dirtyInlineFunctionsMap.clean() + } + override fun getClassFilePath(internalClassName: String): String { return File(outputDir, "$internalClassName.class").canonicalPath } @@ -160,9 +170,11 @@ public class IncrementalCacheImpl( assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) - protoMap.process(kotlinClass, isPackage = true) + + val isPackage = true + + protoMap.process(kotlinClass, isPackage) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass, isPackage) } header.isCompatibleMultifileClassKind() -> { val partNames = kotlinClass.classHeader.filePartClassNames?.toList() @@ -171,21 +183,25 @@ public class IncrementalCacheImpl( // TODO NO_CHANGES? (delegates only, see package facade) constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass, isPackage = true) } header.isCompatibleMultifileClassPartKind() -> { assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) multifileClassPartMap.add(className.internalName, header.multifileClassName!!) - protoMap.process(kotlinClass, isPackage = true) + + val isPackage = true + + protoMap.process(kotlinClass, isPackage) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass, isPackage) } header.isCompatibleClassKind() && !header.isLocalClass -> { - protoMap.process(kotlinClass, isPackage = false) + + val isPackage = false + + protoMap.process(kotlinClass, isPackage) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass, isPackage) } else -> ChangesInfo.NO_CHANGES } @@ -201,12 +217,57 @@ public class IncrementalCacheImpl( } public fun clearCacheForRemovedClasses(): ChangesInfo { + + fun T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List) = + members.flatMap { this.it().filterNot { it.isPrivate }.names(nameResolver) }.toSet() + + fun createChangeInfo(className: JvmClassName): ChangeInfo? { + if (className.internalName == MODULE_MAPPING_FILE_NAME) return null + + val mapValue = protoMap.get(className) ?: return null + + return when { + mapValue.isPackageFacade -> { + val packageData = JvmProtoBufUtil.readPackageDataFrom(mapValue.bytes, mapValue.strings) + + val memberNames = + packageData.packageProto.getNonPrivateNames( + packageData.nameResolver, + ProtoBuf.Package::getFunctionList, + ProtoBuf.Package::getPropertyList + ) + + ChangeInfo.Removed(className.packageFqName, memberNames) + } + else -> { + val classData = JvmProtoBufUtil.readClassDataFrom(mapValue.bytes, mapValue.strings) + + val memberNames = + classData.classProto.getNonPrivateNames( + classData.nameResolver, + ProtoBuf.Class::getConstructorList, + ProtoBuf.Class::getFunctionList, + ProtoBuf.Class::getPropertyList + ) + + classData.classProto.enumEntryList.map { classData.nameResolver.getString(it) }.toSet() + + ChangeInfo.Removed(className.fqNameForClassNameWithoutDollars, memberNames) + } + } + } + val dirtyClasses = dirtyOutputClassesMap .getDirtyOutputClasses() .map(JvmClassName::byInternalName) .toList() - val changesInfo = dirtyClasses.fold(ChangesInfo.NO_CHANGES) { info, className -> + val changes = + if (IncrementalCompilation.isExperimental()) + dirtyClasses.map { createChangeInfo(it) }.asSequence().filterNotNull() + else + emptySequence() + + val changesInfo = dirtyClasses.fold(ChangesInfo(changes = changes)) { info, className -> val newInfo = ChangesInfo(protoChanged = className in protoMap, constantsChanged = className in constantsMap) newInfo.logIfSomethingChanged(className) @@ -268,10 +329,10 @@ public class IncrementalCacheImpl( private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { - public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean, checkChangesIsOpenPart: Boolean = true): ChangesInfo { + public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): ChangesInfo { val header = kotlinClass.classHeader val bytes = BitEncoding.decodeBytes(header.annotationData!!) - return put(kotlinClass.className, bytes, header.strings!!, isPackage, checkChangesIsOpenPart) + return put(kotlinClass.className, bytes, header.strings!!, isPackage, checkChangesIsOpenPart = true) } public fun process(className: JvmClassName, data: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { @@ -288,13 +349,27 @@ public class IncrementalCacheImpl( if (oldData == null || !Arrays.equals(bytes, oldData.bytes) || !Arrays.equals(strings, oldData.strings) || - isPackage != oldData.isPackageFacade) { + isPackage != oldData.isPackageFacade + ) { storage[key] = data } - return ChangesInfo(protoChanged = oldData == null || - !checkChangesIsOpenPart || - difference(oldData, data) != DifferenceKind.NONE) + if (oldData == null || !checkChangesIsOpenPart) return ChangesInfo(protoChanged = true) + + val diff = difference(oldData, data) + + if (!IncrementalCompilation.isExperimental()) return ChangesInfo(protoChanged = diff != DifferenceKind.NONE) + + val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars + + val changes = + when (diff) { + is DifferenceKind.NONE -> emptySequence() + is DifferenceKind.CLASS_SIGNATURE -> sequenceOf(ChangeInfo.SignatureChanged(fqName)) + is DifferenceKind.MEMBERS -> sequenceOf(ChangeInfo.MembersChanged(fqName, diff.names)) + } + + return ChangesInfo(protoChanged = diff != DifferenceKind.NONE, changes = changes) } public fun contains(className: JvmClassName): Boolean = @@ -388,11 +463,11 @@ public class IncrementalCacheImpl( return result } - public fun process(kotlinClass: LocalFileKotlinClass): ChangesInfo { - return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents)) + public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): ChangesInfo { + return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents), isPackage) } - private fun put(className: JvmClassName, newMap: Map): ChangesInfo { + private fun put(className: JvmClassName, newMap: Map, isPackage: Boolean): ChangesInfo { val internalName = className.internalName val oldMap = storage[internalName] ?: emptyMap() @@ -419,8 +494,19 @@ public class IncrementalCacheImpl( dirtyInlineFunctionsMap.put(className, changed.toList()) } + val changes = + if (IncrementalCompilation.isExperimental()) { + val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars + // TODO get name in better way instead of using substringBefore + (added.asSequence() + changed.asSequence()).map { ChangeInfo.MembersChanged(fqName, listOf(it.substringBefore("("))) } + } + else { + emptySequence() + } + return ChangesInfo(inlineChanged = changed.isNotEmpty(), - inlineAdded = added.isNotEmpty()) + inlineAdded = added.isNotEmpty(), + changes = changes) } public fun remove(className: JvmClassName) { @@ -559,11 +645,18 @@ public class IncrementalCacheImpl( } } +sealed class ChangeInfo(val fqName: FqName) { + open class MembersChanged(fqName: FqName, val names: Collection) : ChangeInfo(fqName) + class Removed(fqName: FqName, names: Collection) : MembersChanged(fqName, names) + class SignatureChanged(fqName: FqName) : ChangeInfo(fqName) +} + data class ChangesInfo( - public val protoChanged: Boolean = false, - public val constantsChanged: Boolean = false, - public val inlineChanged: Boolean = false, - public val inlineAdded: Boolean = false + val protoChanged: Boolean = false, + val constantsChanged: Boolean = false, + val inlineChanged: Boolean = false, + val inlineAdded: Boolean = false, + val changes: Sequence = emptySequence() ) { companion object { public val NO_CHANGES: ChangesInfo = ChangesInfo() @@ -573,7 +666,8 @@ data class ChangesInfo( ChangesInfo(protoChanged || other.protoChanged, constantsChanged || other.constantsChanged, inlineChanged || other.inlineChanged, - inlineAdded || other.inlineAdded) + inlineAdded || other.inlineAdded, + changes + other.changes) } @@ -607,9 +701,6 @@ private fun ByteArray.md5(): Long { ) } -private val File.normalizedPath: String - get() = FileUtil.toSystemIndependentName(canonicalPath) - @TestOnly private fun , V> Map.dumpMap(dumpValue: (V)->String): String = StringBuilder { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt index 349981a99e9..cf32e331995 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt @@ -55,6 +55,16 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { } } + fun get(lookupSymbol: LookupSymbol): Collection { + val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope) + val fileIds = lookupMap[key] ?: return emptySet() + + return fileIds.map { + // null means it's outdated + idToFile[it]?.path + }.filterNotNull() + } + public fun add(lookupSymbol: LookupSymbol, containingPaths: Collection) { val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope) val fileIds = containingPaths.map { addFileIfNeeded(File(it)) }.toHashSet() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 09191759457..5124aa85eda 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -44,6 +44,26 @@ public fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): Differenc return differenceObject.difference() } +internal val MessageLite.isPrivate: Boolean + get() = Visibilities.isPrivate(Deserialization.visibility( + when (this) { + is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags) + is ProtoBuf.Function -> Flags.VISIBILITY.get(flags) + is ProtoBuf.Property -> Flags.VISIBILITY.get(flags) + else -> error("Unknown message: $this") + })) + +private fun MessageLite.name(nameResolver: NameResolver): String { + return when (this) { + is ProtoBuf.Constructor -> "" + is ProtoBuf.Function -> nameResolver.getString(name) + is ProtoBuf.Property -> nameResolver.getString(name) + else -> error("Unknown message: $this") + } +} + +internal fun List.names(nameResolver: NameResolver): List = map { it.name(nameResolver) } + private abstract class DifferenceCalculator() { protected abstract val oldNameResolver: NameResolver protected abstract val newNameResolver: NameResolver @@ -57,9 +77,6 @@ private abstract class DifferenceCalculator() { protected fun calcDifferenceForMembers(oldList: List, newList: List): Collection { val result = hashSetOf() - fun List.names(nameResolver: NameResolver): List = - map { it.name(nameResolver) } - val oldMap = oldList.groupBy { it.getHashCode({ compareObject.oldGetIndexOfString(it) }, { compareObject.oldGetIndexOfClassId(it) }) } val newMap = @@ -114,15 +131,6 @@ private abstract class DifferenceCalculator() { return HashSetUtil.symmetricDifference(oldNames, newNames) } - protected val MessageLite.isPrivate: Boolean - get() = Visibilities.isPrivate(Deserialization.visibility( - when (this) { - is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags) - is ProtoBuf.Function -> Flags.VISIBILITY.get(flags) - is ProtoBuf.Property -> Flags.VISIBILITY.get(flags) - else -> error("Unknown message: $this") - })) - private fun MessageLite.getHashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { return when (this) { is ProtoBuf.Constructor -> hashCode(stringIndexes, fqNameIndexes) @@ -132,15 +140,6 @@ private abstract class DifferenceCalculator() { } } - private fun MessageLite.name(nameResolver: NameResolver): String { - return when (this) { - is ProtoBuf.Constructor -> "" - is ProtoBuf.Function -> nameResolver.getString(name) - is ProtoBuf.Property -> nameResolver.getString(name) - else -> error("Unknown message: $this") - } - } - private fun ProtoCompareGenerated.checkEquals(old: MessageLite, new: MessageLite): Boolean { return when { old is ProtoBuf.Constructor && new is ProtoBuf.Constructor -> checkEquals(old, new) From 5134cf464c0d40c4262423c971574d2c56ebd9ea Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 11 Nov 2015 20:30:41 +0300 Subject: [PATCH 0643/1557] ChangesInfo -> CompilationResult Original commit: f144bb38dad1c91fac1c3d2818a37b9d46fb3bda --- .../kotlin/jps/build/KotlinBuilder.kt | 14 ++--- .../jps/incremental/IncrementalCacheImpl.kt | 58 +++++++++---------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index d8bf653bbab..c50acc74e42 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -217,7 +217,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR allCompiledFiles: MutableSet, dataManager: BuildDataManager, caches: List, - changesInfo: ChangesInfo + compilationResult: CompilationResult ) { fun recompileInlined() { for (cache in caches) { @@ -229,7 +229,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - fun ChangesInfo.doProcessChanges() { + fun CompilationResult.doProcessChanges() { fun isKotlin(file: File) = KotlinSourceFileCollector.isKotlinSourceFile(file) fun isNotCompiled(file: File) = file !in allCompiledFiles @@ -253,7 +253,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - fun ChangesInfo.doProcessChangesUsingLookups() { + fun CompilationResult.doProcessChangesUsingLookups() { val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) // TODO group by fqName? @@ -276,10 +276,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (IncrementalCompilation.isExperimental()) { - changesInfo.doProcessChangesUsingLookups() + compilationResult.doProcessChangesUsingLookups() } else { - changesInfo.doProcessChanges() + compilationResult.doProcessChanges() } } @@ -449,13 +449,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR incrementalCaches: Map, generatedFiles: List, chunk: ModuleChunk - ): ChangesInfo { + ): CompilationResult { assert(IncrementalCompilation.isEnabled()) { "updateKotlinIncrementalCache should not be called when incremental compilation disabled" } chunk.targets.forEach { incrementalCaches[it]!!.saveCacheFormatVersion() } - var changesInfo = ChangesInfo.NO_CHANGES + var changesInfo = CompilationResult.NO_CHANGES for (generatedFile in generatedFiles) { val ic = incrementalCaches[generatedFile.target]!! val newChangesInfo = diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 2692a562e7a..78f0baed915 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -144,15 +144,15 @@ public class IncrementalCacheImpl( cacheFormatVersion.saveIfNeeded() } - public fun saveModuleMappingToCache(sourceFiles: Collection, file: File): ChangesInfo { + public fun saveModuleMappingToCache(sourceFiles: Collection, file: File): CompilationResult { val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME) protoMap.process(jvmClassName, file.readBytes(), emptyArray(), isPackage = false, checkChangesIsOpenPart = false) dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME) sourceFiles.forEach { sourceToClassesMap.add(it, jvmClassName) } - return ChangesInfo.NO_CHANGES + return CompilationResult.NO_CHANGES } - public fun saveFileToCache(generatedClass: GeneratedJvmClass): ChangesInfo { + public fun saveFileToCache(generatedClass: GeneratedJvmClass): CompilationResult { val sourceFiles: Collection = generatedClass.sourceFiles val kotlinClass: LocalFileKotlinClass = generatedClass.outputClass val className = JvmClassName.byClassId(kotlinClass.classId) @@ -203,20 +203,20 @@ public class IncrementalCacheImpl( constantsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass, isPackage) } - else -> ChangesInfo.NO_CHANGES + else -> CompilationResult.NO_CHANGES } changesInfo.logIfSomethingChanged(className) return changesInfo } - private fun ChangesInfo.logIfSomethingChanged(className: JvmClassName) { - if (this == ChangesInfo.NO_CHANGES) return + private fun CompilationResult.logIfSomethingChanged(className: JvmClassName) { + if (this == CompilationResult.NO_CHANGES) return KotlinBuilder.LOG.debug("$className is changed: $this") } - public fun clearCacheForRemovedClasses(): ChangesInfo { + public fun clearCacheForRemovedClasses(): CompilationResult { fun T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List) = members.flatMap { this.it().filterNot { it.isPrivate }.names(nameResolver) }.toSet() @@ -267,9 +267,9 @@ public class IncrementalCacheImpl( else emptySequence() - val changesInfo = dirtyClasses.fold(ChangesInfo(changes = changes)) { info, className -> - val newInfo = ChangesInfo(protoChanged = className in protoMap, - constantsChanged = className in constantsMap) + val changesInfo = dirtyClasses.fold(CompilationResult(changes = changes)) { info, className -> + val newInfo = CompilationResult(protoChanged = className in protoMap, + constantsChanged = className in constantsMap) newInfo.logIfSomethingChanged(className) info + newInfo } @@ -329,19 +329,19 @@ public class IncrementalCacheImpl( private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { - public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): ChangesInfo { + public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { val header = kotlinClass.classHeader val bytes = BitEncoding.decodeBytes(header.annotationData!!) return put(kotlinClass.className, bytes, header.strings!!, isPackage, checkChangesIsOpenPart = true) } - public fun process(className: JvmClassName, data: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean): ChangesInfo { + public fun process(className: JvmClassName, data: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean): CompilationResult { return put(className, data, strings, isPackage, checkChangesIsOpenPart) } private fun put( className: JvmClassName, bytes: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean - ): ChangesInfo { + ): CompilationResult { val key = className.internalName val oldData = storage[key] val data = ProtoMapValue(isPackage, bytes, strings) @@ -354,11 +354,11 @@ public class IncrementalCacheImpl( storage[key] = data } - if (oldData == null || !checkChangesIsOpenPart) return ChangesInfo(protoChanged = true) + if (oldData == null || !checkChangesIsOpenPart) return CompilationResult(protoChanged = true) val diff = difference(oldData, data) - if (!IncrementalCompilation.isExperimental()) return ChangesInfo(protoChanged = diff != DifferenceKind.NONE) + if (!IncrementalCompilation.isExperimental()) return CompilationResult(protoChanged = diff != DifferenceKind.NONE) val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars @@ -369,7 +369,7 @@ public class IncrementalCacheImpl( is DifferenceKind.MEMBERS -> sequenceOf(ChangeInfo.MembersChanged(fqName, diff.names)) } - return ChangesInfo(protoChanged = diff != DifferenceKind.NONE, changes = changes) + return CompilationResult(protoChanged = diff != DifferenceKind.NONE, changes = changes) } public fun contains(className: JvmClassName): Boolean = @@ -407,15 +407,15 @@ public class IncrementalCacheImpl( fun contains(className: JvmClassName): Boolean = className.internalName in storage - public fun process(kotlinClass: LocalFileKotlinClass): ChangesInfo { + public fun process(kotlinClass: LocalFileKotlinClass): CompilationResult { return put(kotlinClass.className, getConstantsMap(kotlinClass.fileContents)) } - private fun put(className: JvmClassName, constantsMap: Map?): ChangesInfo { + private fun put(className: JvmClassName, constantsMap: Map?): CompilationResult { val key = className.getInternalName() val oldMap = storage[key] - if (oldMap == constantsMap) return ChangesInfo.NO_CHANGES + if (oldMap == constantsMap) return CompilationResult.NO_CHANGES if (constantsMap != null) { storage[key] = constantsMap @@ -424,7 +424,7 @@ public class IncrementalCacheImpl( storage.remove(key) } - return ChangesInfo(constantsChanged = true) + return CompilationResult(constantsChanged = true) } public fun remove(className: JvmClassName) { @@ -463,11 +463,11 @@ public class IncrementalCacheImpl( return result } - public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): ChangesInfo { + public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents), isPackage) } - private fun put(className: JvmClassName, newMap: Map, isPackage: Boolean): ChangesInfo { + private fun put(className: JvmClassName, newMap: Map, isPackage: Boolean): CompilationResult { val internalName = className.internalName val oldMap = storage[internalName] ?: emptyMap() @@ -504,9 +504,9 @@ public class IncrementalCacheImpl( emptySequence() } - return ChangesInfo(inlineChanged = changed.isNotEmpty(), - inlineAdded = added.isNotEmpty(), - changes = changes) + return CompilationResult(inlineChanged = changed.isNotEmpty(), + inlineAdded = added.isNotEmpty(), + changes = changes) } public fun remove(className: JvmClassName) { @@ -651,7 +651,7 @@ sealed class ChangeInfo(val fqName: FqName) { class SignatureChanged(fqName: FqName) : ChangeInfo(fqName) } -data class ChangesInfo( +data class CompilationResult( val protoChanged: Boolean = false, val constantsChanged: Boolean = false, val inlineChanged: Boolean = false, @@ -659,11 +659,11 @@ data class ChangesInfo( val changes: Sequence = emptySequence() ) { companion object { - public val NO_CHANGES: ChangesInfo = ChangesInfo() + public val NO_CHANGES: CompilationResult = CompilationResult() } - public fun plus(other: ChangesInfo): ChangesInfo = - ChangesInfo(protoChanged || other.protoChanged, + public fun plus(other: CompilationResult): CompilationResult = + CompilationResult(protoChanged || other.protoChanged, constantsChanged || other.constantsChanged, inlineChanged || other.inlineChanged, inlineAdded || other.inlineAdded, From b00f51c52355f24be780663b16da5bbd3c61c551 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Sat, 7 Nov 2015 01:45:58 +0300 Subject: [PATCH 0644/1557] Make accessingFunctionsViaRenamedFileClass test more sensible Original commit: 5ca7ce2b504587c77d54ebb291543ef6d0c43d66 --- .../accessingFunctionsViaRenamedFileClass/build.log | 6 +++--- .../accessingFunctionsViaRenamedFileClass/usage.kt.new | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt.new diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log index 0ec1f516f0d..594dd4f9802 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log @@ -1,18 +1,18 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/BKt.class -out/production/module/test/UsageKt.class End of files Compiling files: src/b.kt -src/usage.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class out/production/module/test/AKt.class +out/production/module/test/UsageKt.class End of files Compiling files: src/a.kt src/other.kt -End of files \ No newline at end of file +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt.new deleted file mode 100644 index db702d74fea..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/usage.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package test - -fun main(args: Array) { - println(a() + b() + other.other()) -} \ No newline at end of file From f6add8e64717f15df00ae1918ee34fef6ad95fb8 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 6 Nov 2015 22:33:52 +0300 Subject: [PATCH 0645/1557] Add the ability to have separate log file for experimental incremental compilation tests Original commit: 5a6c04357bd052d052b931cc0458b32cb6d40ab2 --- .../jps/build/AbstractIncrementalJpsTest.kt | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index fb378feb85f..5e2cbda7856 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -46,8 +46,8 @@ import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories -import org.jetbrains.kotlin.jps.incremental.LookupStorageProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget +import org.jetbrains.kotlin.jps.incremental.LookupStorageProvider import org.jetbrains.kotlin.jps.incremental.LookupSymbol import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.test.KotlinTestUtils @@ -323,7 +323,19 @@ public abstract class AbstractIncrementalJpsTest( val otherMakeResults = performModificationsAndMake(moduleNames) val buildLogFile = File(testDataDir, "build.log") - if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) { + val fullBuildLogFile = File(testDataDir, "experimental-ic-build.log") + + if (enableExperimentalIncrementalCompilation && fullBuildLogFile.exists()) { + val logs = buildString { + otherMakeResults.forEachIndexed { i, makeResult -> + append("\n========== Step #${i + 1} ============\n\n") + append(makeResult.log) + } + } + + UsefulTestCase.assertSameLinesWithFile(fullBuildLogFile.absolutePath, logs) + } + else if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) { val logs = otherMakeResults.joinToString("\n\n") { it.log } UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs) } From e6493a0f39db7676d029b8298d1934bb1d135fe0 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 9 Nov 2015 20:32:17 +0300 Subject: [PATCH 0646/1557] Add separate build logs for tests which result is different in the new incremental compilation Original commit: e1ad9428041ea541c072bb8978c4e85c747d0d10 --- .../experimental-ic-build.log | 9 +++++++ .../experimental-ic-build.log | 9 +++++++ .../experimental-ic-build.log | 16 +++++++++++ .../classRecreated/experimental-ic-build.log | 13 +++++++++ .../experimental-ic-build.log | 20 ++++++++++++++ .../experimental-ic-build.log | 20 ++++++++++++++ .../experimental-ic-build.log | 27 +++++++++++++++++++ .../experimental-ic-build.log | 18 +++++++++++++ .../experimental-ic-build.log | 17 ++++++++++++ .../experimental-ic-build.log | 11 ++++++++ .../experimental-ic-build.log | 15 +++++++++++ .../experimental-ic-build.log | 8 ++++++ .../experimental-ic-build.log | 8 ++++++ .../experimental-ic-build.log | 16 +++++++++++ .../experimental-ic-build.log | 9 +++++++ .../experimental-ic-build.log | 5 ++++ .../experimental-ic-build.log | 9 +++++++ .../experimental-ic-build.log | 18 +++++++++++++ .../experimental-ic-build.log | 18 +++++++++++++ .../experimental-ic-build.log | 12 +++++++++ .../experimental-ic-build.log | 15 +++++++++++ .../experimental-ic-build.log | 15 +++++++++++ .../experimental-ic-build.log | 9 +++++++ .../experimental-ic-build.log | 11 ++++++++ 24 files changed, 328 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log new file mode 100644 index 00000000000..11f21fb526c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log @@ -0,0 +1,9 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module2/b/B.class +out/production/module2/b/BB.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log new file mode 100644 index 00000000000..add1ba50857 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log @@ -0,0 +1,9 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/b/Module2_bKt.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log new file mode 100644 index 00000000000..0f09acccc1b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log @@ -0,0 +1,16 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/BKt.class +End of files +Compiling files: +src/b.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log new file mode 100644 index 00000000000..e3586e8ec1b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log @@ -0,0 +1,13 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/test/A.class +End of files +Compiling files: +End of files + +========== Step #2 ============ + +Compiling files: +src/A.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log new file mode 100644 index 00000000000..ae6bd400db6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log @@ -0,0 +1,20 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/OtherKt.class +End of files +Cleaning output files: +out/production/module/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Expecting an expression + +========== Step #2 ============ + +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log new file mode 100644 index 00000000000..dad5c23cd2b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log @@ -0,0 +1,20 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/OtherKt.class +out/production/module/UsageKt.class +End of files +Compiling files: +src/other.kt +src/usage.kt +End of files +COMPILATION FAILED +Expecting an expression + +========== Step #2 ============ + +Compiling files: +src/other.kt +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log new file mode 100644 index 00000000000..874325ec77e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log @@ -0,0 +1,27 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/B.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UsageKt.class +End of files +Compiling files: +src/other.kt +src/usage.kt +End of files +COMPILATION FAILED +Expecting an expression + +========== Step #2 ============ + +Compiling files: +src/other.kt +src/usage.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..a8962cfce80 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log @@ -0,0 +1,18 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/ConstKt.class +End of files +Compiling files: +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Unresolved reference: test +An annotation parameter must be a compile-time constant diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..bae88050a02 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log @@ -0,0 +1,17 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/InlineKt.class +End of files +Compiling files: +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files +COMPILATION FAILED +Unresolved reference: test diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log new file mode 100644 index 00000000000..909d7b3fda0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log @@ -0,0 +1,11 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/CKt.class +out/production/module/foo/BKt.class +End of files +Compiling files: +src/b.kt +src/c.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log new file mode 100644 index 00000000000..1e504bef642 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log @@ -0,0 +1,15 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/Y.class +End of files +Compiling files: +src/fun.kt +End of files +Cleaning output files: +out/production/module/X$main$1.class +out/production/module/X.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log new file mode 100644 index 00000000000..65089e0ba9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log @@ -0,0 +1,8 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log new file mode 100644 index 00000000000..65089e0ba9e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log @@ -0,0 +1,8 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/test/ClassA.class +End of files +Compiling files: +src/ClassA.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log new file mode 100644 index 00000000000..1dd7e7f2c23 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log @@ -0,0 +1,16 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Test.class +out/production/module/test/Test__AKt.class +End of files +Compiling files: +src/a.kt +End of files + +========== Step #2 ============ + +Compiling files: +src/b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log new file mode 100644 index 00000000000..0b96a15cb01 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log @@ -0,0 +1,9 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/b/B2Kt.class +End of files +Compiling files: +src/a2.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log new file mode 100644 index 00000000000..580cd05304e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log @@ -0,0 +1,5 @@ +========== Step #1 ============ + +Compiling files: +src/b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log new file mode 100644 index 00000000000..546e71f3b7a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log @@ -0,0 +1,9 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/BKt.class +End of files +Compiling files: +src/b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..8f2ecfb095b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log @@ -0,0 +1,18 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/AKt.class +End of files +Compiling files: +src/a.kt +End of files + +========== Step #2 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/BKt.class +End of files +Compiling files: +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..9eaab4e1e33 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log @@ -0,0 +1,18 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/BKt.class +End of files +Compiling files: +End of files + +========== Step #2 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/other/OtherKt.class +End of files +Compiling files: +src/other.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log new file mode 100644 index 00000000000..0de8b9692ed --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log @@ -0,0 +1,12 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Utils.class +out/production/module/test/Utils__Pkg1Kt.class +out/production/module/test/Utils__Pkg2Kt.class +End of files +Compiling files: +src/pkg1.kt +src/pkg2.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log new file mode 100644 index 00000000000..e428033a4bc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log @@ -0,0 +1,15 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/AKt.class +End of files +Compiling files: +src/a.kt +End of files + +========== Step #2 ============ + +Compiling files: +src/b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log new file mode 100644 index 00000000000..5f849f157f0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log @@ -0,0 +1,15 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/FunKt.class +End of files +Compiling files: +src/fun.kt +End of files +Cleaning output files: +out/production/module/JavaUsage.class +End of files +Compiling files: +src/JavaUsage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..546e71f3b7a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log @@ -0,0 +1,9 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/BKt.class +End of files +Compiling files: +src/b.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log new file mode 100644 index 00000000000..268ab61c9df --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log @@ -0,0 +1,11 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/Usage.class +End of files +Compiling files: +src/b.kt +End of files +Compiling files: +src/Usage.java +End of files From 8c43a177db75887f8a047e83cde3bc04c4d97466 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 11 Nov 2015 22:27:31 +0300 Subject: [PATCH 0647/1557] Add new tests for incremental compilation and disable the one for current IC Original commit: ca71f929f9b31b82c4c112f69c6d75613cd38394 --- .../jps/build/AbstractIncrementalJpsTest.kt | 2 ++ ...perimentalIncrementalJpsTestGenerated.java | 12 ++++++++++ .../build/IncrementalJpsTestGenerated.java | 12 ++++++++++ .../build.log | 14 +++++++++++ ...nt-check-caches-in-non-experimental-ic.txt | 0 .../experimental-ic-build.log | 23 +++++++++++++++++++ .../usage1.kt | 5 ++++ .../usage1.kt.new | 5 ++++ .../usage2.kt | 3 +++ .../pureKotlin/changeWithRemovingUsage/bar.kt | 3 +++ .../changeWithRemovingUsage/bar.kt.delete | 0 .../changeWithRemovingUsage/build.log | 10 ++++++++ .../experimental-ic-build.log | 12 ++++++++++ .../pureKotlin/changeWithRemovingUsage/foo.kt | 3 +++ .../changeWithRemovingUsage/foo.kt.new | 3 +++ 15 files changed, 107 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dont-check-caches-in-non-experimental-ic.txt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 5e2cbda7856..23f6b5d89c9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -340,6 +340,8 @@ public abstract class AbstractIncrementalJpsTest( UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs) } + if (!enableExperimentalIncrementalCompilation && File(testDataDir, "dont-check-caches-in-non-experimental-ic.txt").exists()) return + val lastMakeResult = otherMakeResults.last() rebuildAndCheckOutput(lastMakeResult) clearCachesRebuildAndCheckOutput(lastMakeResult) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 3c555c78eae..83368bbcf34 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -185,6 +185,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("changeTypeImplicitlyWithCircularDependency") + public void testChangeTypeImplicitlyWithCircularDependency() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/"); + doTest(fileName); + } + + @TestMetadata("changeWithRemovingUsage") + public void testChangeWithRemovingUsage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/"); + doTest(fileName); + } + @TestMetadata("classInlineFunctionChanged") public void testClassInlineFunctionChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index bd0218cefb6..6fa3e46f594 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -185,6 +185,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("changeTypeImplicitlyWithCircularDependency") + public void testChangeTypeImplicitlyWithCircularDependency() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/"); + doTest(fileName); + } + + @TestMetadata("changeWithRemovingUsage") + public void testChangeWithRemovingUsage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/"); + doTest(fileName); + } + @TestMetadata("classInlineFunctionChanged") public void testClassInlineFunctionChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log new file mode 100644 index 00000000000..9dd9067ed02 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Usage1Kt.class +End of files +Compiling files: +src/usage1.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Usage2Kt.class +End of files +Compiling files: +src/usage2.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dont-check-caches-in-non-experimental-ic.txt b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/dont-check-caches-in-non-experimental-ic.txt new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log new file mode 100644 index 00000000000..6e1cc4cca29 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log @@ -0,0 +1,23 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Usage1Kt.class +End of files +Compiling files: +src/usage1.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Usage2Kt.class +End of files +Compiling files: +src/usage2.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Usage1Kt.class +End of files +Compiling files: +src/usage1.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt new file mode 100644 index 00000000000..6b9eeddad03 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt @@ -0,0 +1,5 @@ +package test + +fun foo() = "" + +fun baz() = bar() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new new file mode 100644 index 00000000000..8acd1a28007 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage1.kt.new @@ -0,0 +1,5 @@ +package test + +fun foo() = 1 + +fun baz() = bar() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt new file mode 100644 index 00000000000..07980db6a94 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/usage2.kt @@ -0,0 +1,3 @@ +package test + +fun bar() = foo() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt new file mode 100644 index 00000000000..07980db6a94 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt @@ -0,0 +1,3 @@ +package test + +fun bar() = foo() diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/bar.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log new file mode 100644 index 00000000000..55e24cd49c0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log @@ -0,0 +1,10 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/BarKt.class +End of files +Cleaning output files: +out/production/module/test/FooKt.class +End of files +Compiling files: +src/foo.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log new file mode 100644 index 00000000000..e738a4a0702 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log @@ -0,0 +1,12 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/BarKt.class +End of files +Cleaning output files: +out/production/module/test/FooKt.class +End of files +Compiling files: +src/foo.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt new file mode 100644 index 00000000000..b17f6633603 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt @@ -0,0 +1,3 @@ +package test + +fun foo() = "" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new new file mode 100644 index 00000000000..8a4c388ca29 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/foo.kt.new @@ -0,0 +1,3 @@ +package test + +fun foo() = 1 From 2e3d3a5117e7ed0f58f6142bcdebcb3867ad1432 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 12 Nov 2015 15:35:16 +0300 Subject: [PATCH 0648/1557] Minor: add more logging to KotlinBuilder Original commit: b7772f32ceedd2326f82d16d737a7e103a84c76c --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 14 ++++++++++++++ .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 13 ++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index c50acc74e42..a7babd80097 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -90,6 +90,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR override fun buildStarted(context: CompileContext) { LOG.debug("==========================================") LOG.info("is Kotlin incremental compilation enabled: ${IncrementalCompilation.isEnabled()}") + LOG.info("is Kotlin experimental incremental compilation enabled: ${IncrementalCompilation.isExperimental()}") val historyLabel = context.getBuilderParameter("history label") if (historyLabel != null) { @@ -165,6 +166,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val allCompiledFiles = getAllCompiledFilesContainer(context) val filesToCompile = KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder) + + LOG.debug("Compiling files: ${filesToCompile.values()}") + val start = System.nanoTime() val outputItemCollector = doCompileModuleChunk(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, incrementalCaches, messageCollector, project) @@ -233,6 +237,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR fun isKotlin(file: File) = KotlinSourceFileCollector.isKotlinSourceFile(file) fun isNotCompiled(file: File) = file !in allCompiledFiles + LOG.debug("compilationResult = $this") + when { inlineAdded -> { allCompiledFiles.clear() @@ -256,8 +262,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR fun CompilationResult.doProcessChangesUsingLookups() { val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) + LOG.debug("Start processing changes") + // TODO group by fqName? for (change in changes) { + LOG.debug("Process $change") if (change !is ChangeInfo.MembersChanged) continue @@ -266,12 +275,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR .asSequence() .map { File(it) } .filter { it !in compiledFiles && it.exists() } + .toList() + + LOG.debug("Mark dirty files: $files") files.forEach { FSOperations.markDirty(context, CompilationRound.NEXT, it) } } + LOG.debug("End of processing changes") + caches.forEach { it.cleanDirtyInlineFunctions() } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 78f0baed915..7e33f356920 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -646,9 +646,20 @@ public class IncrementalCacheImpl( } sealed class ChangeInfo(val fqName: FqName) { - open class MembersChanged(fqName: FqName, val names: Collection) : ChangeInfo(fqName) + open class MembersChanged(fqName: FqName, val names: Collection) : ChangeInfo(fqName) { + override fun toStringProperties(): String = super.toStringProperties() + ", names = $names" + } + class Removed(fqName: FqName, names: Collection) : MembersChanged(fqName, names) + class SignatureChanged(fqName: FqName) : ChangeInfo(fqName) + + + protected open fun toStringProperties(): String = "fqName = $fqName" + + override fun toString(): String { + return this.javaClass.simpleName + "(${toStringProperties()})" + } } data class CompilationResult( From e5cb56662e6aa7339b6474ee63ddf8acc0bb9547 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 12 Nov 2015 17:13:26 +0100 Subject: [PATCH 0649/1557] Disabling parallel builds without daemon again and undoing apprpriate fix to broken tests problem, since it effectively cancelled fix for parallel building itself and was causing exceptions on heavy builds (cherry picked from commit 0610452) Original commit: 4643d7fc4d91979370b06abbf5a5d4a5873a9f77 --- .../org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index 6f93cb03680..cc97d0376f3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -70,7 +70,7 @@ public class CompilerRunnerUtil { } @Nullable - public static Object invokeExecMethod( + public synchronized static Object invokeExecMethod( @NotNull String compilerClassName, @NotNull String[] arguments, @NotNull CompilerEnvironment environment, From 6f3c2c14932de9cd58dd252b155edf1968371ba7 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 9 Nov 2015 22:32:39 +0300 Subject: [PATCH 0650/1557] Test that fails with package prefixes but works good without them Original commit: 33fd247bde8f9df3fb6ca5b920180faaf947ef46 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 10 +++++++++- .../kotlinProject.iml | 12 ++++++++++++ .../kotlinProject.ipr | 14 ++++++++++++++ .../src/JavaWithInner.java | 14 ++++++++++++++ .../src/test.kt | 3 +++ 5 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/src/JavaWithInner.java create mode 100644 jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/src/test.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index f6a96f4e6e4..6940ee5df17 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -228,7 +228,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { public fun testSourcePackagePrefix() { doTest() } - + public fun testSourcePackageLongPrefix() { initProject() val buildResult = makeAll() @@ -238,6 +238,14 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText) } + public fun testSourcePackagePrefixKnownIssueWithInnerClasses() { + initProject() + val buildResult = makeAll() + buildResult.assertFailed() + val errors = buildResult.getMessages(BuildMessage.Kind.ERROR).map { it.messageText } + assertTrue("Message wasn't found. $errors", errors.first().contains("class xxx.JavaWithInner.TextRenderer, unresolved supertypes: TableRow")) + } + public fun testKotlinJavaScriptProject() { initProject() addKotlinJavaScriptStdlibDependency() diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/kotlinProject.iml b/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/kotlinProject.iml new file mode 100644 index 00000000000..cbc89b8246b --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/kotlinProject.ipr b/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/src/JavaWithInner.java b/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/src/JavaWithInner.java new file mode 100644 index 00000000000..d210fa6a2d7 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/src/JavaWithInner.java @@ -0,0 +1,14 @@ +package xxx; + +import xxx.JavaWithInner.TableRenderer.TableRow; + +public class JavaWithInner { + public static class TableRenderer{ + public interface TableRow { + } + } + + public static class TextRenderer implements TableRow { + public void method() {} + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/src/test.kt b/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/src/test.kt new file mode 100644 index 00000000000..eaca9b80696 --- /dev/null +++ b/jps/jps-plugin/testData/general/SourcePackagePrefixKnownIssueWithInnerClasses/src/test.kt @@ -0,0 +1,3 @@ +package xxx + +val test = JavaWithInner.TextRenderer().method() \ No newline at end of file From 084df28a143f8da162f5a660630232038a1b4e58 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 12 Nov 2015 19:14:00 +0100 Subject: [PATCH 0651/1557] Additional fix to the previous one: Disabling parallel builds without daemon again and undoing apprpriate fix to broken tests problem, since it effectively cancelled fix for parallel building itself and was causing exceptions on heavy builds (cherry picked from commit bb66776) Original commit: 20ca8cd435f8fc898b0c06cb7a73c06ba003faf6 --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 7d50bdb5527..476c09e281e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -112,8 +112,9 @@ public object KotlinCompilerRunner { val stream = ByteArrayOutputStream() val out = PrintStream(stream) - if (System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY) == null) - System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "") +// Uncomment after resolving problems with parallel compilation and tests +// if (System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY) == null) +// System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "") val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out) From dfcb6ec84d4389c9c1cce882c6e3db8c2ea161f3 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 11 Nov 2015 14:36:31 +0300 Subject: [PATCH 0652/1557] Implement serialization of inner types Original commit: 7500447e72fb5bc129a87e61fb271568ae8eb2ac --- .../jps/incremental/ProtoCompareGenerated.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 74e6cbc514e..a4f9787fddf 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -355,6 +355,16 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkStringEquals(old.typeParameterName, new.typeParameterName)) return false } + if (old.hasOuterType() != new.hasOuterType()) return false + if (old.hasOuterType()) { + if (!checkEquals(old.outerType, new.outerType)) return false + } + + if (old.hasOuterTypeId() != new.hasOuterTypeId()) return false + if (old.hasOuterTypeId()) { + if (old.outerTypeId != new.outerTypeId) return false + } + if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false for(i in 0..old.getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { @@ -1043,6 +1053,14 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I hashCode = 31 * hashCode + stringIndexes(typeParameterName) } + if (hasOuterType()) { + hashCode = 31 * hashCode + outerType.hashCode(stringIndexes, fqNameIndexes) + } + + if (hasOuterTypeId()) { + hashCode = 31 * hashCode + outerTypeId + } + for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { hashCode = 31 * hashCode + getExtension(JvmProtoBuf.typeAnnotation, i).hashCode(stringIndexes, fqNameIndexes) } From a3fd9b82095ba11b56bde343643a4047516556aa Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Mon, 16 Nov 2015 20:19:49 +0300 Subject: [PATCH 0653/1557] Hack for checking access to internal declarations during incremental compilation Original commit: e5e4f9e77517ff593ed0a7af3a8eff1e742b5e7c --- ...perimentalIncrementalJpsTestGenerated.java | 6 +++++ .../build/IncrementalJpsTestGenerated.java | 6 +++++ .../build.log | 22 +++++++++++++++++++ .../dependencies.txt | 2 ++ .../experimental-ic-build.log | 11 ++++++++++ .../module1_a.kt | 5 +++++ .../module1_a.kt.new | 9 ++++++++ .../module1_c1.kt | 5 +++++ .../module1_c2.kt | 3 +++ .../module1_c2.kt.new | 5 +++++ .../module2_b.kt | 6 +++++ 11 files changed, 80 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c1.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module2_b.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 83368bbcf34..32bd506fd4d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -55,6 +55,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("circularDependencyWithAccessToInternal") + public void testCircularDependencyWithAccessToInternal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/"); + doTest(fileName); + } + @TestMetadata("constantValueChanged") public void testConstantValueChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 6fa3e46f594..63fd8b14dab 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -55,6 +55,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("circularDependencyWithAccessToInternal") + public void testCircularDependencyWithAccessToInternal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/"); + doTest(fileName); + } + @TestMetadata("constantValueChanged") public void testConstantValueChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log new file mode 100644 index 00000000000..85072d47def --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -0,0 +1,22 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/Module1_aKt.class +out/production/module1/c/Module1_c2Kt.class +End of files +Compiling files: +module1/src/module1_a.kt +module1/src/module1_c2.kt +End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/c/Module1_c1Kt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/b/B.class +out/production/module2/b/Module2_bKt.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +Compiling files: +module1/src/module1_c1.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/dependencies.txt new file mode 100644 index 00000000000..02d5c8ca1a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/dependencies.txt @@ -0,0 +1,2 @@ +module1->module2 +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log new file mode 100644 index 00000000000..22a8eac1519 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log @@ -0,0 +1,11 @@ +========== Step #1 ============ + +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/Module1_aKt.class +out/production/module1/c/Module1_c2Kt.class +End of files +Compiling files: +module1/src/module1_a.kt +module1/src/module1_c2.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt new file mode 100644 index 00000000000..82c0d8b13db --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt @@ -0,0 +1,5 @@ +package a + +fun a() { + c.internalFun() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt.new new file mode 100644 index 00000000000..93d22c828dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_a.kt.new @@ -0,0 +1,9 @@ +package a + +fun a() { +} + +fun aa() { + c.internalFun() + c.internalFun2() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c1.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c1.kt new file mode 100644 index 00000000000..46450e9f352 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c1.kt @@ -0,0 +1,5 @@ +package c + +fun publicFun() {} + +internal fun internalFun2() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt new file mode 100644 index 00000000000..8bf543305e8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt @@ -0,0 +1,3 @@ +package c + +internal fun internalFun() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt.new b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt.new new file mode 100644 index 00000000000..4eac7a9f212 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module1_c2.kt.new @@ -0,0 +1,5 @@ +package c + +internal fun internalFun() {} + +fun newFun() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module2_b.kt new file mode 100644 index 00000000000..7965b9e82a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/module2_b.kt @@ -0,0 +1,6 @@ +package b + +class B + +fun b() { +} From 97f2891ae9e34efadfa5d26d64d66324740e731f Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 16 Nov 2015 15:09:24 +0300 Subject: [PATCH 0654/1557] Diagnostics corrected for smart cast impossible Original commit: 03287d5d66a50d01c0f0226c936a3aedfddd9711 --- .../incremental/pureKotlin/valAddCustomAccessor/build.log | 2 +- .../incremental/pureKotlin/valRemoveCustomAccessor/build.log | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log index 0390b000838..71e16b9f6bb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -12,4 +12,4 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a member value that has open or custom getter \ No newline at end of file +Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log index d998319baf2..2a97dbd6a90 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log @@ -6,7 +6,7 @@ Compiling files: src/usage.kt End of files COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a member value that has open or custom getter +Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter Cleaning output files: From 60200f2a657b3086213e0dcde43c8e34690ae51e Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 13 Nov 2015 20:14:05 +0300 Subject: [PATCH 0655/1557] Fix tracking lookups when compile using daemon Original commit: 6305bbda5d3c111453d4c434b6a4ef8d9f7df489 --- .../kotlin/jps/incremental/LookupStorage.kt | 11 +++++++---- .../kotlin/jps/build/AbstractLookupTrackerTest.kt | 12 +++++++----- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt index cf32e331995..32903e254f2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.util.containers.MultiMap import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.storage.StorageProvider -import org.jetbrains.kotlin.incremental.components.LocationInfo import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.components.Position import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.jps.incremental.storage.* import org.jetbrains.kotlin.utils.Printer @@ -184,9 +184,12 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker { val lookups = MultiMap() - override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) { - lookups.putValue(LookupSymbol(name, scopeFqName), locationInfo.filePath) - delegate.record(locationInfo, scopeFqName, scopeKind, name) + override val requiresPosition: Boolean + get() = delegate.requiresPosition + + override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) { + lookups.putValue(LookupSymbol(name, scopeFqName), filePath) + delegate.record(filePath, position, scopeFqName, scopeKind, name) } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 3bac0319008..597c04cf891 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -17,11 +17,10 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.incremental.components.LocationInfo import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.components.Position import org.jetbrains.kotlin.incremental.components.ScopeKind import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.utils.join import java.io.File import java.util.* @@ -120,9 +119,12 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( class TestLookupTracker : LookupTracker { val lookups = arrayListOf() - override fun record(locationInfo: LocationInfo, scopeFqName: String, scopeKind: ScopeKind, name: String) { - val (line, column) = locationInfo.position - lookups.add(LookupInfo(locationInfo.filePath, line, column, scopeFqName, scopeKind, name)) + override val requiresPosition: Boolean + get() = true + + override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) { + val (line, column) = position + lookups.add(LookupInfo(filePath, line, column, scopeFqName, scopeKind, name)) } data class LookupInfo( From b06a5fb5e27a687d1cb32ed8c5826b6a5c9c5511 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 13 Nov 2015 22:35:10 +0300 Subject: [PATCH 0656/1557] Batch recording lookups in daemon Original commit: 89791dc85c57e15f257a5f25eb58b12add9855f5 --- .../jps/build/AbstractLookupTrackerTest.kt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 597c04cf891..f9f40951b8a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.incremental.components.LookupInfo import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.Position import org.jetbrains.kotlin.incremental.components.ScopeKind @@ -37,7 +38,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( override fun checkLookups(lookupTracker: LookupTracker, compiledFiles: Set) { if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker.javaClass}") - val fileToLookups = lookupTracker.lookups.groupBy { it.lookupContainingFile } + val fileToLookups = lookupTracker.lookups.groupBy { it.filePath } fun checkLookupsInFile(expectedFile: File, actualFile: File) { @@ -53,8 +54,8 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val lines = text.lines().toArrayList() - for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.lookupLine }) { - val columnToLookups = lookupsFromLine.groupBy { it.lookupColumn }.toList().sortedBy { it.first } + for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.position.line }) { + val columnToLookups = lookupsFromLine.groupBy { it.position.column }.toList().sortedBy { it.first } val lineContent = lines[line - 1] val parts = ArrayList(columnToLookups.size * 2) @@ -123,18 +124,8 @@ class TestLookupTracker : LookupTracker { get() = true override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) { - val (line, column) = position - lookups.add(LookupInfo(filePath, line, column, scopeFqName, scopeKind, name)) + lookups.add(LookupInfo(filePath, position, scopeFqName, scopeKind, name)) } - - data class LookupInfo( - val lookupContainingFile: String, - val lookupLine: Int, - val lookupColumn: Int, - val scopeFqName: String, - val scopeKind: ScopeKind, - val name: String - ) } From 33e89e9c160f71be8c066c4ea851d57abbcb221f Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 5 Nov 2015 18:55:52 +0300 Subject: [PATCH 0657/1557] Reuse package/class qualifier prefix resolution for qualified expression resolution. Original commit: 3556f9751e640d387f74b017e66b7a89786e5548 --- .../incremental/lookupTracker/classifierMembers/foo.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 34f67fad97a..0d9e9e31416 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -19,8 +19,8 @@ import bar.* this./*c:foo.A*/a this./*c:foo.A*/foo() /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A(getBaz) c:foo.A(getBAZ)*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/O./*c:foo.A.O*/v = "OK" + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A c:foo.A.Companion*/Companion./*c:foo.A.Companion*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = 1 fun foo() { /*c:foo.E*/a - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Y./*c:foo.E*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.E*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.E*/X./*c:foo.E*/foo() } } From fdef6653e2e9420a2cef69b50693284e7f9d502e Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 10 Nov 2015 14:37:51 +0300 Subject: [PATCH 0658/1557] Properly resolve values in 1st qualifier part (see implicitReceiverProperty test). Look into QUALIFIER for left-most "unrolled" qualified expression in CallExpressionResolver#getQualifiedExpressionTypeInfo. Drop some unused functions. Original commit: b532fa2bbf85b977757d1fae2e99d9b71cb6ae1e --- .../incremental/lookupTracker/classifierMembers/foo.kt | 8 ++++---- .../incremental/lookupTracker/classifierMembers/usages.kt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 0d9e9e31416..34f67fad97a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -19,8 +19,8 @@ import bar.* this./*c:foo.A*/a this./*c:foo.A*/foo() /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A(getBaz) c:foo.A(getBAZ)*/baz() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A c:foo.A.Companion*/Companion./*c:foo.A.Companion*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/O./*c:foo.A.O*/v = "OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = 1 fun foo() { /*c:foo.E*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.E*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.E*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 91c0eb2f084..6297ffd3418 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -9,15 +9,15 @@ import bar.* /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/d = "new value" /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/foo() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B()./*c:foo.A.B*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/B./*c:foo.A.B c:foo.A.B.CO*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/baz() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/Companion./*c:foo.A.Companion*/baz() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/O./*c:foo.A.O*/v = "OK" + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() From cdda7e87f7e9a30cdf19b3c2d3a29b2615b057ff Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 11 Nov 2015 18:14:59 +0300 Subject: [PATCH 0659/1557] Drop createQualifier: testData update Original commit: 9856af48ca4493916806895c9e7b0844a2268a0b --- .../javaUsedInKotlin/samConversions/methodAdded/build.log | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index 351c19dafcc..33acb90e24b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -17,7 +17,5 @@ src/usageWithFunctionExpression.kt src/usageWithFunctionLiteral.kt End of files COMPILATION FAILED -Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a companion object -Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a companion object \ No newline at end of file +Unresolved reference: SamInterface +Unresolved reference: SamInterface \ No newline at end of file From e6af8e20a5bcf4bd645ae60ae6517e4e945c5d1f Mon Sep 17 00:00:00 2001 From: Michael Nedzelsky Date: Thu, 19 Nov 2015 02:19:57 +0300 Subject: [PATCH 0660/1557] fix KT-10064 Regression: Error with multiple main functions within a single package #KT-10064 Fixed Original commit: aa8f3df9a8f37d4621aaa38b82e93a3e631d4853 --- .../jps/build/ExperimentalIncrementalJpsTestGenerated.java | 6 ++++++ .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../testData/incremental/pureKotlin/mainRedeclaration/a.kt | 3 +++ .../incremental/pureKotlin/mainRedeclaration/a.kt.new | 3 +++ .../testData/incremental/pureKotlin/mainRedeclaration/b.kt | 3 +++ .../incremental/pureKotlin/mainRedeclaration/build.log | 7 +++++++ 6 files changed, 28 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 32bd506fd4d..828ea743a87 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -395,6 +395,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("mainRedeclaration") + public void testMainRedeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/"); + doTest(fileName); + } + @TestMetadata("moveClass") public void testMoveClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 63fd8b14dab..c9c192a8b94 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -395,6 +395,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("mainRedeclaration") + public void testMainRedeclaration() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/"); + doTest(fileName); + } + @TestMetadata("moveClass") public void testMoveClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveClass/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt new file mode 100644 index 00000000000..8eb2fb2be08 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt @@ -0,0 +1,3 @@ +package foo + +fun main(args: Array) = println("a") \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new new file mode 100644 index 00000000000..4feab3ef68d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/a.kt.new @@ -0,0 +1,3 @@ +package foo + +fun main(args: Array) = println("A") \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt new file mode 100644 index 00000000000..7d4e748601c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/b.kt @@ -0,0 +1,3 @@ +package foo + +fun main(args: Array) = println("b") \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log new file mode 100644 index 00000000000..9ecb2e772f7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AKt.class +End of files +Compiling files: +src/a.kt +End of files \ No newline at end of file From 0b594f08d5d6062aa5a370c0f6b649b285e046ec Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 18 Nov 2015 12:59:25 +0300 Subject: [PATCH 0661/1557] Effective visibility source code fix: jps plugin Original commit: 3d75ebb85916066729408b20daac47556e0109dd --- .../org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt | 2 +- .../org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt | 2 +- .../org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt index 021768d0fcb..56ad012b6da 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.incremental.storage import org.jetbrains.kotlin.utils.keysToMap import java.io.File -class FileToIdMap(file: File) : BasicMap(file, FileKeyDescriptor, IntExternalizer) { +internal class FileToIdMap(file: File) : BasicMap(file, FileKeyDescriptor, IntExternalizer) { override fun dumpKey(key: File): String = key.toString() override fun dumpValue(value: Int): String = value.toString() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt index 7c41b295964..b11a2d886ae 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.incremental.storage import com.intellij.util.io.ExternalIntegerKeyDescriptor import java.io.File -class IdToFileMap(file: File) : BasicMap(file, ExternalIntegerKeyDescriptor(), FileKeyDescriptor) { +internal class IdToFileMap(file: File) : BasicMap(file, ExternalIntegerKeyDescriptor(), FileKeyDescriptor) { override fun dumpKey(key: Int): String = key.toString() override fun dumpValue(value: File): String = value.toString() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index c20f00541a4..7bc03663fdf 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.incremental.storage import java.io.File -class LookupMap(storage: File) : BasicMap>(storage, LookupSymbolKeyDescriptor, IntSetExternalizer) { +internal class LookupMap(storage: File) : BasicMap>(storage, LookupSymbolKeyDescriptor, IntSetExternalizer) { override fun dumpKey(key: LookupSymbolKey): String = key.toString() override fun dumpValue(value: Set): String = value.toString() From cc0adf19a9c43786e111d0fbb66f0a04b6f3ca56 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 17 Nov 2015 18:59:04 +0300 Subject: [PATCH 0662/1557] Exposed visibility deprecation warnings made errors + relevant test fixes Original commit: 4e44466cf9cdc486bfae92111d5b50caf1c43ab8 --- .../CircularDependenciesInternalFromAnotherModule/errors.txt | 5 ++++- .../testData/general/InternalFromAnotherModule/errors.txt | 4 +++- .../simpleDependencyErrorOnAccessToInternal1/build.log | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index 331aaf1316d..16909f08763 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -4,4 +4,7 @@ Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 Cannot access 'InternalClass2': it is 'internal' in 'test' at line 19, column 15 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 Cannot access 'InternalFileAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 18, column 36 +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 19, column 15 +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 8, column 36 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index 2fae260968a..6da24d6c7e8 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -3,4 +3,6 @@ Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 Cannot access 'InternalTestAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 18, column 36 +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 8, column 36 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index df01db10bfd..f7e53b09f20 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -22,5 +22,6 @@ Cannot access 'A': it is 'internal' in 'a' Cannot access 'FileAnnotation': it is 'internal' in 'a' Cannot access 'ClassAnnotation': it is 'internal' in 'a' Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'internal' Cannot access 'A': it is 'internal' in 'a' Cannot access 'a': it is 'internal' in 'a' \ No newline at end of file From 039c310c557533bab0a97a9865d30f92328ada45 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Fri, 13 Nov 2015 23:43:05 +0300 Subject: [PATCH 0663/1557] Replace map { ... }.filterNotNull() with mapNotNull { ... } Original commit: 32151c077e3718851f7a3ca9a55913099d95c2a0 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 2 +- .../org/jetbrains/kotlin/jps/incremental/LookupStorage.kt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7e33f356920..76166540794 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -263,7 +263,7 @@ public class IncrementalCacheImpl( val changes = if (IncrementalCompilation.isExperimental()) - dirtyClasses.map { createChangeInfo(it) }.asSequence().filterNotNull() + dirtyClasses.mapNotNull { createChangeInfo(it) }.asSequence() else emptySequence() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt index 32903e254f2..0345dbb290c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt @@ -59,10 +59,10 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope) val fileIds = lookupMap[key] ?: return emptySet() - return fileIds.map { + return fileIds.mapNotNull { // null means it's outdated idToFile[it]?.path - }.filterNotNull() + } } public fun add(lookupSymbol: LookupSymbol, containingPaths: Collection) { @@ -138,7 +138,7 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { } for (lookup in lookupMap.keys) { - val fileIds = lookupMap[lookup]!!.map { oldIdToNewId[it] }.filterNotNull().toSet() + val fileIds = lookupMap[lookup]!!.mapNotNull { oldIdToNewId[it] }.toSet() if (fileIds.isEmpty()) { lookupMap.remove(lookup) From 663d0f2e7ec139603a3059f5d7fc208c7d9f0697 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 18 Nov 2015 14:15:12 +0300 Subject: [PATCH 0664/1557] Return platform independent path in IncrementalCacheImpl::getClassFilePath Fix ExperimentalIncrementalJpsTestGenerated.PureKotlin.testFunctionBecameInline on Windows. Original commit: 93eb09a654a6a7de3213c3598bb65d501c894064 --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 3 ++- .../jps/build/ExperimentalIncrementalJpsTestGenerated.java | 6 ++++++ .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../pureKotlin/inlinFunctionUsageAdded/build.log | 7 +++++++ .../incremental/pureKotlin/inlinFunctionUsageAdded/foo.kt | 5 +++++ .../pureKotlin/inlinFunctionUsageAdded/usage.kt | 2 ++ .../pureKotlin/inlinFunctionUsageAdded/usage.kt.new | 3 +++ 7 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/foo.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/usage.kt.new diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 76166540794..0abcc98c861 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.jps.incremental import com.google.protobuf.MessageLite import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName import com.intellij.util.io.BooleanDataDescriptor import com.intellij.util.io.EnumeratorStringDescriptor import com.intellij.util.io.IOUtil @@ -137,7 +138,7 @@ public class IncrementalCacheImpl( } override fun getClassFilePath(internalClassName: String): String { - return File(outputDir, "$internalClassName.class").canonicalPath + return toSystemIndependentName(File(outputDir, "$internalClassName.class").canonicalPath) } public fun saveCacheFormatVersion() { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 828ea743a87..a1d22faca06 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -347,6 +347,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("inlinFunctionUsageAdded") + public void testInlinFunctionUsageAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index c9c192a8b94..b7379d4f0f1 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -347,6 +347,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlinFunctionUsageAdded") + public void testInlinFunctionUsageAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log new file mode 100644 index 00000000000..dfe9f195402 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UsageKt.class +End of files +Compiling files: +src/usage.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/foo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/foo.kt new file mode 100644 index 00000000000..8e0180d263a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/foo.kt @@ -0,0 +1,5 @@ +class A { + inline fun foo(f: () -> Unit) { + f() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/usage.kt new file mode 100644 index 00000000000..c68615f0a0f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/usage.kt @@ -0,0 +1,2 @@ +fun usage() { +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/usage.kt.new new file mode 100644 index 00000000000..2b569d97a7e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/usage.kt.new @@ -0,0 +1,3 @@ +fun usage() { + A().foo {} +} From 7987943f3a878c4670f91d816eca93ad50d8b75d Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 26 Nov 2015 17:32:12 +0300 Subject: [PATCH 0665/1557] Minor: add more logging in KotlinBuilder Original commit: 7faa886d26b131f7eeb6353ca998eccd62191be7 --- .../kotlin/compilerRunner/KotlinCompilerRunner.kt | 7 +++++++ .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 476c09e281e..f1c2a675c47 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.rmi.* @@ -108,6 +109,7 @@ public object KotlinCompilerRunner { if (!tryCompileWithDaemon(compilerClassName, argsArray, environment, messageCollector, collector)) { // otherwise fallback to in-process + KotlinBuilder.LOG.info("Compile in-process") val stream = ByteArrayOutputStream() val out = PrintStream(stream) @@ -176,9 +178,12 @@ public object KotlinCompilerRunner { if (isDaemonEnabled()) { + KotlinBuilder.LOG.debug("Try to connect to daemon") val connection = getDaemonConnection(environment, messageCollector) if (connection?.daemon != null) { + KotlinBuilder.LOG.info("Connected to daemon") + val compilerOut = ByteArrayOutputStream() val daemonOut = ByteArrayOutputStream() @@ -199,6 +204,8 @@ public object KotlinCompilerRunner { } return true } + + KotlinBuilder.LOG.info("Daemon not found") } return false } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a7babd80097..0e5f7a9b60f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -65,6 +65,7 @@ import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.kotlin.rmi.isDaemonEnabled import org.jetbrains.kotlin.utils.LibraryUtils import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.keysToMap @@ -91,6 +92,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR LOG.debug("==========================================") LOG.info("is Kotlin incremental compilation enabled: ${IncrementalCompilation.isEnabled()}") LOG.info("is Kotlin experimental incremental compilation enabled: ${IncrementalCompilation.isExperimental()}") + LOG.info("is Kotlin compiler daemon enabled: ${isDaemonEnabled()}") val historyLabel = context.getBuilderParameter("history label") if (historyLabel != null) { @@ -108,12 +110,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val messageCollector = MessageCollectorAdapter(context) try { - return doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) + val result = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) + LOG.debug("Build result: " + result) + return result } catch (e: StopBuildException) { + LOG.debug("Caught exception: " + e) throw e } catch (e: Throwable) { + LOG.debug("Caught exception: " + e) + messageCollector.report( CompilerMessageSeverity.EXCEPTION, OutputMessageUtil.renderException(e), From 57ad58363f73a721f0102aa3e19bbd39c089643e Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 24 Nov 2015 18:15:08 +0300 Subject: [PATCH 0666/1557] Fix "operator modifier required" errors in project Original commit: 87799e9b6b4234cc09ed67e6cf88c638e0d58fea --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 0abcc98c861..97cc61c98f9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -373,10 +373,10 @@ public class IncrementalCacheImpl( return CompilationResult(protoChanged = diff != DifferenceKind.NONE, changes = changes) } - public fun contains(className: JvmClassName): Boolean = + operator fun contains(className: JvmClassName): Boolean = className.internalName in storage - public fun get(className: JvmClassName): ProtoMapValue? = + operator fun get(className: JvmClassName): ProtoMapValue? = storage[className.internalName] public fun remove(className: JvmClassName) { @@ -405,7 +405,7 @@ public class IncrementalCacheImpl( return if (result.isEmpty()) null else result } - fun contains(className: JvmClassName): Boolean = + operator fun contains(className: JvmClassName): Boolean = className.internalName in storage public fun process(kotlinClass: LocalFileKotlinClass): CompilationResult { @@ -572,7 +572,7 @@ public class IncrementalCacheImpl( storage.append(sourceFile.absolutePath, { out -> IOUtil.writeUTF(out, className.internalName) }) } - public fun get(sourceFile: File): Collection = + public operator fun get(sourceFile: File): Collection = storage[sourceFile.absolutePath].orEmpty().map { JvmClassName.byInternalName(it) } override fun dumpValue(value: List) = value.toString() @@ -633,7 +633,7 @@ public class IncrementalCacheImpl( } } - public fun get(sourcePath: String, jvmSignature: String): Collection { + public operator fun get(sourcePath: String, jvmSignature: String): Collection { val key = PathFunctionPair(sourcePath, jvmSignature) return storage[key] ?: emptySet() } @@ -674,7 +674,7 @@ data class CompilationResult( public val NO_CHANGES: CompilationResult = CompilationResult() } - public fun plus(other: CompilationResult): CompilationResult = + public operator fun plus(other: CompilationResult): CompilationResult = CompilationResult(protoChanged || other.protoChanged, constantsChanged || other.constantsChanged, inlineChanged || other.inlineChanged, From 84fea1a41d1db3e2bda6bc02e5059a2936bd0c81 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 26 Nov 2015 15:56:56 +0300 Subject: [PATCH 0667/1557] Fix tests: "infix modifier required" and "operator modifier required" errors Original commit: 9d1af5a17ecce95c90724ba343b0ba8313748983 --- .../jps/build/AbstractLookupTrackerTest.kt | 2 +- .../lookupTracker/conventions/comparison.kt | 16 +++---- .../lookupTracker/conventions/declarations.kt | 42 +++++++++---------- .../conventions/delegateProperty.kt | 22 +++++----- .../conventions/mathematicalLike.kt | 26 ++++++------ .../lookupTracker/conventions/other.kt | 14 +++---- .../inlineGet.kt | 2 +- .../inlineGet.kt.new.1 | 2 +- .../inlineSet.kt | 2 +- .../inlineSet.kt.new.2 | 2 +- .../inline.kt | 4 +- .../inline.kt.new.1 | 4 +- .../inline.kt.new.2 | 4 +- 13 files changed, 71 insertions(+), 71 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index f9f40951b8a..28455f8773a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File import java.util.* -private val DECLARATION_KEYWORDS = listOf("interface", "class", "enum class", "object", "fun", "val", "var") +private val DECLARATION_KEYWORDS = listOf("interface", "class", "enum class", "object", "fun", "operator fun", "val", "var") private val DECLARATION_STARTS_WITH = DECLARATION_KEYWORDS.map { it + " " } abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index 02cae7f1a1f..d7f73c68b45 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -6,13 +6,13 @@ package foo.bar na /*c:foo.bar.A(equals)*/== a na /*c:foo.bar.A(equals)*/== null - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/> b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/< b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/>= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/<= b + a /*c:foo.bar.A(compareTo)*/> b + a /*c:foo.bar.A(compareTo)*/< b + a /*c:foo.bar.A(compareTo)*/>= b + a /*c:foo.bar.A(compareTo)*/<= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/> c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/< c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/>= c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo)*/<= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/> c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/< c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/>= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/<= c } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt index e0dc43739f2..0dc0141f4f5 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt @@ -1,35 +1,35 @@ package foo.bar /*p:foo.bar*/class A { - fun plus(a: /*c:foo.bar.A p:foo.bar*/Int) = this - fun timesAssign(a: /*c:foo.bar.A p:foo.bar*/Any?) {} - fun inc(): /*c:foo.bar.A p:foo.bar*/A = this + operator fun plus(a: /*c:foo.bar.A p:foo.bar*/Int) = this + operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar*/Any?) {} + operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = this - fun get(i: /*c:foo.bar.A p:foo.bar*/Int) = 1 - fun contains(a: /*c:foo.bar.A p:foo.bar*/Int): /*c:foo.bar.A p:foo.bar*/Boolean = false - fun invoke() {} + operator fun get(i: /*c:foo.bar.A p:foo.bar*/Int) = 1 + operator fun contains(a: /*c:foo.bar.A p:foo.bar*/Int): /*c:foo.bar.A p:foo.bar*/Boolean = false + operator fun invoke() {} - fun compareTo(a: /*c:foo.bar.A p:foo.bar*/Int) = 0 + operator fun compareTo(a: /*c:foo.bar.A p:foo.bar*/Int) = 0 - fun component1() = this + operator fun component1() = this - fun iterator() = this - fun next() = this + operator fun iterator() = this + operator fun next() = this } -/*p:foo.bar*/fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = this -/*p:foo.bar*/fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar*/Any?) {} -/*p:foo.bar*/fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar*/Any?) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = this -/*p:foo.bar*/fun /*p:foo.bar*/A.not() {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {} -/*p:foo.bar*/fun /*p:foo.bar*/A.set(i: /*p:foo.bar*/Int, v: /*p:foo.bar*/Int) {} -/*p:foo.bar*/fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = true -/*p:foo.bar*/fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar*/Int, v: /*p:foo.bar*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = true +/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar*/Int) {} -/*p:foo.bar*/fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = 0 +/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = 0 -/*p:foo.bar*/fun /*p:foo.bar*/A.component2() = this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = this -/*p:foo.bar*/fun /*p:foo.bar*/A?.iterator() = this!! -/*p:foo.bar*/fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = false +/*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = this!! +/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 80e5fb200f1..d444859d877 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -3,28 +3,28 @@ package foo.bar import kotlin.reflect./*p:kotlin.reflect*/KProperty /*p:foo.bar*/class D1 { - fun get(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = 1 + operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = 1 } -/*p:foo.bar*/fun /*p:foo.bar*/D1.set(t: /*p:foo.bar*/Any?, p: KProperty<*>, v: /*p:foo.bar*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar*/Any?, p: KProperty<*>, v: /*p:foo.bar*/Int) {} /*p:foo.bar(D2)*/open class D2 { - fun set(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar*/Int) {} + operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar*/Int) {} } -/*p:foo.bar*/fun /*p:foo.bar*/D2.get(t: /*p:foo.bar*/Any?, p: KProperty<*>) = 1 -/*p:foo.bar*/fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = 1 +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { fun propertyDelegated(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?) {} } -/*p:foo.bar*/val x1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D1(getGetValue) c:foo.bar.D1(getGETValue) c:foo.bar.D1(get) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D1(getGetValue) c:foo.bar.D1(getGETValue) c:foo.bar.D1(get) c:foo.bar.D1(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) c:foo.bar.D1(set) p:foo.bar(set) p:java.lang(set) p:kotlin(set) p:kotlin.annotation(set) p:kotlin.jvm(set) p:kotlin.io(set) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) c:foo.bar.D2(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) c:foo.bar.D2(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.D2(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D2(getSetValue) c:foo.bar.D2(getSETValue) c:foo.bar.D2(set) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.D3(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.D3(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D3(getSetValue) c:foo.bar.D3(getSETValue) c:foo.bar.D3(set) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(setValue) c:foo.bar.D3(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 07fad84d3bf..69c457b8ef9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -3,22 +3,22 @@ package foo.bar /*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) { var d = a - d/*c:foo.bar.A(inc) p:foo.bar(inc) p:java.lang(inc) p:kotlin(inc) p:kotlin.annotation(inc) p:kotlin.jvm(inc) p:kotlin.io(inc) c:foo.bar.A(getInc) c:foo.bar.A(getINC)*/++ - /*c:foo.bar.A(inc) p:foo.bar(inc) p:java.lang(inc) p:kotlin(inc) p:kotlin.annotation(inc) p:kotlin.jvm(inc) p:kotlin.io(inc) c:foo.bar.A(getInc) c:foo.bar.A(getINC)*/++d - d/*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC)*/-- - /*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC)*/--d + d/*c:foo.bar.A(inc)*/++ + /*c:foo.bar.A(inc)*/++d + d/*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec)*/-- + /*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec)*/--d - a /*c:foo.bar.A(plus) p:foo.bar(plus) p:java.lang(plus) p:kotlin(plus) p:kotlin.annotation(plus) p:kotlin.jvm(plus) p:kotlin.io(plus) c:foo.bar.A(getPlus) c:foo.bar.A(getPLUS)*/+ b - a /*c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS)*/- b - /*c:foo.bar.A(not) p:foo.bar(not) p:java.lang(not) p:kotlin(not) p:kotlin.annotation(not) p:kotlin.jvm(not) p:kotlin.io(not) c:foo.bar.A(getNot) c:foo.bar.A(getNOT)*/!a + a /*c:foo.bar.A(plus)*/+ b + a /*c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus)*/- b + /*c:foo.bar.A(not) p:foo.bar(not) p:java.lang(not) p:kotlin(not) p:kotlin.annotation(not) p:kotlin.jvm(not) p:kotlin.io(not)*/!a // for val - a /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) p:java.lang(timesAssign) p:kotlin(timesAssign) p:kotlin.annotation(timesAssign) p:kotlin.jvm(timesAssign) p:kotlin.io(timesAssign) c:foo.bar.A(getTimesAssign) c:foo.bar.A(getTIMESAssign)*/*= b - a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign)*//= b + a /*c:foo.bar.A(timesAssign)*/*= b + a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign)*//= b // for var - d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus) p:foo.bar(plus) p:java.lang(plus) p:kotlin(plus) p:kotlin.annotation(plus) p:kotlin.jvm(plus) p:kotlin.io(plus) c:foo.bar.A(getPlus) c:foo.bar.A(getPLUS)*/+= b - d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS)*/-= b - d /*c:foo.bar.A(timesAssign) p:foo.bar(timesAssign) p:java.lang(timesAssign) p:kotlin(timesAssign) p:kotlin.annotation(timesAssign) p:kotlin.jvm(timesAssign) p:kotlin.io(timesAssign) c:foo.bar.A(getTimesAssign) c:foo.bar.A(getTIMESAssign) c:foo.bar.A(times) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.io(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b - d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b + d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus)*/+= b + d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus)*/-= b + d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.io(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b + d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index d6d7481e2a1..9e9e8aa46d4 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) p:foo.bar(set) p:java.lang(set) p:kotlin(set) p:kotlin.annotation(set) p:kotlin.jvm(set) p:kotlin.io(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(get) p:java.lang(get) p:kotlin(get) p:kotlin.annotation(get) p:kotlin.jvm(get) p:kotlin.io(get) c:foo.bar.A(getGet) c:foo.bar.A(getGET)*/a[2] + /*c:foo.bar.A(set) p:foo.bar(set) p:java.lang(set) p:kotlin(set) p:kotlin.annotation(set) p:kotlin.jvm(set) p:kotlin.io(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] - b /*c:foo.bar.A(contains) p:foo.bar(contains) p:java.lang(contains) p:kotlin(contains) p:kotlin.annotation(contains) p:kotlin.jvm(contains) p:kotlin.io(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS)*/in a - "s" /*c:foo.bar.A(contains) p:foo.bar(contains) p:java.lang(contains) p:kotlin(contains) p:kotlin.annotation(contains) p:kotlin.jvm(contains) p:kotlin.io(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS)*/!in a + b /*c:foo.bar.A(contains)*/in a + "s" /*c:foo.bar.A(contains) p:foo.bar(contains) p:java.lang(contains) p:kotlin(contains) p:kotlin.annotation(contains) p:kotlin.jvm(contains) p:kotlin.io(contains)*/!in a - /*c:foo.bar.A(invoke) p:foo.bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/a() + /*c:foo.bar.A(invoke)*/a() /*c:foo.bar.A(invoke) p:foo.bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/a(1) - val (/*c:foo.bar.A(component1) p:foo.bar(component1) p:java.lang(component1) p:kotlin(component1) p:kotlin.annotation(component1) p:kotlin.jvm(component1) p:kotlin.io(component1) c:foo.bar.A(getComponent1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2) c:foo.bar.A(getComponent2)*/t) = a; + val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/t) = a; - for ((/*c:foo.bar.A(component1) p:foo.bar(component1) p:java.lang(component1) p:kotlin(component1) p:kotlin.annotation(component1) p:kotlin.jvm(component1) p:kotlin.io(component1) c:foo.bar.A(getComponent1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2) c:foo.bar.A(getComponent2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1) p:foo.bar(component1) p:java.lang(component1) p:kotlin(component1) p:kotlin.annotation(component1) p:kotlin.jvm(component1) p:kotlin.io(component1) c:foo.bar.A(getComponent1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2) c:foo.bar.A(getComponent2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) p:java.lang(iterator) p:kotlin(iterator) p:kotlin.annotation(iterator) p:kotlin.jvm(iterator) p:kotlin.io(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) p:java.lang(iterator) p:kotlin(iterator) p:kotlin.annotation(iterator) p:kotlin.jvm(iterator) p:kotlin.io(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/na); } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt index a5ca9157e97..310ee0540d5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt @@ -2,6 +2,6 @@ package inline import kotlin.reflect.KProperty -inline fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int { +inline operator fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int { return 0 } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 index c1e548cf52c..48363763f12 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineGet.kt.new.1 @@ -2,6 +2,6 @@ package inline import kotlin.reflect.KProperty -inline fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int { +inline operator fun Inline.getValue(receiver: Any?, prop: KProperty<*>): Int { return 1 } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt index 36754dd7b0e..6f6684e1595 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt @@ -2,6 +2,6 @@ package inline import kotlin.reflect.KProperty -inline fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) { +inline operator fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value) } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 index bec3dc03047..d85c786fbf5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/inlineSet.kt.new.2 @@ -2,6 +2,6 @@ package inline import kotlin.reflect.KProperty -inline fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) { +inline operator fun Inline.setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value * 2) } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt index 059a1a9379d..4e82a0cda3f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt @@ -3,11 +3,11 @@ package inline import kotlin.reflect.KProperty class Inline { - inline fun getValue(receiver: Any?, prop: KProperty<*>): Int { + inline operator fun getValue(receiver: Any?, prop: KProperty<*>): Int { return 0 } - inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { + inline operator fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value) } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 index b983f8237cb..fcf08146bf5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.1 @@ -3,11 +3,11 @@ package inline import kotlin.reflect.KProperty class Inline { - inline fun getValue(receiver: Any?, prop: KProperty<*>): Int { + inline operator fun getValue(receiver: Any?, prop: KProperty<*>): Int { return 1 } - inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { + inline operator fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value) } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 index f65f3c2cf62..05c7f9e1835 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/inline.kt.new.2 @@ -3,11 +3,11 @@ package inline import kotlin.reflect.KProperty class Inline { - inline fun getValue(receiver: Any?, prop: KProperty<*>): Int { + inline operator fun getValue(receiver: Any?, prop: KProperty<*>): Int { return 1 } - inline fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { + inline operator fun setValue(receiver: Any?, prop: KProperty<*>, value: Int) { println(value * 2) } } From b58eb87771806a0a02d7246788e97a8132aab602 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 9 Nov 2015 19:51:07 +0100 Subject: [PATCH 0668/1557] Implementation of the new daemon management without inter-daemon elections and with few other simplifications Original commit: 375679677c4d07261f99d8cf6a34cd35d2d55b65 --- .../kotlin/compilerRunner/KotlinCompilerRunner.kt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index f1c2a675c47..b723b1c66b6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -132,7 +132,7 @@ public object KotlinCompilerRunner { } - internal class DaemonConnection(public val daemon: CompileService?) + internal class DaemonConnection(public val daemon: CompileService?, public val sessionId: Int = CompileService.NO_SESSION) internal object getDaemonConnection { private @Volatile var connection: DaemonConnection? = null @@ -153,9 +153,13 @@ public object KotlinCompilerRunner { val profiler = if (daemonOptions.reportPerf) WallAndThreadAndMemoryTotalProfiler(withGC = false) else DummyProfiler() profiler.withMeasure(null) { - connection = DaemonConnection( - KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) - ) + fun newFlagFile(): File { + val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running") + flagFile.deleteOnExit() + return flagFile + } + val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) + connection = DaemonConnection(daemon, daemon?.leaseCompileSession(newFlagFile().absolutePath)?.get() ?:CompileService.NO_SESSION) } for (msg in daemonReportMessages) { @@ -196,7 +200,7 @@ public object KotlinCompilerRunner { K2JS_COMPILER -> CompileService.TargetPlatform.JS else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName") } - val res = KotlinCompilerClient.incrementalCompile(connection!!.daemon!!, targetPlatform, argsArray, services, compilerOut, daemonOut) + val res = KotlinCompilerClient.incrementalCompile(connection!!.daemon!!, connection.sessionId, targetPlatform, argsArray, services, compilerOut, daemonOut) processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { From 7fbef0dcddf8b0d9f604d636367b22589c059811 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 17 Nov 2015 22:00:35 +0100 Subject: [PATCH 0669/1557] Passing a log file name in logger-compatible format on Windows in tests, fixes problems with daemon tests on Windows Original commit: 336f6de2ee1c28b019b3d932b70070de72859d4d --- .../jps/build/SimpleKotlinJpsBuildTest.kt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 1ec16d5065e..c0458769bd8 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -18,10 +18,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY -import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_ENABLED_PROPERTY -import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_LOG_PATH_PROPERTY -import org.jetbrains.kotlin.rmi.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY +import org.jetbrains.kotlin.rmi.* import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File @@ -75,7 +72,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running"); val logFile = File.createTempFile("kotlin-daemon", ".log") System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath) - System.setProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY, logFile.absolutePath) + System.setProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY, logFile.loggerCompatiblePath) try { testLoadingKotlinFromDifferentModules() } @@ -88,3 +85,13 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } } } + +// copied from CompilerDaemonTest.kt +// TODO: find shared place for this function +// java.util.logger used in the daemon silently forgets to log into a file specified in the config on Windows, +// if file path is given in windows form (using backslash as a separator); the reason is unknown +// this function makes a path with forward slashed, that works on windows too +internal val File.loggerCompatiblePath: String + get() = + if (OSKind.current == OSKind.Windows) absolutePath.replace('\\', '/') + else absolutePath From 2a0b1188a21fc9a127daf3cdaf8e52795fb7969d Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 27 Nov 2015 18:01:01 +0100 Subject: [PATCH 0670/1557] fixes after review Original commit: 9869fc4305f62d98b1ae53246d3df05104e9c52f --- .../jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 6 +++--- .../jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index b723b1c66b6..7c8fb1d0139 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -137,7 +137,7 @@ public object KotlinCompilerRunner { internal object getDaemonConnection { private @Volatile var connection: DaemonConnection? = null - @Synchronized operator fun invoke(environment: CompilerEnvironment, messageCollector: MessageCollector): DaemonConnection? { + @Synchronized operator fun invoke(environment: CompilerEnvironment, messageCollector: MessageCollector): DaemonConnection { if (connection == null) { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) @@ -159,7 +159,7 @@ public object KotlinCompilerRunner { return flagFile } val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) - connection = DaemonConnection(daemon, daemon?.leaseCompileSession(newFlagFile().absolutePath)?.get() ?:CompileService.NO_SESSION) + connection = DaemonConnection(daemon, daemon?.leaseCompileSession(newFlagFile().absolutePath)?.get() ?: CompileService.NO_SESSION) } for (msg in daemonReportMessages) { @@ -170,7 +170,7 @@ public object KotlinCompilerRunner { reportTotalAndThreadPerf("Daemon connect", daemonOptions, messageCollector, profiler) } - return connection + return connection!! } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index c0458769bd8..5f4127160a0 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -88,7 +88,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { // copied from CompilerDaemonTest.kt // TODO: find shared place for this function -// java.util.logger used in the daemon silently forgets to log into a file specified in the config on Windows, +// java.util.Logger used in the daemon silently forgets to log into a file specified in the config on Windows, // if file path is given in windows form (using backslash as a separator); the reason is unknown // this function makes a path with forward slashed, that works on windows too internal val File.loggerCompatiblePath: String From 45d6f2394cb9fcb06cf74dab976b67ab39f6cb51 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 27 Nov 2015 18:54:09 +0100 Subject: [PATCH 0671/1557] Moving daemon files, renaming namespaces, modules and jar Original commit: c76bec51a08ba032fdf25892c9ce38a849771245 --- jps/jps-plugin/jps-plugin.iml | 4 ++-- .../kotlin/compilerRunner/KotlinCompilerRunner.kt | 7 +++++-- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 4 ++-- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index cceadef5599..7e51764c54e 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -20,7 +20,7 @@ - - + + \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 7c8fb1d0139..71137f0051d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -28,12 +28,15 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil +import org.jetbrains.kotlin.daemon.client.CompilationServices +import org.jetbrains.kotlin.daemon.client.DaemonReportMessage +import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets +import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.rmi.* -import org.jetbrains.kotlin.rmi.kotlinr.* import java.io.* import java.lang.reflect.Field import java.lang.reflect.Modifier diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 0e5f7a9b60f..640a60dbb86 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -65,7 +65,7 @@ import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.rmi.isDaemonEnabled +import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.utils.LibraryUtils import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.keysToMap diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 5f4127160a0..fc1ab6d2052 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService -import org.jetbrains.kotlin.rmi.* +import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File @@ -66,7 +66,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { // TODO: add JS tests public fun testDaemon() { - System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY,"") + System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "") System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "") // spaces in the name to test proper file name handling val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running"); From 77e78e15b98359b21bb73988fc6efbff032adb71 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 20 Nov 2015 16:20:05 +0300 Subject: [PATCH 0672/1557] Remove kotlin.jvm.internal.KotlinPackage and corresponding code Original commit: 8594cfca469a1b02a23f4fae16e57ed9532414da --- .../kotlin/jps/build/KotlinBuilder.kt | 6 +--- .../jps/incremental/IncrementalCacheImpl.kt | 29 ++++++++----------- .../classFilesComparison.kt | 8 ++--- .../AbstractProtoComparisonTest.kt | 6 ++-- 4 files changed, 19 insertions(+), 30 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 640a60dbb86..c9dd9e3bb63 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -58,7 +58,6 @@ import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.PackageClassUtils -import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.TargetId @@ -421,10 +420,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR fun getOldSourceFiles(generatedClass: GeneratedJvmClass, previousMappings: Mappings): Collection { if (!generatedClass.outputFile.getName().endsWith(PackageClassUtils.PACKAGE_CLASS_NAME_SUFFIX + ".class")) return emptySet() - val kotlinClass = generatedClass.outputClass - if (!kotlinClass.getClassHeader().isCompatiblePackageFacadeKind()) return emptySet() - - val classInternalName = JvmClassName.byClassId(kotlinClass.getClassId()).getInternalName() + val classInternalName = JvmClassName.byClassId(generatedClass.outputClass.getClassId()).getInternalName() val oldClassSources = previousMappings.getClassSources(previousMappings.getName(classInternalName)) if (oldClassSources == null) return emptySet() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 97cc61c98f9..6d6f37a6445 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -36,7 +36,10 @@ import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.* import org.jetbrains.kotlin.load.kotlin.ModuleMapping -import org.jetbrains.kotlin.load.kotlin.header.* +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassPartKind import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto import org.jetbrains.kotlin.name.FqName @@ -165,24 +168,20 @@ public class IncrementalCacheImpl( val header = kotlinClass.classHeader val changesInfo = when { - header.isCompatiblePackageFacadeKind() -> - protoMap.process(kotlinClass, isPackage = true) header.isCompatibleFileFacadeKind() -> { assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) - val isPackage = true - - protoMap.process(kotlinClass, isPackage) + + protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass, isPackage) + inlineFunctionsMap.process(kotlinClass, isPackage = true) } header.isCompatibleMultifileClassKind() -> { val partNames = kotlinClass.classHeader.filePartClassNames?.toList() ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}") multifileClassFacadeMap.add(className, partNames) - // TODO NO_CHANGES? (delegates only, see package facade) + // TODO NO_CHANGES? (delegates only) constantsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass, isPackage = true) } @@ -191,18 +190,14 @@ public class IncrementalCacheImpl( packagePartMap.addPackagePart(className) multifileClassPartMap.add(className.internalName, header.multifileClassName!!) - val isPackage = true - - protoMap.process(kotlinClass, isPackage) + + protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass, isPackage) + inlineFunctionsMap.process(kotlinClass, isPackage = true) } header.isCompatibleClassKind() && !header.isLocalClass -> { - val isPackage = false - - protoMap.process(kotlinClass, isPackage) + + protoMap.process(kotlinClass, isPackage = false) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass, isPackage) + inlineFunctionsMap.process(kotlinClass, isPackage = false) } else -> CompilationResult.NO_CHANGES } @@ -674,7 +669,7 @@ data class CompilationResult( public val NO_CHANGES: CompilationResult = CompilationResult() } - public operator fun plus(other: CompilationResult): CompilationResult = + operator fun plus(other: CompilationResult): CompilationResult = CompilationResult(protoChanged || other.protoChanged, constantsChanged || other.constantsChanged, inlineChanged || other.inlineChanged, diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index d9958f56881..388db7f1c42 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -22,7 +22,9 @@ import com.google.common.io.Files import com.google.protobuf.ExtensionRegistry import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass -import org.jetbrains.kotlin.load.kotlin.header.* +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind +import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassPartKind import org.jetbrains.kotlin.serialization.DebugProtoBuf import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf @@ -140,9 +142,7 @@ fun classFileToString(classFile: File): String { out.write("\n------ string table types proto -----\n${DebugJvmProtoBuf.StringTableTypes.parseDelimitedFrom(input)}") when { - classHeader!!.isCompatiblePackageFacadeKind() -> - out.write("\n------ package proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") - classHeader.isCompatibleFileFacadeKind() -> + classHeader!!.isCompatibleFileFacadeKind() -> out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") classHeader.isCompatibleClassKind() -> out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 5b95c7899f6..d0dca0e7497 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -22,7 +22,6 @@ import org.jetbrains.kotlin.jps.incremental.storage.ProtoMapValue import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassPartKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatiblePackageFacadeKind import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil @@ -94,16 +93,15 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { val newProtoBytes = BitEncoding.decodeBytes(newClassHeader.annotationData!!) val oldProto = ProtoMapValue( - oldClassHeader.isCompatiblePackageFacadeKind() || oldClassHeader.isCompatibleFileFacadeKind() || oldClassHeader.isCompatibleMultifileClassPartKind(), + oldClassHeader.isCompatibleFileFacadeKind() || oldClassHeader.isCompatibleMultifileClassPartKind(), oldProtoBytes, oldClassHeader.strings!! ) val newProto = ProtoMapValue( - newClassHeader.isCompatiblePackageFacadeKind() || newClassHeader.isCompatibleFileFacadeKind() || newClassHeader.isCompatibleMultifileClassPartKind(), + newClassHeader.isCompatibleFileFacadeKind() || newClassHeader.isCompatibleMultifileClassPartKind(), newProtoBytes, newClassHeader.strings!! ) val diff = when { - newClassHeader.isCompatiblePackageFacadeKind(), newClassHeader.isCompatibleClassKind(), newClassHeader.isCompatibleFileFacadeKind(), newClassHeader.isCompatibleMultifileClassPartKind() -> From 4bc89f8f021c91ee302413dab6ba6aae5c4d0b57 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 20 Nov 2015 16:30:46 +0300 Subject: [PATCH 0673/1557] Remove obsolete code in KotlinBuilder, rename PackageClassUtils Original commit: caa6cdb3f7807d3b3a058ab6b1a27ede786c07d2 --- .../kotlin/jps/build/KotlinBuilder.kt | 32 +++---------------- 1 file changed, 5 insertions(+), 27 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index c9dd9e3bb63..17562b6ee5f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -28,7 +28,6 @@ import org.jetbrains.jps.builders.impl.BuildTargetRegistryImpl import org.jetbrains.jps.builders.impl.TargetOutputIndexImpl import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor -import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.fs.CompilationRound @@ -53,18 +52,16 @@ import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.load.kotlin.ModuleMapping -import org.jetbrains.kotlin.load.kotlin.PackageClassUtils import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.utils.LibraryUtils import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.keysToMap @@ -417,20 +414,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR filesToCompile: MultiMap, generatedClasses: List ) { - fun getOldSourceFiles(generatedClass: GeneratedJvmClass, previousMappings: Mappings): Collection { - if (!generatedClass.outputFile.getName().endsWith(PackageClassUtils.PACKAGE_CLASS_NAME_SUFFIX + ".class")) return emptySet() - - val classInternalName = JvmClassName.byClassId(generatedClass.outputClass.getClassId()).getInternalName() - val oldClassSources = previousMappings.getClassSources(previousMappings.getName(classInternalName)) - if (oldClassSources == null) return emptySet() - - val sources = THashSet(FileUtil.FILE_HASHING_STRATEGY) - sources.addAll(oldClassSources) - sources.removeAll(filesToCompile[generatedClass.target]) - sources.removeAll(dirtyFilesHolder.getRemovedFiles(generatedClass.target).map { File(it) }) - return sources - } - assert(IncrementalCompilation.isEnabled()) { "updateJavaMappings should not be called when incremental compilation disabled" } val previousMappings = context.getProjectDescriptor().dataManager.getMappings() @@ -438,15 +421,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val callback = delta.getCallback() for (generatedClass in generatedClasses) { - val outputFile = generatedClass.outputFile - val outputClass = generatedClass.outputClass - - // For package facade classes: we need to report all source files for it, not only currently compiled - val allSourcesIncludingOld = getOldSourceFiles(generatedClass, previousMappings) + generatedClass.sourceFiles - - callback.associate(FileUtil.toSystemIndependentName(outputFile.getAbsolutePath()), - allSourcesIncludingOld.map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, - ClassReader(outputClass.getFileContents()) + callback.associate( + FileUtil.toSystemIndependentName(generatedClass.outputFile.getAbsolutePath()), + generatedClass.sourceFiles.map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, + ClassReader(generatedClass.outputClass.getFileContents()) ) } From 75e0da2461f18d6d7e380aaaf14b9a7ed2987d22 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 30 Nov 2015 04:00:31 +0300 Subject: [PATCH 0674/1557] Replace deprecated toMap usages with toMapBy Original commit: ea60ab74a759edf996dee2f42af1ea9c62090ab1 --- .../kotlin/jps/incremental/AbstractProtoComparisonTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index d0dca0e7497..0a80f2626bc 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -36,8 +36,8 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old") val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new") - val oldClassMap = oldClassFiles.toMap { it.name } - val newClassMap = newClassFiles.toMap { it.name } + val oldClassMap = oldClassFiles.toMapBy { it.name } + val newClassMap = newClassFiles.toMapBy { it.name } val sb = StringBuilder() val p = Printer(sb) From 94092388a1dbfe389f2c193cece8e27e328a9b7c Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 30 Nov 2015 17:48:51 +0100 Subject: [PATCH 0675/1557] another attempt to fix parallel compilation - enabling keepalive in compiler use sites, but in jps taking parallel compilation option into account, so it should be now not set in tests Original commit: 6313ecac1c5411a140e1f6bf6cd946547138aa42 --- .../kotlin/compilerRunner/CompilerRunnerUtil.java | 2 +- .../kotlin/compilerRunner/KotlinCompilerRunner.kt | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index cc97d0376f3..6f93cb03680 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -70,7 +70,7 @@ public class CompilerRunnerUtil { } @Nullable - public synchronized static Object invokeExecMethod( + public static Object invokeExecMethod( @NotNull String compilerClassName, @NotNull String[] arguments, @NotNull CompilerEnvironment environment, diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 71137f0051d..0463fd492db 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.compilerRunner import com.intellij.util.xmlb.XmlSerializerUtil +import org.jetbrains.jps.api.GlobalOptions import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments @@ -117,9 +118,8 @@ public object KotlinCompilerRunner { val stream = ByteArrayOutputStream() val out = PrintStream(stream) -// Uncomment after resolving problems with parallel compilation and tests -// if (System.getProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY) == null) -// System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "") + if (java.lang.Boolean.parseBoolean(System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false"))) + System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out) @@ -188,7 +188,7 @@ public object KotlinCompilerRunner { KotlinBuilder.LOG.debug("Try to connect to daemon") val connection = getDaemonConnection(environment, messageCollector) - if (connection?.daemon != null) { + if (connection.daemon != null) { KotlinBuilder.LOG.info("Connected to daemon") val compilerOut = ByteArrayOutputStream() @@ -203,7 +203,7 @@ public object KotlinCompilerRunner { K2JS_COMPILER -> CompileService.TargetPlatform.JS else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName") } - val res = KotlinCompilerClient.incrementalCompile(connection!!.daemon!!, connection.sessionId, targetPlatform, argsArray, services, compilerOut, daemonOut) + val res = KotlinCompilerClient.incrementalCompile(connection.daemon!!, connection.sessionId, targetPlatform, argsArray, services, compilerOut, daemonOut) processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { From e3271684c7cd228f88fe3cbea108fdd8a5c277fe Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 1 Dec 2015 17:02:48 +0100 Subject: [PATCH 0676/1557] fixes after review Original commit: c1c6d0ee3a5e9f138e0e9123b18b32a73d73ea5d --- .../kotlin/compilerRunner/KotlinCompilerRunner.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 0463fd492db..0aa3005fd30 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -118,7 +118,10 @@ public object KotlinCompilerRunner { val stream = ByteArrayOutputStream() val out = PrintStream(stream) - if (java.lang.Boolean.parseBoolean(System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false"))) + // the property should be set at least for parallel builds to avoid parallel building problems (racing between destroying and using environment) + // unfortunately it cannot be currently set by default globally, because it breaks many tests + // since there is no reliable way so far to detect running under tests, switching it on only for parallel builds + if (System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false").toBoolean()) System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out) @@ -146,10 +149,6 @@ public object KotlinCompilerRunner { val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) val daemonOptions = configureDaemonOptions() val daemonJVMOptions = configureDaemonJVMOptions(inheritMemoryLimits = true, inheritAdditionalProperties = true) - // the property should be set by default for daemon builds to avoid parallel building problems - // but it cannot be currently set by default globally, because it seems breaks many tests - // TODO: find out how to get rid of the property and make it the default behavior - daemonJVMOptions.jvmParams.add("D$KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY") val daemonReportMessages = ArrayList() From 7ae30369a7dd1757612dedad7435d27503b6ba8f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 16 Nov 2015 15:57:24 +0300 Subject: [PATCH 0677/1557] Enable separate versioning for experimental incremental compilation Original commit: 69c906014fc7952daf0be910e403fec4b7785be5 --- .../kotlin/jps/build/KotlinBuilder.kt | 138 +++++++++++++--- .../jps/incremental/CacheFormatVersion.kt | 70 -------- .../kotlin/jps/incremental/CacheVersion.kt | 155 ++++++++++++++++++ .../jps/incremental/IncrementalCacheImpl.kt | 36 ++-- 4 files changed, 288 insertions(+), 111 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 17562b6ee5f..2a5403a0cdd 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -72,10 +72,26 @@ import java.util.* public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { + // TODO add description to string + private val TARGETS_WITH_CLEARED_CACHES = Key>("") + public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" public val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") - val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") + + private fun registerTargetsWithClearedCaches(context: CompileContext, targets: Set) { + synchronized(TARGETS_WITH_CLEARED_CACHES) { + val data = (context.getUserData(TARGETS_WITH_CLEARED_CACHES) ?: setOf()) + targets + context.putUserData(TARGETS_WITH_CLEARED_CACHES, data) + } + } + + private fun unregisterTargetsWithClearedCaches(context: CompileContext, targets: Set) { + synchronized(TARGETS_WITH_CLEARED_CACHES) { + val data = (context.getUserData(TARGETS_WITH_CLEARED_CACHES) ?: setOf()) - targets + context.putUserData(TARGETS_WITH_CLEARED_CACHES, data) + } + } } private val statisticsLogger = TeamcityStatisticsLogger() @@ -106,9 +122,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val messageCollector = MessageCollectorAdapter(context) try { - val result = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) - LOG.debug("Build result: " + result) - return result + val exitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) + LOG.debug("Build result: " + exitCode) + + if (exitCode != ExitCode.CHUNK_REBUILD_REQUIRED && exitCode != ABORT) { + saveVersions(context, chunk) + } + + return exitCode } catch (e: StopBuildException) { LOG.debug("Caught exception: " + e) @@ -139,17 +160,21 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } val projectDescriptor = context.projectDescriptor - val dataManager = projectDescriptor.dataManager + val targets = chunk.targets + val requestedToRebuild = context.getUserData(TARGETS_WITH_CLEARED_CACHES) ?: setOf() + val isFullRebuild = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context) - if (chunk.targets.any { dataManager.dataPaths.getKotlinCacheVersion(it).isIncompatible() }) { - LOG.info("Clearing caches for " + chunk.targets.joinToString { it.presentableName }) - chunk.targets.forEach { dataManager.getKotlinCache(it).clean() } - return CHUNK_REBUILD_REQUIRED + if (!isFullRebuild && !requestedToRebuild.containsAll(targets)) { + val exitCode = checkVersions(context, dataManager, targets) + + if (exitCode != null) return exitCode } - if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles() - || !hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { + if (!dirtyFilesHolder.hasDirtyFiles() && + !dirtyFilesHolder.hasRemovedFiles() || + !hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk) + ) { return NOTHING_DONE } @@ -200,17 +225,22 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return OK } + val generatedClasses = generatedFiles.filterIsInstance() + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) + if (!IncrementalCompilation.isEnabled()) { return OK } context.checkCanceled() - val generatedClasses = generatedFiles.filterIsInstance() - val changesInfo = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles, chunk) - updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) + val changesInfo = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles) updateLookupStorage(chunk, lookupTracker, dataManager, dirtyFilesHolder, filesToCompile) + if (isFullRebuild) { + return OK + } + val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } processChanges(context, chunk, filesToCompile.values(), allCompiledFiles, dataManager, caches, changesInfo) @@ -300,6 +330,77 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } + + private fun checkVersions(context: CompileContext, dataManager: BuildDataManager, targets: MutableSet): ExitCode? { + val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) + val allVersions = cacheVersionsProvider.allVersions(targets) + val actions = allVersions.map { it.checkVersion() }.toSet().sorted() + + fun cleanNormalCaches() { + LOG.info("Clearing caches for " + targets.joinToString { it.presentableName }) + targets.forEach { dataManager.getKotlinCache(it).clean() } + } + + for (status in actions) { + when (status) { + CacheVersion.Action.REBUILD_ALL_KOTLIN -> { + LOG.info("Kotlin global lookup map format changed, so rebuild all kotlin") + val project = context.projectDescriptor.project + val sourceRoots = project.modules.flatMap { it.sourceRoots } + + for (sourceRoot in sourceRoots) { + val ktFiles = sourceRoot.file.walk().filter { KotlinSourceFileCollector.isKotlinSourceFile(it) } + ktFiles.forEach { kt -> + FSOperations.markDirty(context, CompilationRound.NEXT, kt) + } + } + + val buildTargetIndex = context.projectDescriptor.buildTargetIndex + val allTargets = buildTargetIndex.allTargets.filterIsInstance().toSet() + + for (target in targets) { + dataManager.getKotlinCache(target).clean() + } + + dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider).clean() + registerTargetsWithClearedCaches(context, allTargets) + + return CHUNK_REBUILD_REQUIRED + } + CacheVersion.Action.REBUILD_CHUNK -> { + cleanNormalCaches() + registerTargetsWithClearedCaches(context, targets) + return CHUNK_REBUILD_REQUIRED + } + CacheVersion.Action.CLEAN_NORMAL_CACHES -> { + cleanNormalCaches() + } + CacheVersion.Action.CLEAN_EXPERIMENTAL_CACHES -> { + LOG.info("Clearing experimental caches for " + targets.joinToString { it.presentableName }) + targets.forEach { dataManager.getKotlinCache(it).cleanExperimental() } + } + CacheVersion.Action.CLEAN_DATA_CONTAINER -> { + LOG.info("Clearing lookup cache") + dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider).clean() + cacheVersionsProvider.dataContainerVersion().clean() + } + else -> { + assert(status == CacheVersion.Action.DO_NOTHING) { "Unknown version status $status" } + } + } + } + + return null + } + + private fun saveVersions(context: CompileContext, chunk: ModuleChunk) { + val dataManager = context.projectDescriptor.dataManager + val targets = chunk.targets + val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) + cacheVersionsProvider.allVersions(targets).forEach { it.saveIfNeeded() } + unregisterTargetsWithClearedCaches(context, targets) + } + private fun doCompileModuleChunk( allCompiledFiles: MutableSet, chunk: ModuleChunk, commonArguments: CommonCompilerArguments, context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, environment: CompilerEnvironment, @@ -414,8 +515,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR filesToCompile: MultiMap, generatedClasses: List ) { - assert(IncrementalCompilation.isEnabled()) { "updateJavaMappings should not be called when incremental compilation disabled" } - val previousMappings = context.getProjectDescriptor().dataManager.getMappings() val delta = previousMappings.createDelta() val callback = delta.getCallback() @@ -442,14 +541,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun updateKotlinIncrementalCache( compilationErrors: Boolean, incrementalCaches: Map, - generatedFiles: List, - chunk: ModuleChunk + generatedFiles: List ): CompilationResult { assert(IncrementalCompilation.isEnabled()) { "updateKotlinIncrementalCache should not be called when incremental compilation disabled" } - chunk.targets.forEach { incrementalCaches[it]!!.saveCacheFormatVersion() } - var changesInfo = CompilationResult.NO_CHANGES for (generatedFile in generatedFiles) { val ic = incrementalCaches[generatedFile.target]!! @@ -704,6 +800,7 @@ private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): M return caches } +// TODO: investigate thread safety private val ALL_COMPILED_FILES_KEY = Key.create>("_all_kotlin_compiled_files_") private fun getAllCompiledFilesContainer(context: CompileContext): MutableSet { var allCompiledFiles = ALL_COMPILED_FILES_KEY.get(context) @@ -714,6 +811,7 @@ private fun getAllCompiledFilesContainer(context: CompileContext): MutableSet>("_processed_targets_with_removed_files_") private fun getProcessedTargetsWithRemovedFilesContainer(context: CompileContext): MutableSet { var set = PROCESSED_TARGETS_WITH_REMOVED_FILES.get(context) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt deleted file mode 100644 index d68f4babfd0..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheFormatVersion.kt +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental - -import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.jps.build.KotlinBuilder -import org.jetbrains.kotlin.load.java.JvmAbi -import java.io.File - -class CacheFormatVersion(targetDataRoot: File) { - companion object { - // Change this when incremental cache format changes - private val INCREMENTAL_CACHE_OWN_VERSION = 7 - - private val CACHE_FORMAT_VERSION = - INCREMENTAL_CACHE_OWN_VERSION * 1000000 + - JvmAbi.VERSION.major * 1000 + - JvmAbi.VERSION.minor - - private val FORMAT_VERSION_FILE_PATH: String = "$CACHE_DIRECTORY_NAME/format-version.txt" - } - - private val file = File(targetDataRoot, FORMAT_VERSION_FILE_PATH) - - fun isIncompatible(): Boolean { - if (!file.exists()) return false - - if (!IncrementalCompilation.isEnabled()) return true - - val versionNumber = file.readText().toInt() - - if (versionNumber != CACHE_FORMAT_VERSION) { - KotlinBuilder.LOG.info("Incompatible incremental cache version, expected $CACHE_FORMAT_VERSION, actual $versionNumber") - return true - } - - return false - } - - fun saveIfNeeded() { - if (!file.parentFile.exists()) { - file.parentFile.mkdirs() - } - - file.writeText("$CACHE_FORMAT_VERSION") - } - - fun clean() { - file.delete() - } - - @TestOnly - val formatVersionFile: File - get() = file -} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt new file mode 100644 index 00000000000..d23f4c1e157 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -0,0 +1,155 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import org.jetbrains.annotations.TestOnly +import org.jetbrains.jps.builders.BuildTarget +import org.jetbrains.jps.builders.storage.BuildDataPaths +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.load.java.JvmAbi +import java.io.File + +private val NORMAL_VERSION = 7 +private val EXPERIMENTAL_VERSION = 1 +private val DATA_CONTAINER_VERSION = 1 + +private val NORMAL_VERSION_FILE_NAME = "format-version.txt" +private val EXPERIMENTAL_VERSION_FILE_NAME = "experimental-format-version.txt" +private val DATA_CONTAINER_VERSION_FILE_NAME = "data-container-format-version.txt" + +sealed class CacheVersion { + protected abstract val ownVersion: Int + protected abstract val versionFile: File + protected abstract val isEnabled: Boolean + protected abstract val whenVersionChanged: CacheVersion.Action + protected abstract val whenTurnedOn: CacheVersion.Action + protected abstract val whenTurnedOff: CacheVersion.Action + + private val actualVersion: Int + get() = versionFile.readText().toInt() + + private val expectedVersion: Int + get() = ownVersion * 1000000 + JvmAbi.VERSION.major * 1000 + JvmAbi.VERSION.minor + + fun checkVersion(): Action = + when (versionFile.exists() to isEnabled) { + true to true -> if (actualVersion != expectedVersion) whenVersionChanged else Action.DO_NOTHING + false to true -> whenTurnedOn + true to false -> whenTurnedOff + else -> Action.DO_NOTHING + } + + fun saveIfNeeded() { + if (!isEnabled) return + + if (!versionFile.parentFile.exists()) { + versionFile.parentFile.mkdirs() + } + + versionFile.writeText(expectedVersion.toString()) + } + + fun clean() { + versionFile.delete() + } + + @TestOnly + val formatVersionFile: File + get() = versionFile + + // Order of entries is important, because actions are sorted in KotlinBuilder::checkVersions + enum class Action { + REBUILD_ALL_KOTLIN, + REBUILD_CHUNK, + CLEAN_NORMAL_CACHES, + CLEAN_EXPERIMENTAL_CACHES, + CLEAN_DATA_CONTAINER, + DO_NOTHING + } + + class Normal(dir: File) : CacheVersion() { + override val ownVersion = NORMAL_VERSION + + override val versionFile = File(dir, NORMAL_VERSION_FILE_NAME) + + override val isEnabled: Boolean + get() = IncrementalCompilation.isEnabled() + + override val whenVersionChanged = Action.REBUILD_CHUNK + + override val whenTurnedOn = Action.REBUILD_CHUNK + + override val whenTurnedOff = Action.CLEAN_NORMAL_CACHES + } + + class Experimental(dir: File) : CacheVersion() { + override val ownVersion = EXPERIMENTAL_VERSION + + override val versionFile = File(dir, EXPERIMENTAL_VERSION_FILE_NAME) + + override val isEnabled: Boolean + get() = IncrementalCompilation.isExperimental() + + override val whenVersionChanged = Action.REBUILD_CHUNK + + override val whenTurnedOn = Action.REBUILD_CHUNK + + override val whenTurnedOff = Action.CLEAN_EXPERIMENTAL_CACHES + } + + class DataContainer(dir: File) : CacheVersion() { + override val ownVersion = DATA_CONTAINER_VERSION + + override val versionFile = File(dir, DATA_CONTAINER_VERSION_FILE_NAME) + + override val isEnabled: Boolean + get() = IncrementalCompilation.isExperimental() + + override val whenVersionChanged = Action.REBUILD_ALL_KOTLIN + + override val whenTurnedOn = Action.REBUILD_ALL_KOTLIN + + override val whenTurnedOff = Action.CLEAN_DATA_CONTAINER + } +} + +class CacheVersionProvider(private val paths: BuildDataPaths) { + protected val BuildTarget<*>.dataRoot: File + get() = paths.getTargetDataRoot(this) + + fun normalVersion(target: ModuleBuildTarget): CacheVersion = + CacheVersion.Normal(target.dataRoot) + + fun experimentalVersion(target: ModuleBuildTarget): CacheVersion = + CacheVersion.Experimental(target.dataRoot) + + fun dataContainerVersion(): CacheVersion = + CacheVersion.DataContainer(KotlinDataContainerTarget.dataRoot) + + fun allVersions(targets: Iterable): Iterable { + val versions = arrayListOf() + versions.add(dataContainerVersion()) + + for (target in targets) { + versions.add(normalVersion(target)) + versions.add(experimentalVersion(target)) + } + + return versions + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 6d6f37a6445..949b6ff31aa 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -24,7 +24,6 @@ import com.intellij.util.io.EnumeratorStringDescriptor import com.intellij.util.io.IOUtil import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly -import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.jps.incremental.ModuleBuildTarget @@ -55,13 +54,9 @@ import java.util.* internal val CACHE_DIRECTORY_NAME = "kotlin" -@TestOnly -public fun getCacheDirectoryName(): String = - CACHE_DIRECTORY_NAME - public class IncrementalCacheImpl( - targetDataRoot: File, - private val target: ModuleBuildTarget + private val target: ModuleBuildTarget, + paths: BuildDataPaths ) : BasicMapsOwner(), IncrementalCache { companion object { val PROTO_MAP = "proto" @@ -78,7 +73,8 @@ public class IncrementalCacheImpl( private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } - private val baseDir = File(targetDataRoot, CACHE_DIRECTORY_NAME) + private val baseDir = File(paths.getTargetDataRoot(target), CACHE_DIRECTORY_NAME) + private val cacheVersionProvider = CacheVersionProvider(paths) private val String.storageFile: File get() = File(baseDir, this + "." + CACHE_EXTENSION) @@ -94,7 +90,6 @@ public class IncrementalCacheImpl( private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) - private val cacheFormatVersion = CacheFormatVersion(targetDataRoot) private val dependents = arrayListOf() private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } @@ -144,10 +139,6 @@ public class IncrementalCacheImpl( return toSystemIndependentName(File(outputDir, "$internalClassName.class").canonicalPath) } - public fun saveCacheFormatVersion() { - cacheFormatVersion.saveIfNeeded() - } - public fun saveModuleMappingToCache(sourceFiles: Collection, file: File): CompilationResult { val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME) protoMap.process(jvmClassName, file.readBytes(), emptyArray(), isPackage = false, checkChangesIsOpenPart = false) @@ -320,7 +311,12 @@ public class IncrementalCacheImpl( public override fun clean() { super.clean() - cacheFormatVersion.clean() + cacheVersionProvider.normalVersion(target).clean() + cacheVersionProvider.experimentalVersion(target).clean() + } + + public fun cleanExperimental() { + cacheVersionProvider.experimentalVersion(target).clean() } private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { @@ -677,11 +673,9 @@ data class CompilationResult( changes + other.changes) } - -public fun BuildDataPaths.getKotlinCacheVersion(target: BuildTarget<*>): CacheFormatVersion = CacheFormatVersion(getTargetDataRoot(target)) - private class KotlinIncrementalStorageProvider( - private val target: ModuleBuildTarget + private val target: ModuleBuildTarget, + private val paths: BuildDataPaths ) : StorageProvider() { override fun equals(other: Any?) = other is KotlinIncrementalStorageProvider && target == other.target @@ -689,11 +683,11 @@ private class KotlinIncrementalStorageProvider( override fun hashCode() = target.hashCode() override fun createStorage(targetDataDir: File): IncrementalCacheImpl = - IncrementalCacheImpl(targetDataDir, target) + IncrementalCacheImpl(target, paths) } -public fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): IncrementalCacheImpl = - getStorage(target, KotlinIncrementalStorageProvider(target)) +fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): IncrementalCacheImpl = + getStorage(target, KotlinIncrementalStorageProvider(target, dataPaths)) private fun ByteArray.md5(): Long { val d = MessageDigest.getInstance("MD5").digest(this)!! From 0eb4f20d14769c4ac7fb21b965b36cd79ca878bf Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 16 Nov 2015 16:01:41 +0300 Subject: [PATCH 0678/1557] Test versioning of experimental incremental compilation Original commit: a8b551e518514513bc92e00d04b6e258b26868cc --- ...tractIncrementalCacheVersionChangedTest.kt | 21 ++-- .../jps/build/AbstractIncrementalJpsTest.kt | 34 +++--- .../AbstractIncrementalLazyCachesTest.kt | 101 +++++++++++------- ...aContainerVersionChangedTestGenerated.java | 80 ++++++++++++++ ...experimentalIncrementalCompilationTests.kt | 20 ++++ .../module1Modified/build.log | 6 ++ .../data-container-version-build.log | 34 ++++++ .../data-container-version-build.log | 13 +++ .../data-container-version-build.log | 14 +++ .../class/expected-kotlin-caches.txt | 5 +- .../experimental-expected-kotlin-caches.txt | 12 +++ .../constant/expected-kotlin-caches.txt | 9 +- .../experimental-expected-kotlin-caches.txt | 14 +++ .../function/expected-kotlin-caches.txt | 7 +- .../experimental-expected-kotlin-caches.txt | 13 +++ .../expected-kotlin-caches.txt | 11 +- .../experimental-expected-kotlin-caches.txt | 15 +++ .../expected-kotlin-caches.txt | 9 +- .../experimental-expected-kotlin-caches.txt | 14 +++ .../noKotlin/expected-kotlin-caches.txt | 2 + .../experimental-expected-kotlin-caches.txt | 6 ++ .../expected-kotlin-caches.txt | 7 +- .../experimental-expected-kotlin-caches.txt | 13 +++ 23 files changed, 377 insertions(+), 83 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index 715775892dd..cd2d932ec9d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -16,20 +16,17 @@ package org.jetbrains.kotlin.jps.build -import org.jetbrains.kotlin.jps.incremental.getKotlinCacheVersion +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { override fun performAdditionalModifications(modifications: List) { - val targets = projectDescriptor.allModuleTargets - val paths = projectDescriptor.dataManager.dataPaths - - for (target in targets) { - val cacheVersion = paths.getKotlinCacheVersion(target) - val cacheVersionFile = cacheVersion.formatVersionFile - - if (cacheVersionFile.exists()) { - cacheVersionFile.writeText("777") - } - } + val cacheVersionProvider = CacheVersionProvider(projectDescriptor.dataManager.dataPaths) + val versions = getVersions(cacheVersionProvider, projectDescriptor.allModuleTargets) + val versionFiles = versions.map { it.formatVersionFile }.filter { it.exists() } + versionFiles.forEach { it.writeText("777") } } + + protected open fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = + targets.map { cacheVersionProvider.normalVersion(it) } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 23f6b5d89c9..a5b81e0b28e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -77,6 +77,7 @@ public abstract class AbstractIncrementalJpsTest( private val COMMANDS = listOf("new", "touch", "delete") private val COMMANDS_AS_REGEX_PART = COMMANDS.joinToString("|") private val COMMANDS_AS_MESSAGE_PART = COMMANDS.joinToString("/") { "\".$it\"" } + private val BUILD_LOG_FILE_NAME = "build.log" } protected open val enableExperimentalIncrementalCompilation = false @@ -91,6 +92,8 @@ public abstract class AbstractIncrementalJpsTest( protected val mapWorkingToOriginalFile: MutableMap = hashMapOf() + protected open val experimentalBuildLogFileName = "experimental-ic-build.log" + private fun enableDebugLogging() { com.intellij.openapi.diagnostic.Logger.setFactory(javaClass()) TestLoggerFactory.dumpLogToStdout("") @@ -313,6 +316,17 @@ public abstract class AbstractIncrementalJpsTest( return result } + protected fun createDefaultBuildLog(incrementalMakeResults: List): String = + incrementalMakeResults.joinToString("\n\n") { it.log } + + protected open fun createExperimentalBuildLog(incrementalMakeResults: List): String = + buildString { + incrementalMakeResults.forEachIndexed { i, makeResult -> + append("\n========== Step #${i + 1} ============\n\n") + append(makeResult.log) + } + } + protected open fun doTest(testDataPath: String) { testDataDir = File(testDataPath) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) @@ -322,21 +336,15 @@ public abstract class AbstractIncrementalJpsTest( val otherMakeResults = performModificationsAndMake(moduleNames) - val buildLogFile = File(testDataDir, "build.log") - val fullBuildLogFile = File(testDataDir, "experimental-ic-build.log") + val buildLogFile = File(testDataDir, BUILD_LOG_FILE_NAME) + val experimentalBuildLog = File(testDataDir, experimentalBuildLogFileName) - if (enableExperimentalIncrementalCompilation && fullBuildLogFile.exists()) { - val logs = buildString { - otherMakeResults.forEachIndexed { i, makeResult -> - append("\n========== Step #${i + 1} ============\n\n") - append(makeResult.log) - } - } - - UsefulTestCase.assertSameLinesWithFile(fullBuildLogFile.absolutePath, logs) + if (enableExperimentalIncrementalCompilation && experimentalBuildLog.exists()) { + val logs = createExperimentalBuildLog(otherMakeResults) + UsefulTestCase.assertSameLinesWithFile(experimentalBuildLog.absolutePath, logs) } else if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) { - val logs = otherMakeResults.joinToString("\n\n") { it.log } + val logs = createDefaultBuildLog(otherMakeResults) UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs) } @@ -414,7 +422,7 @@ public abstract class AbstractIncrementalJpsTest( return byteArrayOutputStream.toString() } - private data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?) + protected data class MakeResult(val log: String, val makeFailed: Boolean, val mappingsDump: String?) private fun performModificationsAndMake(moduleNames: Set?): List { val results = arrayListOf() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 60aee9e01f2..a20f9ae450c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -17,20 +17,26 @@ package org.jetbrains.kotlin.jps.build import com.intellij.testFramework.UsefulTestCase +import org.jetbrains.jps.builders.BuildTarget +import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.jps.incremental.getCacheDirectoryName -import org.jetbrains.kotlin.jps.incremental.getKotlinCacheVersion +import org.jetbrains.kotlin.jps.incremental.CacheVersion +import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider +import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.utils.Printer import java.io.File public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() { + protected open val expectedCachesFileName: String + get() = "expected-kotlin-caches.txt" + override fun doTest(testDataPath: String) { try { super.doTest(testDataPath) val actual = dumpKotlinCachesFileNames() - val expectedFile = File(testDataPath, "expected-kotlin-caches.txt") + val expectedFile = File(testDataPath, expectedCachesFileName) UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual) } finally { @@ -41,28 +47,37 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps override fun performAdditionalModifications(modifications: List) { super.performAdditionalModifications(modifications) - var modified = 0 - for (modification in modifications) { - if (!modification.path.endsWith("incremental_compilation_off")) continue + if (modification !is AbstractIncrementalJpsTest.ModifyContent) continue - when (modification) { - is AbstractIncrementalJpsTest.ModifyContent -> { - IncrementalCompilation.disableIncrementalCompilation() + when (File(modification.path).name) { + "incremental-compilation" -> { + if (modification.dataFile.readAsBool()) { + IncrementalCompilation.enableIncrementalCompilation() + } + else { + IncrementalCompilation.disableIncrementalCompilation() + } } - is AbstractIncrementalJpsTest.DeleteFile -> { - IncrementalCompilation.enableIncrementalCompilation() - } - else -> { - throw IllegalStateException("Unknown modification type: ${modification.javaClass}") + "experimental-compilation" -> { + if (modification.dataFile.readAsBool()) { + IncrementalCompilation.enableExperimental() + } + else { + IncrementalCompilation.disableExperimental() + } } } - - modified++ } + } - if (modified > 1) { - throw IllegalStateException("Incremental compilation was enabled/disable more than once") + fun File.readAsBool(): Boolean { + val content = this.readText() + + return when (content.trim()) { + "on" -> true + "off" -> false + else -> throw IllegalStateException("$this content is expected to be 'on' or 'off'") } } @@ -71,32 +86,44 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps val p = Printer(sb) val targets = projectDescriptor.allModuleTargets val paths = projectDescriptor.dataManager.dataPaths + val versionProvider = CacheVersionProvider(paths) + + dumpCachesForTarget(p, paths, KotlinDataContainerTarget, versionProvider.dataContainerVersion()) for (target in targets.sortedBy { it.presentableName }) { - p.println(target) - p.pushIndent() - - val cacheVersion = paths.getKotlinCacheVersion(target) - if (cacheVersion.formatVersionFile.exists()) { - p.println(cacheVersion.formatVersionFile.name) - } - - val dataRoot = paths.getTargetDataRoot(target) - val cacheNames = kotlinCacheNames(dataRoot) - cacheNames.sorted().forEach { p.println(it) } - - p.popIndent() + dumpCachesForTarget(p, paths, target, versionProvider.normalVersion(target), versionProvider.experimentalVersion(target)) } return sb.toString() } + private fun dumpCachesForTarget(p: Printer, paths: BuildDataPaths, target: BuildTarget<*>, vararg cacheVersions: CacheVersion) { + p.println(target) + p.pushIndent() + + val dataRoot = paths.getTargetDataRoot(target) + + cacheVersions + .map { it.formatVersionFile } + .filter { it.exists() } + .sortedBy { it.name } + .forEach { p.println(it.relativeTo(dataRoot)) } + + val cacheNames = kotlinCacheNames(dataRoot) + cacheNames.sorted().forEach { p.println(it) } + + p.popIndent() + } + private fun kotlinCacheNames(dataRoot: File): List { - val cacheDir = File(dataRoot, getCacheDirectoryName()) - val fileNames = cacheDir.list() ?: arrayOf() - val cacheFiles = fileNames - .map { File(cacheDir, it) } - .filter { it.isFile && it.extension == BasicMapsOwner.CACHE_EXTENSION } - return cacheFiles.map { it.name } + val result = arrayListOf() + + for (file in dataRoot.walk()) { + if (file.isFile && file.extension == BasicMapsOwner.CACHE_EXTENSION) { + result.add(file.relativeTo(dataRoot)) + } + } + + return result } } \ No newline at end of file diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java new file mode 100644 index 00000000000..bb7036cc753 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java @@ -0,0 +1,80 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/cacheVersionChanged") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class DataContainerVersionChangedTestGenerated extends AbstractDataContainerVersionChangedTest { + public void testAllFilesPresentInCacheVersionChanged() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("exportedModule") + public void testExportedModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); + doTest(fileName); + } + + @TestMetadata("module1Modified") + public void testModule1Modified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); + doTest(fileName); + } + + @TestMetadata("module2Modified") + public void testModule2Modified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/"); + doTest(fileName); + } + + @TestMetadata("moduleWithConstantModified") + public void testModuleWithConstantModified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/"); + doTest(fileName); + } + + @TestMetadata("moduleWithInlineModified") + public void testModuleWithInlineModified() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/"); + doTest(fileName); + } + + @TestMetadata("touchedFile") + public void testTouchedFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/"); + doTest(fileName); + } + + @TestMetadata("untouchedFiles") + public void testUntouchedFiles() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); + doTest(fileName); + } + +} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 5276918aa7c..3e6b40b87f6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -16,14 +16,34 @@ package org.jetbrains.kotlin.jps.build +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider + abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() { override val enableExperimentalIncrementalCompilation = true } abstract class AbstractExperimentalIncrementalLazyCachesTest : AbstractIncrementalLazyCachesTest() { override val enableExperimentalIncrementalCompilation = true + + override val expectedCachesFileName: String + get() = "experimental-expected-kotlin-caches.txt" } abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() { override val enableExperimentalIncrementalCompilation = true + + override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = + targets.map { cacheVersionProvider.experimentalVersion(it) } +} + +abstract class AbstractDataContainerVersionChangedTest : AbstractExperimentalIncrementalCacheVersionChangedTest() { + override val experimentalBuildLogFileName = "data-container-version-build.log" + + override fun createExperimentalBuildLog(incrementalMakeResults: List) = + createDefaultBuildLog(incrementalMakeResults) + + override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = + listOf(cacheVersionProvider.dataContainerVersion()) } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index ae0d40bb5e6..5c6c5437904 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -1,4 +1,10 @@ Cleaning output files: +out/production/module5/module5/E.class +End of files +Compiling files: +module5/src/module5_E.java +End of files +Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log new file mode 100644 index 00000000000..668b93d1243 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -0,0 +1,34 @@ +Cleaning output files: +out/production/module5/module5/E.class +End of files +Compiling files: +module5/src/module5_E.java +End of files +Cleaning output files: +out/production/module4/module4/D.class +End of files +Compiling files: +module4/src/module4_d.kt +End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/A.class +out/production/module1/module1/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/module2/Module2_bKt.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module +out/production/module3/module3/Module3_cKt.class +End of files +Compiling files: +module3/src/module3_c.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log new file mode 100644 index 00000000000..6765eb04250 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/Module1_AKt.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/b/B.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log new file mode 100644 index 00000000000..93bb946a783 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/a/A.class +out/production/module1/a/Module1_AKt.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/b/B.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index 381f7cb3157..9e89c6fabb6 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -1,5 +1,6 @@ +kotlin-data-container Module 'module' production format-version.txt - proto.tab - source-to-classes.tab + kotlin/proto.tab + kotlin/source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt new file mode 100644 index 00000000000..6eb14f15a36 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt @@ -0,0 +1,12 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module' production + experimental-format-version.txt + format-version.txt + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt index 39231475721..ea990724ce0 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt @@ -1,7 +1,8 @@ +kotlin-data-container Module 'module' production format-version.txt - constants.tab - package-parts.tab - proto.tab - source-to-classes.tab + kotlin/constants.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt new file mode 100644 index 00000000000..161d898ca2e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt @@ -0,0 +1,14 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module' production + experimental-format-version.txt + format-version.txt + kotlin/constants.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt index 89837f47189..91867b8ee16 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ +kotlin-data-container Module 'module' production format-version.txt - package-parts.tab - proto.tab - source-to-classes.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt new file mode 100644 index 00000000000..53e44e2f47f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt @@ -0,0 +1,13 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module' production + experimental-format-version.txt + format-version.txt + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt index b84a9a7acd0..92a6facecb5 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt @@ -1,8 +1,9 @@ +kotlin-data-container Module 'module' production format-version.txt - inline-functions.tab - inlined-to.tab - package-parts.tab - proto.tab - source-to-classes.tab + kotlin/inline-functions.tab + kotlin/inlined-to.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt new file mode 100644 index 00000000000..63294672da5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt @@ -0,0 +1,15 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module' production + experimental-format-version.txt + format-version.txt + kotlin/inline-functions.tab + kotlin/inlined-to.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt index 1700c33173a..0302fda6a81 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt @@ -1,7 +1,8 @@ +kotlin-data-container Module 'module' production format-version.txt - inline-functions.tab - package-parts.tab - proto.tab - source-to-classes.tab + kotlin/inline-functions.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt new file mode 100644 index 00000000000..62f7784a425 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt @@ -0,0 +1,14 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module' production + experimental-format-version.txt + format-version.txt + kotlin/inline-functions.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt index ce3849d63ef..a1c4ec77902 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt @@ -1,2 +1,4 @@ +kotlin-data-container Module 'module' production + format-version.txt Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt new file mode 100644 index 00000000000..ec62512a8c7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt @@ -0,0 +1,6 @@ +kotlin-data-container + data-container-format-version.txt +Module 'module' production + experimental-format-version.txt + format-version.txt +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt index 89837f47189..91867b8ee16 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ +kotlin-data-container Module 'module' production format-version.txt - package-parts.tab - proto.tab - source-to-classes.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt new file mode 100644 index 00000000000..53e44e2f47f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt @@ -0,0 +1,13 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module' production + experimental-format-version.txt + format-version.txt + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests From 675671f4d51e9f44df73c69699cdef2bcd7e8d73 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 16 Nov 2015 16:03:07 +0300 Subject: [PATCH 0679/1557] Test turning incremental compilation on/off Original commit: e90dc047bdbb8bc32d84e3e72c9a4148c0d0e88b --- ...lChangeIncrementalOptionTestGenerated.java | 62 +++++++++++++++++++ ...experimentalIncrementalCompilationTests.kt | 8 +++ .../experimentalOn/a.kt | 5 ++ .../experimentalOn/a.kt.touch.1 | 0 .../experimentalOn/a.kt.touch.2 | 0 .../experimentalOn/b.kt | 5 ++ .../experimentalOn/build.log | 26 ++++++++ .../experimentalOn/c.kt | 5 ++ .../experimentalOn/expected-kotlin-caches.txt | 13 ++++ .../experimental-compilation.new.1 | 1 + .../experimentalOnOff/a.kt | 5 ++ .../experimentalOnOff/a.kt.new.3 | 7 +++ .../experimentalOnOff/a.kt.touch.1 | 0 .../experimentalOnOff/a.kt.touch.2 | 0 .../experimentalOnOff/b.kt | 5 ++ .../experimentalOnOff/build.log | 47 ++++++++++++++ .../experimentalOnOff/c.kt | 5 ++ .../expected-kotlin-caches.txt | 7 +++ .../experimental-compilation.new.1 | 1 + .../experimental-compilation.new.2 | 1 + .../incrementalOff/a.kt | 3 + .../incrementalOff/a.kt.new.1 | 3 + .../incrementalOff/a.kt.new.2 | 3 + .../incrementalOff/b.kt | 3 + .../incrementalOff/build.log | 20 ++++++ .../incrementalOff/c.kt | 3 + .../incrementalOff/expected-kotlin-caches.txt | 3 + .../incremental-compilation.new.1 | 1 + .../incrementalOffOn/a.kt | 3 + .../incrementalOffOn/a.kt.new.1 | 3 + .../incrementalOffOn/a.kt.new.2 | 3 + .../incrementalOffOn/a.kt.new.3 | 3 + .../incrementalOffOn/b.kt | 3 + .../incrementalOffOn/build.log | 40 ++++++++++++ .../incrementalOffOn/c.kt | 3 + .../expected-kotlin-caches.txt | 9 +++ .../incremental-compilation.new.1 | 1 + .../incremental-compilation.new.2 | 1 + 38 files changed, 311 insertions(+) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.2 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/b.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/c.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/experimental-compilation.new.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.new.3 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.2 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/b.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/c.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.2 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/b.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/c.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/incremental-compilation.new.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.3 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/b.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/c.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.2 diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java new file mode 100644 index 00000000000..3c20c78835a --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java @@ -0,0 +1,62 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/changeIncrementalOption") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class ExperimentalChangeIncrementalOptionTestGenerated extends AbstractExperimentalChangeIncrementalOptionTest { + public void testAllFilesPresentInChangeIncrementalOption() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("experimentalOn") + public void testExperimentalOn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/"); + doTest(fileName); + } + + @TestMetadata("experimentalOnOff") + public void testExperimentalOnOff() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/"); + doTest(fileName); + } + + @TestMetadata("incrementalOff") + public void testIncrementalOff() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/"); + doTest(fileName); + } + + @TestMetadata("incrementalOffOn") + public void testIncrementalOffOn() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/"); + doTest(fileName); + } + +} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 3e6b40b87f6..d958e835def 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -31,6 +31,14 @@ abstract class AbstractExperimentalIncrementalLazyCachesTest : AbstractIncrement get() = "experimental-expected-kotlin-caches.txt" } +abstract class AbstractExperimentalChangeIncrementalOptionTest : AbstractIncrementalLazyCachesTest() { + override fun setUp() { + super.setUp() + IncrementalCompilation.enableIncrementalCompilation() + IncrementalCompilation.disableExperimental() + } +} + abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() { override val enableExperimentalIncrementalCompilation = true diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt new file mode 100644 index 00000000000..595a801f574 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt @@ -0,0 +1,5 @@ +package foo + +fun a(): Int = 0 + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/b.kt new file mode 100644 index 00000000000..8a8a1a203a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/b.kt @@ -0,0 +1,5 @@ +package foo + +fun b(): Int = a() + +open class B : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log new file mode 100644 index 00000000000..d8c11c7bcb2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log @@ -0,0 +1,26 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/A.class +out/production/module/foo/AKt.class +End of files +Cleaning output files: +out/production/module/foo/B.class +out/production/module/foo/BKt.class +out/production/module/foo/C.class +out/production/module/foo/CKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +src/c.kt +End of files + + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/A.class +out/production/module/foo/AKt.class +End of files +Compiling files: +src/a.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/c.kt new file mode 100644 index 00000000000..c71fa76abce --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/c.kt @@ -0,0 +1,5 @@ +package foo + +fun c(): Int = b() + +open class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt new file mode 100644 index 00000000000..53e44e2f47f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt @@ -0,0 +1,13 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module' production + experimental-format-version.txt + format-version.txt + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/experimental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/experimental-compilation.new.1 new file mode 100644 index 00000000000..e8fd903040e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/experimental-compilation.new.1 @@ -0,0 +1 @@ +on \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt new file mode 100644 index 00000000000..595a801f574 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt @@ -0,0 +1,5 @@ +package foo + +fun a(): Int = 0 + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.new.3 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.new.3 new file mode 100644 index 00000000000..ed683dc0fd6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.new.3 @@ -0,0 +1,7 @@ +package foo + +fun a(): Int = 0 + +fun aa() = 1 + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/b.kt new file mode 100644 index 00000000000..8a8a1a203a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/b.kt @@ -0,0 +1,5 @@ +package foo + +fun b(): Int = a() + +open class B : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log new file mode 100644 index 00000000000..14e7514219b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log @@ -0,0 +1,47 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/A.class +out/production/module/foo/AKt.class +End of files +Cleaning output files: +out/production/module/foo/B.class +out/production/module/foo/BKt.class +out/production/module/foo/C.class +out/production/module/foo/CKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +src/c.kt +End of files + + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/A.class +out/production/module/foo/AKt.class +End of files +Compiling files: +src/a.kt +End of files + + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/A.class +out/production/module/foo/AKt.class +End of files +Compiling files: +src/a.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/B.class +out/production/module/foo/BKt.class +out/production/module/foo/C.class +out/production/module/foo/CKt.class +End of files +Compiling files: +src/b.kt +src/c.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/c.kt new file mode 100644 index 00000000000..c71fa76abce --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/c.kt @@ -0,0 +1,5 @@ +package foo + +fun c(): Int = b() + +open class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt new file mode 100644 index 00000000000..f689eecca42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt @@ -0,0 +1,7 @@ +kotlin-data-container +Module 'module' production + format-version.txt + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.1 new file mode 100644 index 00000000000..e8fd903040e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.1 @@ -0,0 +1 @@ +on \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.2 new file mode 100644 index 00000000000..b5a9a3b3b51 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.2 @@ -0,0 +1 @@ +off \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt new file mode 100644 index 00000000000..d1073bce124 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt @@ -0,0 +1,3 @@ +package foo + +inline fun a(): Int = 0 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.1 new file mode 100644 index 00000000000..82516f3196c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +inline fun a(): Int = 1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.2 new file mode 100644 index 00000000000..23b51e42e78 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.2 @@ -0,0 +1,3 @@ +package foo + +inline fun a(): Int = 2 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/b.kt new file mode 100644 index 00000000000..1063d036636 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/b.kt @@ -0,0 +1,3 @@ +package foo + +fun b(): Int = a() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log new file mode 100644 index 00000000000..a7f60bb8342 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log @@ -0,0 +1,20 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +src/c.kt +End of files + + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +src/c.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/c.kt new file mode 100644 index 00000000000..ac7ece7d3d7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/c.kt @@ -0,0 +1,3 @@ +package foo + +fun c(): Int = b() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt new file mode 100644 index 00000000000..f265ca29bf5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt @@ -0,0 +1,3 @@ +kotlin-data-container +Module 'module' production +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/incremental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/incremental-compilation.new.1 new file mode 100644 index 00000000000..b5a9a3b3b51 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/incremental-compilation.new.1 @@ -0,0 +1 @@ +off \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt new file mode 100644 index 00000000000..d1073bce124 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt @@ -0,0 +1,3 @@ +package foo + +inline fun a(): Int = 0 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.1 new file mode 100644 index 00000000000..82516f3196c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +inline fun a(): Int = 1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.2 new file mode 100644 index 00000000000..23b51e42e78 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.2 @@ -0,0 +1,3 @@ +package foo + +inline fun a(): Int = 2 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.3 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.3 new file mode 100644 index 00000000000..2466d7325d0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.3 @@ -0,0 +1,3 @@ +package foo + +inline fun a(): Int = 3 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/b.kt new file mode 100644 index 00000000000..1063d036636 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/b.kt @@ -0,0 +1,3 @@ +package foo + +fun b(): Int = a() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log new file mode 100644 index 00000000000..0286adad1d0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -0,0 +1,40 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +src/c.kt +End of files + + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AKt.class +End of files +Cleaning output files: +out/production/module/foo/BKt.class +out/production/module/foo/CKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +src/c.kt +End of files + + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AKt.class +End of files +Compiling files: +src/a.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/BKt.class +End of files +Compiling files: +src/b.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/c.kt new file mode 100644 index 00000000000..ac7ece7d3d7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/c.kt @@ -0,0 +1,3 @@ +package foo + +fun c(): Int = b() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt new file mode 100644 index 00000000000..bb7db482263 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt @@ -0,0 +1,9 @@ +kotlin-data-container +Module 'module' production + format-version.txt + kotlin/inline-functions.tab + kotlin/inlined-to.tab + kotlin/package-parts.tab + kotlin/proto.tab + kotlin/source-to-classes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.1 new file mode 100644 index 00000000000..b5a9a3b3b51 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.1 @@ -0,0 +1 @@ +off \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.2 new file mode 100644 index 00000000000..e8fd903040e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.2 @@ -0,0 +1 @@ +on \ No newline at end of file From ccc54dfb51391aa18e9b6b7db7d752772ac470f6 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 19 Nov 2015 14:29:23 +0300 Subject: [PATCH 0680/1557] Move CacheVersion properties to constructor Original commit: aea6ad0f0c7e6feb13144f42271b894824525116 --- .../kotlin/jps/incremental/CacheVersion.kt | 85 +++++++------------ 1 file changed, 29 insertions(+), 56 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt index d23f4c1e157..01c04ee7501 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -21,6 +21,7 @@ import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.jps.incremental.CacheVersion.Action import org.jetbrains.kotlin.load.java.JvmAbi import java.io.File @@ -32,13 +33,15 @@ private val NORMAL_VERSION_FILE_NAME = "format-version.txt" private val EXPERIMENTAL_VERSION_FILE_NAME = "experimental-format-version.txt" private val DATA_CONTAINER_VERSION_FILE_NAME = "data-container-format-version.txt" -sealed class CacheVersion { - protected abstract val ownVersion: Int - protected abstract val versionFile: File - protected abstract val isEnabled: Boolean - protected abstract val whenVersionChanged: CacheVersion.Action - protected abstract val whenTurnedOn: CacheVersion.Action - protected abstract val whenTurnedOff: CacheVersion.Action +class CacheVersion( + private val ownVersion: Int, + private val versionFile: File, + private val whenVersionChanged: CacheVersion.Action, + private val whenTurnedOn: CacheVersion.Action, + private val whenTurnedOff: CacheVersion.Action, + isEnabled: ()->Boolean +) { + private val isEnabled by lazy(isEnabled) private val actualVersion: Int get() = versionFile.readText().toInt() @@ -81,65 +84,35 @@ sealed class CacheVersion { CLEAN_DATA_CONTAINER, DO_NOTHING } - - class Normal(dir: File) : CacheVersion() { - override val ownVersion = NORMAL_VERSION - - override val versionFile = File(dir, NORMAL_VERSION_FILE_NAME) - - override val isEnabled: Boolean - get() = IncrementalCompilation.isEnabled() - - override val whenVersionChanged = Action.REBUILD_CHUNK - - override val whenTurnedOn = Action.REBUILD_CHUNK - - override val whenTurnedOff = Action.CLEAN_NORMAL_CACHES - } - - class Experimental(dir: File) : CacheVersion() { - override val ownVersion = EXPERIMENTAL_VERSION - - override val versionFile = File(dir, EXPERIMENTAL_VERSION_FILE_NAME) - - override val isEnabled: Boolean - get() = IncrementalCompilation.isExperimental() - - override val whenVersionChanged = Action.REBUILD_CHUNK - - override val whenTurnedOn = Action.REBUILD_CHUNK - - override val whenTurnedOff = Action.CLEAN_EXPERIMENTAL_CACHES - } - - class DataContainer(dir: File) : CacheVersion() { - override val ownVersion = DATA_CONTAINER_VERSION - - override val versionFile = File(dir, DATA_CONTAINER_VERSION_FILE_NAME) - - override val isEnabled: Boolean - get() = IncrementalCompilation.isExperimental() - - override val whenVersionChanged = Action.REBUILD_ALL_KOTLIN - - override val whenTurnedOn = Action.REBUILD_ALL_KOTLIN - - override val whenTurnedOff = Action.CLEAN_DATA_CONTAINER - } } class CacheVersionProvider(private val paths: BuildDataPaths) { - protected val BuildTarget<*>.dataRoot: File + private val BuildTarget<*>.dataRoot: File get() = paths.getTargetDataRoot(this) fun normalVersion(target: ModuleBuildTarget): CacheVersion = - CacheVersion.Normal(target.dataRoot) + CacheVersion(ownVersion = NORMAL_VERSION, + versionFile = File(target.dataRoot, NORMAL_VERSION_FILE_NAME), + whenVersionChanged = Action.REBUILD_CHUNK, + whenTurnedOn = Action.REBUILD_CHUNK, + whenTurnedOff = Action.CLEAN_NORMAL_CACHES, + isEnabled = { IncrementalCompilation.isEnabled() }) fun experimentalVersion(target: ModuleBuildTarget): CacheVersion = - CacheVersion.Experimental(target.dataRoot) + CacheVersion(ownVersion = EXPERIMENTAL_VERSION, + versionFile = File(target.dataRoot, EXPERIMENTAL_VERSION_FILE_NAME), + whenVersionChanged = Action.REBUILD_CHUNK, + whenTurnedOn = Action.REBUILD_CHUNK, + whenTurnedOff = Action.CLEAN_EXPERIMENTAL_CACHES, + isEnabled = { IncrementalCompilation.isExperimental() }) fun dataContainerVersion(): CacheVersion = - CacheVersion.DataContainer(KotlinDataContainerTarget.dataRoot) + CacheVersion(ownVersion = DATA_CONTAINER_VERSION, + versionFile = File(KotlinDataContainerTarget.dataRoot, DATA_CONTAINER_VERSION_FILE_NAME), + whenVersionChanged = Action.REBUILD_ALL_KOTLIN, + whenTurnedOn = Action.REBUILD_ALL_KOTLIN, + whenTurnedOff = Action.CLEAN_DATA_CONTAINER, + isEnabled = { IncrementalCompilation.isExperimental() }) fun allVersions(targets: Iterable): Iterable { val versions = arrayListOf() From 883993818300a5cc46a67ca18636e936795c02e1 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 19 Nov 2015 14:48:56 +0300 Subject: [PATCH 0681/1557] Simplify lazy caches tests Original commit: c9012b10c56af609b2d4c5262d6b8cc2cb7dc6e6 --- .../jps/incremental/IncrementalCacheImpl.kt | 4 +++ .../AbstractIncrementalLazyCachesTest.kt | 30 +++++++++++-------- .../experimentalOn/expected-kotlin-caches.txt | 6 ++-- .../expected-kotlin-caches.txt | 6 ++-- .../expected-kotlin-caches.txt | 10 +++---- .../class/expected-kotlin-caches.txt | 4 +-- .../experimental-expected-kotlin-caches.txt | 4 +-- .../constant/expected-kotlin-caches.txt | 8 ++--- .../experimental-expected-kotlin-caches.txt | 8 ++--- .../function/expected-kotlin-caches.txt | 6 ++-- .../experimental-expected-kotlin-caches.txt | 6 ++-- .../expected-kotlin-caches.txt | 10 +++---- .../experimental-expected-kotlin-caches.txt | 10 +++---- .../expected-kotlin-caches.txt | 8 ++--- .../experimental-expected-kotlin-caches.txt | 8 ++--- .../expected-kotlin-caches.txt | 6 ++-- .../experimental-expected-kotlin-caches.txt | 6 ++-- 17 files changed, 75 insertions(+), 65 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 949b6ff31aa..e5bc9a750a6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -54,6 +54,10 @@ import java.util.* internal val CACHE_DIRECTORY_NAME = "kotlin" +@TestOnly +public fun getCacheDirectoryName(): String = + CACHE_DIRECTORY_NAME + public class IncrementalCacheImpl( private val target: ModuleBuildTarget, paths: BuildDataPaths diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index a20f9ae450c..26e4c9ee51a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -23,6 +23,7 @@ import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.incremental.CacheVersion import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget +import org.jetbrains.kotlin.jps.incremental.getCacheDirectoryName import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.utils.Printer import java.io.File @@ -86,41 +87,46 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps val p = Printer(sb) val targets = projectDescriptor.allModuleTargets val paths = projectDescriptor.dataManager.dataPaths - val versionProvider = CacheVersionProvider(paths) + val versions = CacheVersionProvider(paths) - dumpCachesForTarget(p, paths, KotlinDataContainerTarget, versionProvider.dataContainerVersion()) + dumpCachesForTarget(p, paths, KotlinDataContainerTarget, versions.dataContainerVersion()) for (target in targets.sortedBy { it.presentableName }) { - dumpCachesForTarget(p, paths, target, versionProvider.normalVersion(target), versionProvider.experimentalVersion(target)) + dumpCachesForTarget(p, paths, target, versions.normalVersion(target), versions.experimentalVersion(target), + subdirectory = getCacheDirectoryName()) } return sb.toString() } - private fun dumpCachesForTarget(p: Printer, paths: BuildDataPaths, target: BuildTarget<*>, vararg cacheVersions: CacheVersion) { + private fun dumpCachesForTarget( + p: Printer, + paths: BuildDataPaths, + target: BuildTarget<*>, + vararg cacheVersions: CacheVersion, + subdirectory: String? = null + ) { p.println(target) p.pushIndent() - val dataRoot = paths.getTargetDataRoot(target) - + val dataRoot = paths.getTargetDataRoot(target).let { if (subdirectory != null) File(it, subdirectory) else it } cacheVersions .map { it.formatVersionFile } .filter { it.exists() } .sortedBy { it.name } - .forEach { p.println(it.relativeTo(dataRoot)) } + .forEach { p.println(it.name) } - val cacheNames = kotlinCacheNames(dataRoot) - cacheNames.sorted().forEach { p.println(it) } + kotlinCacheNames(dataRoot).sorted().forEach { p.println(it) } p.popIndent() } - private fun kotlinCacheNames(dataRoot: File): List { + private fun kotlinCacheNames(dir: File): List { val result = arrayListOf() - for (file in dataRoot.walk()) { + for (file in dir.walk()) { if (file.isFile && file.extension == BasicMapsOwner.CACHE_EXTENSION) { - result.add(file.relativeTo(dataRoot)) + result.add(file.name) } } diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt index 53e44e2f47f..670ef919aaa 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt @@ -7,7 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt index f689eecca42..45293da7039 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt @@ -1,7 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt index bb7db482263..744c17b4cdc 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt @@ -1,9 +1,9 @@ kotlin-data-container Module 'module' production format-version.txt - kotlin/inline-functions.tab - kotlin/inlined-to.tab - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + inline-functions.tab + inlined-to.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index 9e89c6fabb6..cf4dcf7ea18 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -1,6 +1,6 @@ kotlin-data-container Module 'module' production format-version.txt - kotlin/proto.tab - kotlin/source-to-classes.tab + proto.tab + source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt index 6eb14f15a36..b12e9b37962 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt @@ -7,6 +7,6 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt - kotlin/proto.tab - kotlin/source-to-classes.tab + proto.tab + source-to-classes.tab Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt index ea990724ce0..9a851b0cc46 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt @@ -1,8 +1,8 @@ kotlin-data-container Module 'module' production format-version.txt - kotlin/constants.tab - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + constants.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt index 161d898ca2e..dcd8748a3fa 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt @@ -7,8 +7,8 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt - kotlin/constants.tab - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + constants.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt index 91867b8ee16..8d3d53a48a1 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt @@ -1,7 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt index 53e44e2f47f..670ef919aaa 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt @@ -7,7 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt index 92a6facecb5..3449f76e358 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt @@ -1,9 +1,9 @@ kotlin-data-container Module 'module' production format-version.txt - kotlin/inline-functions.tab - kotlin/inlined-to.tab - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + inline-functions.tab + inlined-to.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt index 63294672da5..62d125bf7f4 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt @@ -7,9 +7,9 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt - kotlin/inline-functions.tab - kotlin/inlined-to.tab - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + inline-functions.tab + inlined-to.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt index 0302fda6a81..ae521f0a275 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt @@ -1,8 +1,8 @@ kotlin-data-container Module 'module' production format-version.txt - kotlin/inline-functions.tab - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + inline-functions.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt index 62f7784a425..b947e922a24 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt @@ -7,8 +7,8 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt - kotlin/inline-functions.tab - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + inline-functions.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt index 91867b8ee16..8d3d53a48a1 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt @@ -1,7 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt index 53e44e2f47f..670ef919aaa 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt @@ -7,7 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt - kotlin/package-parts.tab - kotlin/proto.tab - kotlin/source-to-classes.tab + package-parts.tab + proto.tab + source-to-classes.tab Module 'module' tests From d72b17fe7ad90e27a48d8fec794ca23366cc213c Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 20 Nov 2015 21:00:35 +0300 Subject: [PATCH 0682/1557] Minor: add description to key Original commit: b1b0da522872d12a9763a65ee79cb0b4234634eb --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 2a5403a0cdd..6fa5ec58e8c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -72,8 +72,7 @@ import java.util.* public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { - // TODO add description to string - private val TARGETS_WITH_CLEARED_CACHES = Key>("") + private val TARGETS_WITH_CLEARED_CACHES = Key>("Targets with cleared Kotlin caches") public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" public val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") From 1a401183b257c1b5b98138e64d9d13135efe63c0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 19 Nov 2015 13:48:39 +0300 Subject: [PATCH 0683/1557] Kotlin incremental cache version change should not affect java only modules Original commit: a447c39f69d387fba29b6a69e54a591fab5753b2 --- .../kotlin/jps/build/KotlinBuilder.kt | 84 ++++++++++++------- ...tractIncrementalCacheVersionChangedTest.kt | 18 +++- .../AbstractIncrementalLazyCachesTest.kt | 8 +- ...aContainerVersionChangedTestGenerated.java | 24 ++++++ ...lChangeIncrementalOptionTestGenerated.java | 12 +++ ...entalCacheVersionChangedTestGenerated.java | 24 ++++++ ...entalCacheVersionChangedTestGenerated.java | 24 ++++++ .../kotlin/jps/build/KotlinJpsBuildTest.kt | 5 +- .../clearedHasKotlin/build.log | 36 ++++++++ .../data-container-version-build.log | 36 ++++++++ .../clearedHasKotlin/dependencies.txt | 3 + .../clearedHasKotlin/module1_A.kt | 1 + .../clearedHasKotlin/module1_A.kt.touch.2 | 1 + .../clearedHasKotlin/module1_B.kt | 1 + .../clearedHasKotlin/module1_C.java | 1 + .../clearedHasKotlin/module1_C.java.touch.1 | 1 + .../clearedHasKotlin/module1_D.java | 1 + .../module1_clear-has-kotlin.new.1} | 0 ...odule1_do-not-change-cache-versions.new.2} | 0 .../clearedHasKotlin/module2_E.kt | 1 + .../clearedHasKotlin/module3_F.kt | 1 + .../javaOnlyModulesAreNotAffected/build.log | 14 ++++ .../data-container-version-build.log | 14 ++++ .../dependencies.txt | 3 + .../module1_A.java | 1 + .../module1_A.java.touch.1} | 0 .../module1_B.java | 1 + .../module1_B.java.touch.2} | 0 .../module2_C.java | 1 + .../module1Modified/build.log | 6 -- .../data-container-version-build.log | 6 -- .../moduleWithConstantModified/build.log | 2 + .../touchedOnlyJavaFile/A.java | 1 + .../touchedOnlyJavaFile/A.java.touch | 1 + .../touchedOnlyJavaFile/a.kt | 5 ++ .../touchedOnlyJavaFile/b.kt | 5 ++ .../touchedOnlyJavaFile/build.log | 17 ++++ .../data-container-version-build.log | 17 ++++ .../touchedOnlyJavaFile/other.kt | 4 + .../cacheVersionChanged/withError/build.log | 40 +++++++++ .../data-container-version-build.log | 38 +++++++++ .../withError/dependencies.txt | 5 ++ .../withError/module1_a.kt | 6 ++ .../withError/module1_a.kt.new.1 | 3 + .../withError/module1_a.kt.new.2 | 6 ++ ...module1_do-not-change-cache-versions.new.2 | 0 .../withError/module1_f.kt | 3 + .../withError/module2_b.kt | 8 ++ .../withError/module3_c.kt | 7 ++ .../withError/module4_d.kt | 3 + .../withError/module5_E.java | 3 + .../experimentalOn/build.log | 48 +++++++---- .../experimentalOn/dependencies.txt | 4 + .../experimentalOn/expected-kotlin-caches.txt | 22 ++++- .../experimentalOn/module1_z.kt | 3 + .../experimentalOn/{a.kt => module2_a.kt} | 0 .../experimentalOn/module2_a.kt.touch.1 | 0 .../experimentalOn/module2_a.kt.touch.2 | 0 .../experimentalOn/{b.kt => module2_b.kt} | 0 .../experimentalOn/{c.kt => module2_c.kt} | 0 ...=> module2_experimental-compilation.new.1} | 0 .../experimentalOn/module3_d.kt | 3 + .../experimentalOn/module4_e.kt | 3 + .../experimentalOnJavaChanged/build.log | 25 ++++++ .../dependencies.txt | 3 + .../expected-kotlin-caches.txt | 27 ++++++ .../experimentalOnJavaChanged/module1_a.kt | 1 + .../experimentalOnJavaChanged/module2_B.java | 1 + .../module2_B.java.new | 1 + .../experimentalOnJavaChanged/module2_c.kt | 1 + .../module2_experimental-compilation.new} | 0 .../experimentalOnJavaChanged/module3_d.kt | 1 + .../experimentalOnJavaOnly/A.java | 1 + .../experimentalOnJavaOnly/A.java.touch | 0 .../experimentalOnJavaOnly/B.java | 1 + .../experimentalOnJavaOnly/build.log | 6 ++ .../expected-kotlin-caches.txt | 3 + .../experimental-compilation.new} | 0 .../experimentalOnOff/build.log | 70 ++++++++++------ .../experimentalOnOff/dependencies.txt | 4 + .../expected-kotlin-caches.txt | 19 ++++- .../experimentalOnOff/module1_z.kt | 3 + .../experimentalOnOff/{a.kt => module2_a.kt} | 0 .../{a.kt.new.3 => module2_a.kt.new.3} | 0 .../experimentalOnOff/module2_a.kt.touch.1 | 0 .../experimentalOnOff/module2_a.kt.touch.2 | 0 .../experimentalOnOff/{b.kt => module2_b.kt} | 0 .../experimentalOnOff/{c.kt => module2_c.kt} | 0 .../module2_experimental-compilation.new.1 | 1 + ...=> module2_experimental-compilation.new.2} | 0 .../experimentalOnOff/module3_d.kt | 3 + .../experimentalOnOff/module4_e.kt | 3 + .../incrementalOff/build.log | 20 ++--- .../incrementalOff/dependencies.txt | 4 + .../incrementalOff/expected-kotlin-caches.txt | 10 ++- .../incrementalOff/module1_z.kt | 3 + .../incrementalOff/{a.kt => module2_a.kt} | 0 .../{a.kt.new.1 => module2_a.kt.new.1} | 0 .../{a.kt.new.2 => module2_a.kt.new.2} | 0 .../incrementalOff/{b.kt => module2_b.kt} | 0 .../incrementalOff/{c.kt => module2_c.kt} | 0 ... => module2_incremental-compilation.new.1} | 0 .../incrementalOff/module3_d.kt | 3 + .../incrementalOff/module4_e.kt | 3 + .../incrementalOffOn/build.log | 56 ++++++++----- .../incrementalOffOn/dependencies.txt | 4 + .../expected-kotlin-caches.txt | 19 ++++- .../incrementalOffOn/module1_z.kt | 3 + .../incrementalOffOn/{a.kt => module2_a.kt} | 0 .../{a.kt.new.1 => module2_a.kt.new.1} | 0 .../{a.kt.new.2 => module2_a.kt.new.2} | 0 .../{a.kt.new.3 => module2_a.kt.new.3} | 0 .../incrementalOffOn/{b.kt => module2_b.kt} | 0 .../incrementalOffOn/{c.kt => module2_c.kt} | 0 ... => module2_incremental-compilation.new.1} | 0 .../module2_incremental-compilation.new.2 | 1 + .../incrementalOffOn/module3_d.kt | 3 + .../incrementalOffOn/module4_e.kt | 3 + .../noKotlin/expected-kotlin-caches.txt | 1 - .../experimental-expected-kotlin-caches.txt | 5 +- 120 files changed, 760 insertions(+), 137 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java rename jps/jps-plugin/testData/incremental/{changeIncrementalOption/experimentalOn/a.kt.touch.1 => cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1} (100%) rename jps/jps-plugin/testData/incremental/{changeIncrementalOption/experimentalOn/a.kt.touch.2 => cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2} (100%) create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java rename jps/jps-plugin/testData/incremental/{changeIncrementalOption/experimentalOnOff/a.kt.touch.1 => cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1} (100%) create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java rename jps/jps-plugin/testData/incremental/{changeIncrementalOption/experimentalOnOff/a.kt.touch.2 => cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2} (100%) create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2 create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_f.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module3_c.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module4_d.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module5_E.java create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module1_z.kt rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/{a.kt => module2_a.kt} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt.touch.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt.touch.2 rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/{b.kt => module2_b.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/{c.kt => module2_c.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/{experimental-compilation.new.1 => module2_experimental-compilation.new.1} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module3_d.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module4_e.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java.new create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_c.kt rename jps/jps-plugin/testData/incremental/changeIncrementalOption/{experimentalOnOff/experimental-compilation.new.1 => experimentalOnJavaChanged/module2_experimental-compilation.new} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module3_d.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java.touch create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/B.java create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/expected-kotlin-caches.txt rename jps/jps-plugin/testData/incremental/changeIncrementalOption/{incrementalOffOn/incremental-compilation.new.2 => experimentalOnJavaOnly/experimental-compilation.new} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module1_z.kt rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/{a.kt => module2_a.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/{a.kt.new.3 => module2_a.kt.new.3} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.touch.1 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.touch.2 rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/{b.kt => module2_b.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/{c.kt => module2_c.kt} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.1 rename jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/{experimental-compilation.new.2 => module2_experimental-compilation.new.2} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module3_d.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module4_e.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/{a.kt => module2_a.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/{a.kt.new.1 => module2_a.kt.new.1} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/{a.kt.new.2 => module2_a.kt.new.2} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/{b.kt => module2_b.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/{c.kt => module2_c.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/{incremental-compilation.new.1 => module2_incremental-compilation.new.1} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/{a.kt => module2_a.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/{a.kt.new.1 => module2_a.kt.new.1} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/{a.kt.new.2 => module2_a.kt.new.2} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/{a.kt.new.3 => module2_a.kt.new.3} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/{b.kt => module2_b.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/{c.kt => module2_c.kt} (100%) rename jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/{incremental-compilation.new.1 => module2_incremental-compilation.new.1} (100%) create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2 create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt create mode 100644 jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6fa5ec58e8c..d18e41ac030 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -28,6 +28,8 @@ import org.jetbrains.jps.builders.impl.BuildTargetRegistryImpl import org.jetbrains.jps.builders.impl.TargetOutputIndexImpl import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor +import org.jetbrains.jps.builders.java.dependencyView.Mappings +import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.fs.CompilationRound @@ -73,6 +75,7 @@ import java.util.* public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { private val TARGETS_WITH_CLEARED_CACHES = Key>("Targets with cleared Kotlin caches") + private val HAS_KOTLIN_FILE_NAME = "has-kotlin.txt" public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" public val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") @@ -91,6 +94,21 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR context.putUserData(TARGETS_WITH_CLEARED_CACHES, data) } } + + private fun hasKotlin(target: ModuleBuildTarget, paths: BuildDataPaths): Boolean { + val hasKotlinFile = File(paths.getTargetDataRoot(target), HAS_KOTLIN_FILE_NAME) + return hasKotlinFile.exists() + } + + private fun setHasKotlin(target: ModuleBuildTarget, paths: BuildDataPaths) { + val hasKotlinFile = File(paths.getTargetDataRoot(target), HAS_KOTLIN_FILE_NAME) + hasKotlinFile.createNewFile() + } + + fun clearHasKotlin(target: ModuleBuildTarget, paths: BuildDataPaths) { + val hasKotlinFile = File(paths.getTargetDataRoot(target), HAS_KOTLIN_FILE_NAME) + hasKotlinFile.delete() + } } private val statisticsLogger = TeamcityStatisticsLogger() @@ -123,11 +141,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR try { val exitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) LOG.debug("Build result: " + exitCode) - - if (exitCode != ExitCode.CHUNK_REBUILD_REQUIRED && exitCode != ABORT) { - saveVersions(context, chunk) - } - return exitCode } catch (e: StopBuildException) { @@ -163,17 +176,22 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val targets = chunk.targets val requestedToRebuild = context.getUserData(TARGETS_WITH_CLEARED_CACHES) ?: setOf() val isFullRebuild = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context) + val hasDirtyKotlin = (dirtyFilesHolder.hasDirtyFiles() || dirtyFilesHolder.hasRemovedFiles()) && + hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk) - if (!isFullRebuild && !requestedToRebuild.containsAll(targets)) { - val exitCode = checkVersions(context, dataManager, targets) - - if (exitCode != null) return exitCode + if (!isFullRebuild && + !requestedToRebuild.containsAll(targets) && + (hasDirtyKotlin || targets.any { hasKotlin(it, dataManager.dataPaths) }) && + shouldRebuildBecauseVersionChanged(context, dataManager, targets) + ) { + FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) { KotlinSourceFileCollector.isKotlinSourceFile(it) } + return CHUNK_REBUILD_REQUIRED } - if (!dirtyFilesHolder.hasDirtyFiles() && - !dirtyFilesHolder.hasRemovedFiles() || - !hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk) - ) { + if (hasDirtyKotlin) { + targets.forEach { setHasKotlin(it, dataManager.dataPaths) } + } + else { return NOTHING_DONE } @@ -218,6 +236,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val generatedFiles = getGeneratedFiles(chunk, outputItemCollector) registerOutputItems(outputConsumer, generatedFiles) + saveVersions(context, chunk) if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { copyJsLibraryFilesIfNeeded(chunk, project) @@ -330,15 +349,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } - private fun checkVersions(context: CompileContext, dataManager: BuildDataManager, targets: MutableSet): ExitCode? { + private fun shouldRebuildBecauseVersionChanged(context: CompileContext, dataManager: BuildDataManager, targets: MutableSet): Boolean { val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) val allVersions = cacheVersionsProvider.allVersions(targets) val actions = allVersions.map { it.checkVersion() }.toSet().sorted() - - fun cleanNormalCaches() { - LOG.info("Clearing caches for " + targets.joinToString { it.presentableName }) - targets.forEach { dataManager.getKotlinCache(it).clean() } - } + val buildTargetIndex = context.projectDescriptor.buildTargetIndex + val allTargets = buildTargetIndex.allTargets.filterIsInstance().toSet() for (status in actions) { when (status) { @@ -354,29 +370,37 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - val buildTargetIndex = context.projectDescriptor.buildTargetIndex - val allTargets = buildTargetIndex.allTargets.filterIsInstance().toSet() - - for (target in targets) { + for (target in allTargets) { dataManager.getKotlinCache(target).clean() + + // prevents excessive version checking in parallel compilation (user data is not shared in parallel compilation) + clearHasKotlin(target, dataManager.dataPaths) } dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider).clean() registerTargetsWithClearedCaches(context, allTargets) - return CHUNK_REBUILD_REQUIRED + return true } CacheVersion.Action.REBUILD_CHUNK -> { - cleanNormalCaches() + LOG.info("Clearing caches for " + targets.joinToString { it.presentableName }) + targets.forEach { dataManager.getKotlinCache(it).clean() } registerTargetsWithClearedCaches(context, targets) - return CHUNK_REBUILD_REQUIRED + return true } CacheVersion.Action.CLEAN_NORMAL_CACHES -> { - cleanNormalCaches() + LOG.info("Clearing caches for all targets") + + for (target in allTargets) { + dataManager.getKotlinCache(target).clean() + } } CacheVersion.Action.CLEAN_EXPERIMENTAL_CACHES -> { - LOG.info("Clearing experimental caches for " + targets.joinToString { it.presentableName }) - targets.forEach { dataManager.getKotlinCache(it).cleanExperimental() } + LOG.info("Clearing experimental caches for all targets") + + for (target in allTargets) { + dataManager.getKotlinCache(target).cleanExperimental() + } } CacheVersion.Action.CLEAN_DATA_CONTAINER -> { LOG.info("Clearing lookup cache") @@ -389,7 +413,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - return null + return false } private fun saveVersions(context: CompileContext, chunk: ModuleChunk) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index cd2d932ec9d..498829ae793 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -21,10 +21,20 @@ import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { override fun performAdditionalModifications(modifications: List) { - val cacheVersionProvider = CacheVersionProvider(projectDescriptor.dataManager.dataPaths) - val versions = getVersions(cacheVersionProvider, projectDescriptor.allModuleTargets) - val versionFiles = versions.map { it.formatVersionFile }.filter { it.exists() } - versionFiles.forEach { it.writeText("777") } + val modifiedFiles = modifications.filterIsInstance().map { it.path } + val paths = projectDescriptor.dataManager.dataPaths + val targets = projectDescriptor.allModuleTargets + + if (modifiedFiles.any { it.endsWith("clear-has-kotlin") }) { + targets.forEach { KotlinBuilder.clearHasKotlin(it, paths) } + } + + if (modifiedFiles.none { it.endsWith("do-not-change-cache-versions") }) { + val cacheVersionProvider = CacheVersionProvider(paths) + val versions = getVersions(cacheVersionProvider, targets) + val versionFiles = versions.map { it.formatVersionFile }.filter { it.exists() } + versionFiles.forEach { it.writeText("777") } + } } protected open fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 26e4c9ee51a..110006b4079 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -51,8 +51,10 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps for (modification in modifications) { if (modification !is AbstractIncrementalJpsTest.ModifyContent) continue - when (File(modification.path).name) { - "incremental-compilation" -> { + val name = File(modification.path).name + + when { + name.endsWith("incremental-compilation") -> { if (modification.dataFile.readAsBool()) { IncrementalCompilation.enableIncrementalCompilation() } @@ -60,7 +62,7 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps IncrementalCompilation.disableIncrementalCompilation() } } - "experimental-compilation" -> { + name.endsWith("experimental-compilation") -> { if (modification.dataFile.readAsBool()) { IncrementalCompilation.enableExperimental() } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java index bb7036cc753..6c97d1c0b7a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java @@ -35,12 +35,24 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("clearedHasKotlin") + public void testClearedHasKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/"); + doTest(fileName); + } + @TestMetadata("exportedModule") public void testExportedModule() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); doTest(fileName); } + @TestMetadata("javaOnlyModulesAreNotAffected") + public void testJavaOnlyModulesAreNotAffected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/"); + doTest(fileName); + } + @TestMetadata("module1Modified") public void testModule1Modified() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); @@ -71,10 +83,22 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai doTest(fileName); } + @TestMetadata("touchedOnlyJavaFile") + public void testTouchedOnlyJavaFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/"); + doTest(fileName); + } + @TestMetadata("untouchedFiles") public void testUntouchedFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); doTest(fileName); } + @TestMetadata("withError") + public void testWithError() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/withError/"); + doTest(fileName); + } + } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java index 3c20c78835a..dcef0a52da9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java @@ -41,6 +41,18 @@ public class ExperimentalChangeIncrementalOptionTestGenerated extends AbstractEx doTest(fileName); } + @TestMetadata("experimentalOnJavaChanged") + public void testExperimentalOnJavaChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/"); + doTest(fileName); + } + + @TestMetadata("experimentalOnJavaOnly") + public void testExperimentalOnJavaOnly() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/"); + doTest(fileName); + } + @TestMetadata("experimentalOnOff") public void testExperimentalOnOff() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java index 3292698f37d..ceb8648cf91 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java @@ -35,12 +35,24 @@ public class ExperimentalIncrementalCacheVersionChangedTestGenerated extends Abs KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("clearedHasKotlin") + public void testClearedHasKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/"); + doTest(fileName); + } + @TestMetadata("exportedModule") public void testExportedModule() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); doTest(fileName); } + @TestMetadata("javaOnlyModulesAreNotAffected") + public void testJavaOnlyModulesAreNotAffected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/"); + doTest(fileName); + } + @TestMetadata("module1Modified") public void testModule1Modified() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); @@ -71,10 +83,22 @@ public class ExperimentalIncrementalCacheVersionChangedTestGenerated extends Abs doTest(fileName); } + @TestMetadata("touchedOnlyJavaFile") + public void testTouchedOnlyJavaFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/"); + doTest(fileName); + } + @TestMetadata("untouchedFiles") public void testUntouchedFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); doTest(fileName); } + @TestMetadata("withError") + public void testWithError() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/withError/"); + doTest(fileName); + } + } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index 77d283f12d3..8ca46395714 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -35,12 +35,24 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("clearedHasKotlin") + public void testClearedHasKotlin() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/"); + doTest(fileName); + } + @TestMetadata("exportedModule") public void testExportedModule() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/"); doTest(fileName); } + @TestMetadata("javaOnlyModulesAreNotAffected") + public void testJavaOnlyModulesAreNotAffected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/"); + doTest(fileName); + } + @TestMetadata("module1Modified") public void testModule1Modified() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/"); @@ -71,10 +83,22 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme doTest(fileName); } + @TestMetadata("touchedOnlyJavaFile") + public void testTouchedOnlyJavaFile() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/"); + doTest(fileName); + } + @TestMetadata("untouchedFiles") public void testUntouchedFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/"); doTest(fileName); } + @TestMetadata("withError") + public void testWithError() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/cacheVersionChanged/withError/"); + doTest(fileName); + } + } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 6940ee5df17..64194f40f8f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -57,7 +57,8 @@ import java.io.* import java.util.* import java.util.regex.Pattern import java.util.zip.ZipOutputStream -import kotlin.test.* +import kotlin.test.assertFalse +import kotlin.test.assertTrue public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { companion object { @@ -234,7 +235,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val buildResult = makeAll() buildResult.assertSuccessful() val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) - assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 2, warnings.size) + assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 1, warnings.size) assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText) } diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log new file mode 100644 index 00000000000..e058b68b0ac --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -0,0 +1,36 @@ +Cleaning output files: +out/production/module1/C.class +End of files +Compiling files: +module1/src/module1_C.java +End of files + + +Cleaning output files: +out/production/module1/A.class +End of files +Cleaning output files: +out/production/module1/B.class +out/production/module1/C.class +out/production/module1/D.class +End of files +Compiling files: +module1/src/module1_A.kt +module1/src/module1_B.kt +End of files +Compiling files: +module1/src/module1_C.java +module1/src/module1_D.java +End of files +Cleaning output files: +out/production/module2/E.class +End of files +Compiling files: +module2/src/module2_E.kt +End of files +Cleaning output files: +out/production/module3/F.class +End of files +Compiling files: +module3/src/module3_F.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log new file mode 100644 index 00000000000..1e24f9e3e07 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log @@ -0,0 +1,36 @@ +Cleaning output files: +out/production/module1/C.class +End of files +Compiling files: +module1/src/module1_C.java +End of files + + +Cleaning output files: +out/production/module1/A.class +End of files +Cleaning output files: +out/production/module1/B.class +out/production/module1/C.class +out/production/module1/D.class +End of files +Compiling files: +module1/src/module1_A.kt +module1/src/module1_B.kt +End of files +Compiling files: +module1/src/module1_C.java +module1/src/module1_D.java +End of files +Cleaning output files: +out/production/module2/E.class +End of files +Compiling files: +module2/src/module2_E.kt +End of files +Cleaning output files: +out/production/module3/F.class +End of files +Compiling files: +module3/src/module3_F.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt new file mode 100644 index 00000000000..07917d6cffb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3->module2 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt new file mode 100644 index 00000000000..fb7337ede5b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt @@ -0,0 +1 @@ +class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 new file mode 100644 index 00000000000..fb7337ede5b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 @@ -0,0 +1 @@ +class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt new file mode 100644 index 00000000000..3e191f19471 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_B.kt @@ -0,0 +1 @@ +class B \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java new file mode 100644 index 00000000000..f9822136b3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java @@ -0,0 +1 @@ +class C {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 new file mode 100644 index 00000000000..f9822136b3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 @@ -0,0 +1 @@ +class C {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java new file mode 100644 index 00000000000..470ad77df60 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_D.java @@ -0,0 +1 @@ +class D {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.1 rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_clear-has-kotlin.new.1 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt.touch.2 rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_do-not-change-cache-versions.new.2 diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt new file mode 100644 index 00000000000..83c981d6f4d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module2_E.kt @@ -0,0 +1 @@ +class E \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt new file mode 100644 index 00000000000..a6dfc0f60b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module3_F.kt @@ -0,0 +1 @@ +class F \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log new file mode 100644 index 00000000000..fcbc03b2b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module1/A.class +End of files +Compiling files: +module1/src/module1_A.java +End of files + + +Cleaning output files: +out/production/module1/B.class +End of files +Compiling files: +module1/src/module1_B.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/data-container-version-build.log new file mode 100644 index 00000000000..3b6e54c1052 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/data-container-version-build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module1/A.class +End of files +Compiling files: +module1/src/module1_A.java +End of files + + +Cleaning output files: +out/production/module1/B.class +End of files +Compiling files: +module1/src/module1_B.java +End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt new file mode 100644 index 00000000000..0341c1ffd5c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3->module2 diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java new file mode 100644 index 00000000000..37bdd2221a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java @@ -0,0 +1 @@ +class A {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.1 rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_A.java.touch.1 diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java new file mode 100644 index 00000000000..e747fd3a806 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java @@ -0,0 +1 @@ +class B {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.touch.2 rename to jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module1_B.java.touch.2 diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java new file mode 100644 index 00000000000..f9822136b3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/module2_C.java @@ -0,0 +1 @@ +class C {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index 5c6c5437904..ae0d40bb5e6 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -1,10 +1,4 @@ Cleaning output files: -out/production/module5/module5/E.class -End of files -Compiling files: -module5/src/module5_E.java -End of files -Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log index 668b93d1243..cc625e93b1f 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -1,10 +1,4 @@ Cleaning output files: -out/production/module5/module5/E.class -End of files -Compiling files: -module5/src/module5_E.java -End of files -Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index 07ee39331d0..f7d0b6869ff 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -7,6 +7,8 @@ module1/src/module1_A.kt End of files Cleaning output files: out/production/module2/b/B.class +End of files +Cleaning output files: out/production/module2/b/C.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java new file mode 100644 index 00000000000..37bdd2221a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java @@ -0,0 +1 @@ +class A {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch new file mode 100644 index 00000000000..37bdd2221a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch @@ -0,0 +1 @@ +class A {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt new file mode 100644 index 00000000000..9a91e164a2d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/a.kt @@ -0,0 +1,5 @@ +package test + +fun f() { + other.other() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt new file mode 100644 index 00000000000..f4131c37ad1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/b.kt @@ -0,0 +1,5 @@ +package test + +fun g() { + other.other() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log new file mode 100644 index 00000000000..0070e64876a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/A.class +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/other/OtherKt.class +out/production/module/test/AKt.class +out/production/module/test/BKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +src/other.kt +End of files +Compiling files: +src/A.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log new file mode 100644 index 00000000000..0070e64876a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/A.class +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/other/OtherKt.class +out/production/module/test/AKt.class +out/production/module/test/BKt.class +End of files +Compiling files: +src/a.kt +src/b.kt +src/other.kt +End of files +Compiling files: +src/A.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt new file mode 100644 index 00000000000..3b98ad64c05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/other.kt @@ -0,0 +1,4 @@ +package other + +fun other() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log new file mode 100644 index 00000000000..3f1259bdca5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -0,0 +1,40 @@ +Cleaning output files: +out/production/module4/module4/D.class +End of files +Compiling files: +module4/src/module4_d.kt +End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/A.class +out/production/module1/module1/Module1_aKt.class +End of files +Cleaning output files: +out/production/module1/module1/Module1_fKt.class +End of files +Compiling files: +module1/src/module1_a.kt +module1/src/module1_f.kt +End of files +COMPILATION FAILED +Name expected + + +Compiling files: +module1/src/module1_a.kt +module1/src/module1_f.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/module2/Module2_bKt.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module +out/production/module3/module3/Module3_cKt.class +End of files +Compiling files: +module3/src/module3_c.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log new file mode 100644 index 00000000000..5003113aa98 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log @@ -0,0 +1,38 @@ +Cleaning output files: +out/production/module4/module4/D.class +End of files +Compiling files: +module4/src/module4_d.kt +End of files +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/module1/A.class +out/production/module1/module1/Module1_aKt.class +out/production/module1/module1/Module1_fKt.class +End of files +Compiling files: +module1/src/module1_a.kt +module1/src/module1_f.kt +End of files +COMPILATION FAILED +Name expected + + +Compiling files: +module1/src/module1_a.kt +module1/src/module1_f.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/module2/Module2_bKt.class +End of files +Compiling files: +module2/src/module2_b.kt +End of files +Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module +out/production/module3/module3/Module3_cKt.class +End of files +Compiling files: +module3/src/module3_c.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/dependencies.txt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/dependencies.txt new file mode 100644 index 00000000000..b7b899af80f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/dependencies.txt @@ -0,0 +1,5 @@ +module1-> +module2->module1 +module3->module2 +module4-> +module5-> \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt new file mode 100644 index 00000000000..ae1b119fb6d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt @@ -0,0 +1,6 @@ +package module1 + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1 new file mode 100644 index 00000000000..773fd8147a8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.1 @@ -0,0 +1,3 @@ +package module1 + +class diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2 new file mode 100644 index 00000000000..253e9fcc4f5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_a.kt.new.2 @@ -0,0 +1,6 @@ +package module1 + +class A + +fun a() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_do-not-change-cache-versions.new.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_f.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_f.kt new file mode 100644 index 00000000000..03ab3d24beb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module1_f.kt @@ -0,0 +1,3 @@ +package module1 + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module2_b.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module2_b.kt new file mode 100644 index 00000000000..413a8224329 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module2_b.kt @@ -0,0 +1,8 @@ +package module2 + +import module1.* + +fun b() { + A() + a() +} diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module3_c.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module3_c.kt new file mode 100644 index 00000000000..3dfe95ad694 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module3_c.kt @@ -0,0 +1,7 @@ +package module3 + +import module2.* + +fun c() { + b() +} diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module4_d.kt b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module4_d.kt new file mode 100644 index 00000000000..b0747db7a0f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module4_d.kt @@ -0,0 +1,3 @@ +package module4 + +class D \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module5_E.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module5_E.java new file mode 100644 index 00000000000..3f5b139b15a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/module5_E.java @@ -0,0 +1,3 @@ +package module5; + +class E {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log index d8c11c7bcb2..bf5b1f99921 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log @@ -1,26 +1,42 @@ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/A.class -out/production/module/foo/AKt.class -End of files -Cleaning output files: -out/production/module/foo/B.class -out/production/module/foo/BKt.class -out/production/module/foo/C.class -out/production/module/foo/CKt.class +out/production/module1/foo/Z.class End of files Compiling files: -src/a.kt -src/b.kt -src/c.kt +module1/src/module1_z.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/A.class +out/production/module2/foo/B.class +out/production/module2/foo/C.class +out/production/module2/foo/Module2_aKt.class +out/production/module2/foo/Module2_bKt.class +out/production/module2/foo/Module2_cKt.class +End of files +Compiling files: +module2/src/module2_a.kt +module2/src/module2_b.kt +module2/src/module2_c.kt +End of files +Cleaning output files: +out/production/module3/foo/D.class +End of files +Compiling files: +module3/src/module3_d.kt +End of files +Cleaning output files: +out/production/module4/foo/E.class +End of files +Compiling files: +module4/src/module4_e.kt End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/A.class -out/production/module/foo/AKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/A.class +out/production/module2/foo/Module2_aKt.class End of files Compiling files: -src/a.kt +module2/src/module2_a.kt End of files diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/dependencies.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/dependencies.txt new file mode 100644 index 00000000000..698d200e129 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/dependencies.txt @@ -0,0 +1,4 @@ +module1-> +module2->module1 +module3->module2 +module4->module3 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt index 670ef919aaa..3df952e931c 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt @@ -4,10 +4,28 @@ kotlin-data-container file-to-id.tab id-to-file.tab lookups.tab -Module 'module' production +Module 'module1' production + experimental-format-version.txt + format-version.txt + proto.tab + source-to-classes.tab +Module 'module1' tests +Module 'module2' production experimental-format-version.txt format-version.txt package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module2' tests +Module 'module3' production + experimental-format-version.txt + format-version.txt + proto.tab + source-to-classes.tab +Module 'module3' tests +Module 'module4' production + experimental-format-version.txt + format-version.txt + proto.tab + source-to-classes.tab +Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module1_z.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module1_z.kt new file mode 100644 index 00000000000..37f1b9cdacd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module1_z.kt @@ -0,0 +1,3 @@ +package foo + +class Z \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/a.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt.touch.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt.touch.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt.touch.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_a.kt.touch.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/b.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_c.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/c.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_c.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/experimental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_experimental-compilation.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/experimental-compilation.new.1 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module2_experimental-compilation.new.1 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module3_d.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module3_d.kt new file mode 100644 index 00000000000..92d8afd3c2f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module3_d.kt @@ -0,0 +1,3 @@ +package foo + +class D \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module4_e.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module4_e.kt new file mode 100644 index 00000000000..4fcb2584608 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/module4_e.kt @@ -0,0 +1,3 @@ +package foo + +class E \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log new file mode 100644 index 00000000000..b81d72e61ad --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log @@ -0,0 +1,25 @@ +Cleaning output files: +out/production/module1/META-INF/module1.kotlin_module +out/production/module1/Module1_aKt.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files +Cleaning output files: +out/production/module2/B.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/Module2_cKt.class +End of files +Compiling files: +module2/src/module2_c.kt +End of files +Compiling files: +module2/src/module2_B.java +End of files +Cleaning output files: +out/production/module3/META-INF/module3.kotlin_module +out/production/module3/Module3_dKt.class +End of files +Compiling files: +module3/src/module3_d.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/dependencies.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/dependencies.txt new file mode 100644 index 00000000000..0341c1ffd5c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3->module2 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt new file mode 100644 index 00000000000..76de4a21c66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt @@ -0,0 +1,27 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module1' production + experimental-format-version.txt + format-version.txt + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module1' tests +Module 'module2' production + experimental-format-version.txt + format-version.txt + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module2' tests +Module 'module3' production + experimental-format-version.txt + format-version.txt + package-parts.tab + proto.tab + source-to-classes.tab +Module 'module3' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module1_a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module1_a.kt new file mode 100644 index 00000000000..71db38595a0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module1_a.kt @@ -0,0 +1 @@ +fun a() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java new file mode 100644 index 00000000000..e747fd3a806 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java @@ -0,0 +1 @@ +class B {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java.new b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java.new new file mode 100644 index 00000000000..e747fd3a806 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_B.java.new @@ -0,0 +1 @@ +class B {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_c.kt new file mode 100644 index 00000000000..ae6b28747fa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_c.kt @@ -0,0 +1 @@ +fun c() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_experimental-compilation.new similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.1 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module2_experimental-compilation.new diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module3_d.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module3_d.kt new file mode 100644 index 00000000000..eda79f72f21 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/module3_d.kt @@ -0,0 +1 @@ +fun d() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java new file mode 100644 index 00000000000..37bdd2221a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java @@ -0,0 +1 @@ +class A {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java.touch b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/A.java.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/B.java b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/B.java new file mode 100644 index 00000000000..e747fd3a806 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/B.java @@ -0,0 +1 @@ +class B {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log new file mode 100644 index 00000000000..b97f58152ee --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log @@ -0,0 +1,6 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.java +End of files diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/expected-kotlin-caches.txt new file mode 100644 index 00000000000..6feaf1a52c0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/expected-kotlin-caches.txt @@ -0,0 +1,3 @@ +kotlin-data-container +Module 'module' production +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/experimental-compilation.new similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.2 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/experimental-compilation.new diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log index 14e7514219b..6aa1259a392 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log @@ -1,47 +1,63 @@ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/A.class -out/production/module/foo/AKt.class -End of files -Cleaning output files: -out/production/module/foo/B.class -out/production/module/foo/BKt.class -out/production/module/foo/C.class -out/production/module/foo/CKt.class +out/production/module1/foo/Z.class End of files Compiling files: -src/a.kt -src/b.kt -src/c.kt +module1/src/module1_z.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/A.class +out/production/module2/foo/B.class +out/production/module2/foo/C.class +out/production/module2/foo/Module2_aKt.class +out/production/module2/foo/Module2_bKt.class +out/production/module2/foo/Module2_cKt.class +End of files +Compiling files: +module2/src/module2_a.kt +module2/src/module2_b.kt +module2/src/module2_c.kt +End of files +Cleaning output files: +out/production/module3/foo/D.class +End of files +Compiling files: +module3/src/module3_d.kt +End of files +Cleaning output files: +out/production/module4/foo/E.class +End of files +Compiling files: +module4/src/module4_e.kt End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/A.class -out/production/module/foo/AKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/A.class +out/production/module2/foo/Module2_aKt.class End of files Compiling files: -src/a.kt +module2/src/module2_a.kt End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/A.class -out/production/module/foo/AKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/A.class +out/production/module2/foo/Module2_aKt.class End of files Compiling files: -src/a.kt +module2/src/module2_a.kt End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/B.class -out/production/module/foo/BKt.class -out/production/module/foo/C.class -out/production/module/foo/CKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/B.class +out/production/module2/foo/C.class +out/production/module2/foo/Module2_bKt.class +out/production/module2/foo/Module2_cKt.class End of files Compiling files: -src/b.kt -src/c.kt +module2/src/module2_b.kt +module2/src/module2_c.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/dependencies.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/dependencies.txt new file mode 100644 index 00000000000..698d200e129 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/dependencies.txt @@ -0,0 +1,4 @@ +module1-> +module2->module1 +module3->module2 +module4->module3 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt index 45293da7039..8d7665c25d0 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt @@ -1,7 +1,22 @@ kotlin-data-container -Module 'module' production +Module 'module1' production + format-version.txt + proto.tab + source-to-classes.tab +Module 'module1' tests +Module 'module2' production format-version.txt package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module2' tests +Module 'module3' production + format-version.txt + proto.tab + source-to-classes.tab +Module 'module3' tests +Module 'module4' production + format-version.txt + proto.tab + source-to-classes.tab +Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module1_z.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module1_z.kt new file mode 100644 index 00000000000..37f1b9cdacd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module1_z.kt @@ -0,0 +1,3 @@ +package foo + +class Z \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.new.3 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.new.3 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/a.kt.new.3 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.new.3 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.touch.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.touch.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.touch.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_a.kt.touch.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/b.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_c.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/c.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_c.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.1 new file mode 100644 index 00000000000..e8fd903040e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.1 @@ -0,0 +1 @@ +on \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/experimental-compilation.new.2 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module2_experimental-compilation.new.2 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module3_d.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module3_d.kt new file mode 100644 index 00000000000..92d8afd3c2f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module3_d.kt @@ -0,0 +1,3 @@ +package foo + +class D \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module4_e.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module4_e.kt new file mode 100644 index 00000000000..4fcb2584608 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/module4_e.kt @@ -0,0 +1,3 @@ +package foo + +class E \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log index a7f60bb8342..541295aab83 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log @@ -1,20 +1,20 @@ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/Module2_aKt.class End of files Compiling files: -src/a.kt -src/b.kt -src/c.kt +module2/src/module2_a.kt +module2/src/module2_b.kt +module2/src/module2_c.kt End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/Module2_aKt.class End of files Compiling files: -src/a.kt -src/b.kt -src/c.kt +module2/src/module2_a.kt +module2/src/module2_b.kt +module2/src/module2_c.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/dependencies.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/dependencies.txt new file mode 100644 index 00000000000..698d200e129 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/dependencies.txt @@ -0,0 +1,4 @@ +module1-> +module2->module1 +module3->module2 +module4->module3 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt index f265ca29bf5..e273e094704 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt @@ -1,3 +1,9 @@ kotlin-data-container -Module 'module' production -Module 'module' tests +Module 'module1' production +Module 'module1' tests +Module 'module2' production +Module 'module2' tests +Module 'module3' production +Module 'module3' tests +Module 'module4' production +Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt new file mode 100644 index 00000000000..37f1b9cdacd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module1_z.kt @@ -0,0 +1,3 @@ +package foo + +class Z \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.1 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/a.kt.new.2 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_a.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/b.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/c.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_c.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/incremental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/incremental-compilation.new.1 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module2_incremental-compilation.new.1 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt new file mode 100644 index 00000000000..92d8afd3c2f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module3_d.kt @@ -0,0 +1,3 @@ +package foo + +class D \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt new file mode 100644 index 00000000000..4fcb2584608 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/module4_e.kt @@ -0,0 +1,3 @@ +package foo + +class E \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index 0286adad1d0..d9957c7d841 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -1,40 +1,56 @@ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/Module2_aKt.class End of files Compiling files: -src/a.kt -src/b.kt -src/c.kt +module2/src/module2_a.kt +module2/src/module2_b.kt +module2/src/module2_c.kt End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AKt.class -End of files -Cleaning output files: -out/production/module/foo/BKt.class -out/production/module/foo/CKt.class +out/production/module1/foo/Z.class End of files Compiling files: -src/a.kt -src/b.kt -src/c.kt +module1/src/module1_z.kt +End of files +Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/Module2_aKt.class +out/production/module2/foo/Module2_bKt.class +out/production/module2/foo/Module2_cKt.class +End of files +Compiling files: +module2/src/module2_a.kt +module2/src/module2_b.kt +module2/src/module2_c.kt +End of files +Cleaning output files: +out/production/module3/foo/D.class +End of files +Compiling files: +module3/src/module3_d.kt +End of files +Cleaning output files: +out/production/module4/foo/E.class +End of files +Compiling files: +module4/src/module4_e.kt End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/Module2_aKt.class End of files Compiling files: -src/a.kt +module2/src/module2_a.kt End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/BKt.class +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/Module2_bKt.class End of files Compiling files: -src/b.kt +module2/src/module2_b.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt new file mode 100644 index 00000000000..698d200e129 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/dependencies.txt @@ -0,0 +1,4 @@ +module1-> +module2->module1 +module3->module2 +module4->module3 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt index 744c17b4cdc..982cd0121bb 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt @@ -1,9 +1,24 @@ kotlin-data-container -Module 'module' production +Module 'module1' production + format-version.txt + proto.tab + source-to-classes.tab +Module 'module1' tests +Module 'module2' production format-version.txt inline-functions.tab inlined-to.tab package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module2' tests +Module 'module3' production + format-version.txt + proto.tab + source-to-classes.tab +Module 'module3' tests +Module 'module4' production + format-version.txt + proto.tab + source-to-classes.tab +Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt new file mode 100644 index 00000000000..37f1b9cdacd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module1_z.kt @@ -0,0 +1,3 @@ +package foo + +class Z \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.1 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.1 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.2 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.3 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/a.kt.new.3 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_a.kt.new.3 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/b.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/b.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_b.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/c.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/c.kt rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_c.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.1 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/incremental-compilation.new.1 rename to jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.1 diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2 b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2 new file mode 100644 index 00000000000..e8fd903040e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module2_incremental-compilation.new.2 @@ -0,0 +1 @@ +on \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt new file mode 100644 index 00000000000..92d8afd3c2f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module3_d.kt @@ -0,0 +1,3 @@ +package foo + +class D \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt new file mode 100644 index 00000000000..4fcb2584608 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/module4_e.kt @@ -0,0 +1,3 @@ +package foo + +class E \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt index a1c4ec77902..6feaf1a52c0 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/expected-kotlin-caches.txt @@ -1,4 +1,3 @@ kotlin-data-container Module 'module' production - format-version.txt Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt index ec62512a8c7..6feaf1a52c0 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/experimental-expected-kotlin-caches.txt @@ -1,6 +1,3 @@ kotlin-data-container - data-container-format-version.txt Module 'module' production - experimental-format-version.txt - format-version.txt -Module 'module' tests +Module 'module' tests \ No newline at end of file From 2f253f0c3ad413a42949f16a8db450ff3ec57930 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 27 Nov 2015 20:01:50 +0300 Subject: [PATCH 0684/1557] Do not use USER_DATA to preserve data between compilation rounds Original commit: 60a8db1c6cc1c4ecfc2037901a182c959a13dadb --- .../kotlin/jps/build/KotlinBuilder.kt | 33 ++++--------------- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- .../clearedHasKotlin/build.log | 22 ------------- .../data-container-version-build.log | 24 +------------- .../moduleWithConstantModified/build.log | 6 ---- .../moduleWithInlineModified/build.log | 6 ---- .../incrementalOffOn/build.log | 11 +++++++ 7 files changed, 19 insertions(+), 85 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index d18e41ac030..9681dd830a3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -74,27 +74,12 @@ import java.util.* public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { - private val TARGETS_WITH_CLEARED_CACHES = Key>("Targets with cleared Kotlin caches") private val HAS_KOTLIN_FILE_NAME = "has-kotlin.txt" public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" public val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") - private fun registerTargetsWithClearedCaches(context: CompileContext, targets: Set) { - synchronized(TARGETS_WITH_CLEARED_CACHES) { - val data = (context.getUserData(TARGETS_WITH_CLEARED_CACHES) ?: setOf()) + targets - context.putUserData(TARGETS_WITH_CLEARED_CACHES, data) - } - } - - private fun unregisterTargetsWithClearedCaches(context: CompileContext, targets: Set) { - synchronized(TARGETS_WITH_CLEARED_CACHES) { - val data = (context.getUserData(TARGETS_WITH_CLEARED_CACHES) ?: setOf()) - targets - context.putUserData(TARGETS_WITH_CLEARED_CACHES, data) - } - } - private fun hasKotlin(target: ModuleBuildTarget, paths: BuildDataPaths): Boolean { val hasKotlinFile = File(paths.getTargetDataRoot(target), HAS_KOTLIN_FILE_NAME) return hasKotlinFile.exists() @@ -174,21 +159,21 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val projectDescriptor = context.projectDescriptor val dataManager = projectDescriptor.dataManager val targets = chunk.targets - val requestedToRebuild = context.getUserData(TARGETS_WITH_CLEARED_CACHES) ?: setOf() val isFullRebuild = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context) - val hasDirtyKotlin = (dirtyFilesHolder.hasDirtyFiles() || dirtyFilesHolder.hasRemovedFiles()) && - hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk) if (!isFullRebuild && - !requestedToRebuild.containsAll(targets) && - (hasDirtyKotlin || targets.any { hasKotlin(it, dataManager.dataPaths) }) && + targets.any { hasKotlin(it, dataManager.dataPaths) } && shouldRebuildBecauseVersionChanged(context, dataManager, targets) ) { FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) { KotlinSourceFileCollector.isKotlinSourceFile(it) } + val targetsWithDependents = getIncrementalCaches(chunk, context).keys + targetsWithDependents.forEach { clearHasKotlin(it, dataManager.dataPaths) } return CHUNK_REBUILD_REQUIRED } - if (hasDirtyKotlin) { + if ((dirtyFilesHolder.hasDirtyFiles() || dirtyFilesHolder.hasRemovedFiles()) && + hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk) + ) { targets.forEach { setHasKotlin(it, dataManager.dataPaths) } } else { @@ -372,20 +357,15 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR for (target in allTargets) { dataManager.getKotlinCache(target).clean() - - // prevents excessive version checking in parallel compilation (user data is not shared in parallel compilation) - clearHasKotlin(target, dataManager.dataPaths) } dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider).clean() - registerTargetsWithClearedCaches(context, allTargets) return true } CacheVersion.Action.REBUILD_CHUNK -> { LOG.info("Clearing caches for " + targets.joinToString { it.presentableName }) targets.forEach { dataManager.getKotlinCache(it).clean() } - registerTargetsWithClearedCaches(context, targets) return true } CacheVersion.Action.CLEAN_NORMAL_CACHES -> { @@ -421,7 +401,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val targets = chunk.targets val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) cacheVersionsProvider.allVersions(targets).forEach { it.saveIfNeeded() } - unregisterTargetsWithClearedCaches(context, targets) } private fun doCompileModuleChunk( diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 64194f40f8f..e35f4947fd8 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -235,7 +235,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val buildResult = makeAll() buildResult.assertSuccessful() val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) - assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 1, warnings.size) + assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 2, warnings.size) assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText) } diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log index e058b68b0ac..83489248281 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -9,28 +9,6 @@ End of files Cleaning output files: out/production/module1/A.class End of files -Cleaning output files: -out/production/module1/B.class -out/production/module1/C.class -out/production/module1/D.class -End of files Compiling files: module1/src/module1_A.kt -module1/src/module1_B.kt -End of files -Compiling files: -module1/src/module1_C.java -module1/src/module1_D.java -End of files -Cleaning output files: -out/production/module2/E.class -End of files -Compiling files: -module2/src/module2_E.kt -End of files -Cleaning output files: -out/production/module3/F.class -End of files -Compiling files: -module3/src/module3_F.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log index 1e24f9e3e07..83489248281 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log @@ -9,28 +9,6 @@ End of files Cleaning output files: out/production/module1/A.class End of files -Cleaning output files: -out/production/module1/B.class -out/production/module1/C.class -out/production/module1/D.class -End of files Compiling files: module1/src/module1_A.kt -module1/src/module1_B.kt -End of files -Compiling files: -module1/src/module1_C.java -module1/src/module1_D.java -End of files -Cleaning output files: -out/production/module2/E.class -End of files -Compiling files: -module2/src/module2_E.kt -End of files -Cleaning output files: -out/production/module3/F.class -End of files -Compiling files: -module3/src/module3_F.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index f7d0b6869ff..d9e25129990 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -8,12 +8,6 @@ End of files Cleaning output files: out/production/module2/b/B.class End of files -Cleaning output files: -out/production/module2/b/C.class -End of files Compiling files: module2/src/module2_B.kt -End of files -Compiling files: -module2/src/module2_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index 679e1ce6888..2883783148a 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -9,12 +9,6 @@ End of files Cleaning output files: out/production/module2/b/B.class End of files -Cleaning output files: -out/production/module2/b/C.class -End of files Compiling files: module2/src/module2_B.kt -End of files -Compiling files: -module2/src/module2_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index d9957c7d841..bf4fea0aa71 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -27,6 +27,17 @@ module2/src/module2_b.kt module2/src/module2_c.kt End of files Cleaning output files: +out/production/module2/META-INF/module2.kotlin_module +out/production/module2/foo/Module2_aKt.class +out/production/module2/foo/Module2_bKt.class +out/production/module2/foo/Module2_cKt.class +End of files +Compiling files: +module2/src/module2_a.kt +module2/src/module2_b.kt +module2/src/module2_c.kt +End of files +Cleaning output files: out/production/module3/foo/D.class End of files Compiling files: From 6f68076f0ec46e55381870425d81596db3fbbac8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 27 Nov 2015 20:58:05 +0300 Subject: [PATCH 0685/1557] Minor: move check inside hasDirtyOrRemovedKotlin Original commit: 3d3d670cd78b685a2b70ca2704a892de1773f668 --- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 9681dd830a3..b05ca427777 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -171,9 +171,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return CHUNK_REBUILD_REQUIRED } - if ((dirtyFilesHolder.hasDirtyFiles() || dirtyFilesHolder.hasRemovedFiles()) && - hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk) - ) { + if (hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { targets.forEach { setHasKotlin(it, dataManager.dataPaths) } } else { @@ -828,11 +826,11 @@ private fun hasKotlinDirtyOrRemovedFiles( dirtyFilesHolder: DirtyFilesHolder, chunk: ModuleChunk ): Boolean { - if (!KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder).isEmpty()) { - return true - } + if (!dirtyFilesHolder.hasDirtyFiles() && !dirtyFilesHolder.hasRemovedFiles()) return false - return chunk.getTargets().any { !KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isEmpty() } + if (!KotlinSourceFileCollector.getDirtySourceFiles(dirtyFilesHolder).isEmpty) return true + + return chunk.targets.any { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isNotEmpty() } } public open class GeneratedFile internal constructor( From 3b419def7d631497a2ac477c46da61d3c5727e84 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 30 Nov 2015 14:52:31 +0300 Subject: [PATCH 0686/1557] Minor: add java to test case Original commit: 98e0905eb340d73c03eda5bddb969f149e6507b1 --- .../module1Modified/build.log | 14 ++++++++++++++ .../data-container-version-build.log | 16 ++++++++++++++++ .../module1Modified/module1_A.java | 1 + .../module1Modified/module2_B.java | 1 + .../module1Modified/module3_C.java | 1 + .../module1Modified/module4_D.java | 1 + 6 files changed, 34 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index ae0d40bb5e6..3c6cd9b049b 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -1,17 +1,27 @@ Cleaning output files: +out/production/module4/D.class out/production/module4/module4/D.class End of files Compiling files: module4/src/module4_d.kt End of files +Compiling files: +module4/src/module4_D.java +End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class out/production/module1/module1/Module1_aKt.class End of files +Cleaning output files: +out/production/module1/A.class +End of files Compiling files: module1/src/module1_a.kt End of files +Compiling files: +module1/src/module1_A.java +End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/Module2_bKt.class @@ -20,9 +30,13 @@ Compiling files: module2/src/module2_b.kt End of files Cleaning output files: +out/production/module3/C.class out/production/module3/META-INF/module3.kotlin_module out/production/module3/module3/Module3_cKt.class End of files Compiling files: module3/src/module3_c.kt +End of files +Compiling files: +module3/src/module3_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log index cc625e93b1f..b16aeb5f638 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -1,17 +1,27 @@ Cleaning output files: +out/production/module4/D.class out/production/module4/module4/D.class End of files Compiling files: module4/src/module4_d.kt End of files +Compiling files: +module4/src/module4_D.java +End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class out/production/module1/module1/Module1_aKt.class End of files +Cleaning output files: +out/production/module1/A.class +End of files Compiling files: module1/src/module1_a.kt End of files +Compiling files: +module1/src/module1_A.java +End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/Module2_bKt.class @@ -23,6 +33,12 @@ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/module3/Module3_cKt.class End of files +Cleaning output files: +out/production/module3/C.class +End of files Compiling files: module3/src/module3_c.kt End of files +Compiling files: +module3/src/module3_C.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java new file mode 100644 index 00000000000..37bdd2221a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_A.java @@ -0,0 +1 @@ +class A {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java new file mode 100644 index 00000000000..e747fd3a806 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module2_B.java @@ -0,0 +1 @@ +class B {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java new file mode 100644 index 00000000000..f9822136b3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module3_C.java @@ -0,0 +1 @@ +class C {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java new file mode 100644 index 00000000000..470ad77df60 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module4_D.java @@ -0,0 +1 @@ +class D {} \ No newline at end of file From 43aab45ce0c665b886176ae652f37a3bfb12291f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 1 Dec 2015 11:33:14 +0300 Subject: [PATCH 0687/1557] Introduce FSOperationsHelper to mark files dirty Original commit: 87f09ab5b0af47f8372c4357f1ee4e2abb4695d6 --- .../kotlin/jps/build/FSOperationsHelper.kt | 56 +++++++++++++++++ .../kotlin/jps/build/KotlinBuilder.kt | 62 ++++++++----------- 2 files changed, 83 insertions(+), 35 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt new file mode 100644 index 00000000000..967953edb84 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt @@ -0,0 +1,56 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +import org.jetbrains.jps.ModuleChunk +import org.jetbrains.jps.incremental.CompileContext +import org.jetbrains.jps.incremental.FSOperations +import org.jetbrains.jps.incremental.fs.CompilationRound +import java.io.File + +class FSOperationsHelper(private val compileContext: CompileContext, private val chunk: ModuleChunk) { + private var markedDirty = false + + fun hasMarkedDirty(): Boolean = markedDirty + + fun markChunk(recursively: Boolean = false, kotlinOnly: Boolean = true, excludeFiles: Set = setOf()) { + fun shouldMark(file: File): Boolean { + if (kotlinOnly && !KotlinSourceFileCollector.isKotlinSourceFile(file)) return false + + if (file in excludeFiles) return false + + markedDirty = true + return true + } + + if (recursively) { + FSOperations.markDirtyRecursively(compileContext, CompilationRound.NEXT, chunk, ::shouldMark) + } + else { + FSOperations.markDirty(compileContext, CompilationRound.NEXT, chunk, ::shouldMark) + } + } + + fun markFiles(files: Iterable, excludeFiles: Set = setOf()) { + for (file in files) { + if (file in excludeFiles || !file.exists()) continue + + FSOperations.markDirty(compileContext, CompilationRound.NEXT, file) + markedDirty = true + } + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b05ca427777..76e90390538 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -32,7 +32,6 @@ import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* -import org.jetbrains.jps.incremental.fs.CompilationRound import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage @@ -122,10 +121,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): ModuleLevelBuilder.ExitCode { LOG.debug("------------------------------------------") val messageCollector = MessageCollectorAdapter(context) + val fsOperations = FSOperationsHelper(context, chunk) try { - val exitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer) + val exitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, fsOperations) LOG.debug("Build result: " + exitCode) + + if (exitCode == OK && fsOperations.hasMarkedDirty()) return ADDITIONAL_PASS_REQUIRED + return exitCode } catch (e: StopBuildException) { @@ -148,7 +151,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR chunk: ModuleChunk, context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, - messageCollector: MessageCollectorAdapter, outputConsumer: ModuleLevelBuilder.OutputConsumer + messageCollector: MessageCollectorAdapter, + outputConsumer: OutputConsumer, + fsOperations: FSOperationsHelper ): ModuleLevelBuilder.ExitCode { // Workaround for Android Studio if (!JavaBuilder.IS_ENABLED[context, true] && !JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { @@ -163,9 +168,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (!isFullRebuild && targets.any { hasKotlin(it, dataManager.dataPaths) } && - shouldRebuildBecauseVersionChanged(context, dataManager, targets) + shouldRebuildBecauseVersionChanged(context, dataManager, targets, fsOperations) ) { - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk) { KotlinSourceFileCollector.isKotlinSourceFile(it) } + fsOperations.markChunk(recursively = true) val targetsWithDependents = getIncrementalCaches(chunk, context).keys targetsWithDependents.forEach { clearHasKotlin(it, dataManager.dataPaths) } return CHUNK_REBUILD_REQUIRED @@ -243,53 +248,41 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } - processChanges(context, chunk, filesToCompile.values(), allCompiledFiles, dataManager, caches, changesInfo) + processChanges(filesToCompile.values(), allCompiledFiles, dataManager, caches, changesInfo, fsOperations) return ADDITIONAL_PASS_REQUIRED } private fun processChanges( - context: CompileContext, - chunk: ModuleChunk, compiledFiles: Collection, allCompiledFiles: MutableSet, dataManager: BuildDataManager, caches: List, - compilationResult: CompilationResult + compilationResult: CompilationResult, + fsOperations: FSOperationsHelper ) { - fun recompileInlined() { - for (cache in caches) { - val filesToReinline = cache.getFilesToReinline() - - filesToReinline.forEach { - FSOperations.markDirty(context, CompilationRound.NEXT, it) - } - } - } - fun CompilationResult.doProcessChanges() { - fun isKotlin(file: File) = KotlinSourceFileCollector.isKotlinSourceFile(file) - fun isNotCompiled(file: File) = file !in allCompiledFiles - LOG.debug("compilationResult = $this") when { inlineAdded -> { allCompiledFiles.clear() - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, ::isKotlin) + fsOperations.markChunk(recursively = true) return } constantsChanged -> { - FSOperations.markDirtyRecursively(context, CompilationRound.NEXT, chunk, ::isNotCompiled) + fsOperations.markChunk(recursively = true, kotlinOnly = false, excludeFiles = allCompiledFiles) return } protoChanged -> { - FSOperations.markDirty(context, CompilationRound.NEXT, chunk, { isKotlin(it) && isNotCompiled(it) }) + fsOperations.markChunk(excludeFiles = allCompiledFiles) } } if (inlineChanged) { - recompileInlined() + for (cache in caches) { + fsOperations.markFiles(cache.getFilesToReinline()) + } } } @@ -312,10 +305,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR .toList() LOG.debug("Mark dirty files: $files") - - files.forEach { - FSOperations.markDirty(context, CompilationRound.NEXT, it) - } + fsOperations.markFiles(files) } LOG.debug("End of processing changes") @@ -331,8 +321,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - - private fun shouldRebuildBecauseVersionChanged(context: CompileContext, dataManager: BuildDataManager, targets: MutableSet): Boolean { + private fun shouldRebuildBecauseVersionChanged( + context: CompileContext, + dataManager: BuildDataManager, + targets: MutableSet, + fsOperations: FSOperationsHelper + ): Boolean { val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) val allVersions = cacheVersionsProvider.allVersions(targets) val actions = allVersions.map { it.checkVersion() }.toSet().sorted() @@ -348,9 +342,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR for (sourceRoot in sourceRoots) { val ktFiles = sourceRoot.file.walk().filter { KotlinSourceFileCollector.isKotlinSourceFile(it) } - ktFiles.forEach { kt -> - FSOperations.markDirty(context, CompilationRound.NEXT, kt) - } + fsOperations.markFiles(ktFiles.asIterable()) } for (target in allTargets) { From e8ced612d15dd315f9291462d33ed1814b864ae2 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 1 Dec 2015 20:06:03 +0300 Subject: [PATCH 0688/1557] Prevent processing changes if all kotlin in chunk was rebuilt Original commit: 19089f8b17c64876420e290acd361450e34da54b --- .../kotlin/jps/build/KotlinBuilder.kt | 62 ++++++++++--------- .../jetbrains/kotlin/jps/build/MarkerFile.kt | 60 ++++++++++++++++++ ...tractIncrementalCacheVersionChangedTest.kt | 3 +- .../clearedHasKotlin/build.log | 6 ++ .../data-container-version-build.log | 6 ++ .../module1Modified/build.log | 4 ++ .../data-container-version-build.log | 12 ---- .../moduleWithConstantModified/build.log | 4 ++ .../moduleWithInlineModified/build.log | 4 ++ .../incrementalOffOn/build.log | 9 --- 10 files changed, 118 insertions(+), 52 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 76e90390538..fe2d5aea5c3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -29,7 +29,6 @@ import org.jetbrains.jps.builders.impl.TargetOutputIndexImpl import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor import org.jetbrains.jps.builders.java.dependencyView.Mappings -import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.java.JavaBuilder @@ -73,26 +72,9 @@ import java.util.* public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { - private val HAS_KOTLIN_FILE_NAME = "has-kotlin.txt" - public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" public val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") - - private fun hasKotlin(target: ModuleBuildTarget, paths: BuildDataPaths): Boolean { - val hasKotlinFile = File(paths.getTargetDataRoot(target), HAS_KOTLIN_FILE_NAME) - return hasKotlinFile.exists() - } - - private fun setHasKotlin(target: ModuleBuildTarget, paths: BuildDataPaths) { - val hasKotlinFile = File(paths.getTargetDataRoot(target), HAS_KOTLIN_FILE_NAME) - hasKotlinFile.createNewFile() - } - - fun clearHasKotlin(target: ModuleBuildTarget, paths: BuildDataPaths) { - val hasKotlinFile = File(paths.getTargetDataRoot(target), HAS_KOTLIN_FILE_NAME) - hasKotlinFile.delete() - } } private val statisticsLogger = TeamcityStatisticsLogger() @@ -164,22 +146,25 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val projectDescriptor = context.projectDescriptor val dataManager = projectDescriptor.dataManager val targets = chunk.targets - val isFullRebuild = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context) + val hasKotlin = HasKotlinMarker(dataManager) + val rebuildAfterCacheVersionChanged = RebuildAfterCacheVersionChangeMarker(dataManager) + val isChunkRebuilding = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context) + || targets.any { rebuildAfterCacheVersionChanged[it] == true } - if (!isFullRebuild && - targets.any { hasKotlin(it, dataManager.dataPaths) } && + if (!isChunkRebuilding && + targets.any { hasKotlin[it] == true } && shouldRebuildBecauseVersionChanged(context, dataManager, targets, fsOperations) ) { - fsOperations.markChunk(recursively = true) - val targetsWithDependents = getIncrementalCaches(chunk, context).keys - targetsWithDependents.forEach { clearHasKotlin(it, dataManager.dataPaths) } + targets.forEach { rebuildAfterCacheVersionChanged[it] = true } return CHUNK_REBUILD_REQUIRED } - if (hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { - targets.forEach { setHasKotlin(it, dataManager.dataPaths) } - } - else { + if (!hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { + if (isChunkRebuilding) { + targets.forEach { hasKotlin[it] = false } + } + + targets.forEach { rebuildAfterCacheVersionChanged.clean(it) } return NOTHING_DONE } @@ -226,6 +211,15 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR registerOutputItems(outputConsumer, generatedFiles) saveVersions(context, chunk) + if (targets.any { hasKotlin[it] == null }) { + fsOperations.markChunk(excludeFiles = filesToCompile.values().toSet()) + } + + for (target in targets) { + hasKotlin[target] = true + rebuildAfterCacheVersionChanged.clean(target) + } + if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { copyJsLibraryFilesIfNeeded(chunk, project) return OK @@ -243,7 +237,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val changesInfo = updateKotlinIncrementalCache(compilationErrors, incrementalCaches, generatedFiles) updateLookupStorage(chunk, lookupTracker, dataManager, dirtyFilesHolder, filesToCompile) - if (isFullRebuild) { + if (isChunkRebuilding) { return OK } @@ -332,6 +326,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val actions = allVersions.map { it.checkVersion() }.toSet().sorted() val buildTargetIndex = context.projectDescriptor.buildTargetIndex val allTargets = buildTargetIndex.allTargets.filterIsInstance().toSet() + val hasKotlin = HasKotlinMarker(dataManager) + val rebuildAfterCacheVersionChanged = RebuildAfterCacheVersionChangeMarker(dataManager) for (status in actions) { when (status) { @@ -347,6 +343,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR for (target in allTargets) { dataManager.getKotlinCache(target).clean() + rebuildAfterCacheVersionChanged[target] = true } dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider).clean() @@ -355,7 +352,12 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } CacheVersion.Action.REBUILD_CHUNK -> { LOG.info("Clearing caches for " + targets.joinToString { it.presentableName }) - targets.forEach { dataManager.getKotlinCache(it).clean() } + + for (target in targets) { + dataManager.getKotlinCache(target).clean() + hasKotlin.clean(target) + } + return true } CacheVersion.Action.CLEAN_NORMAL_CACHES -> { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt new file mode 100644 index 00000000000..a3b5cca9291 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt @@ -0,0 +1,60 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.build + +import org.jetbrains.jps.builders.storage.BuildDataPaths +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.jps.incremental.storage.BuildDataManager +import org.jetbrains.kotlin.jps.incremental.CACHE_DIRECTORY_NAME +import java.io.File + +private val HAS_KOTLIN_MARKER_FILE_NAME = "has-kotlin-marker.txt" +private val REBUILD_AFTER_CACHE_VERSION_CHANGE_MARKER = "rebuild-after-cache-version-change-marker.txt" + +abstract class MarkerFile(private val fileName: String, private val paths: BuildDataPaths) { + operator fun get(target: ModuleBuildTarget): Boolean? { + val file = target.markerFile + + if (!file.exists()) return null + + return file.readText().toBoolean() + } + + operator fun set(target: ModuleBuildTarget, value: Boolean) { + val file = target.markerFile + + if (!file.exists()) { + file.parentFile.mkdirs() + file.createNewFile() + } + + file.writeText(value.toString()) + } + + fun clean(target: ModuleBuildTarget) { + target.markerFile.delete() + } + + private val ModuleBuildTarget.markerFile: File + get() { + val directory = File(paths.getTargetDataRoot(this), CACHE_DIRECTORY_NAME) + return File(directory, fileName) + } +} + +class HasKotlinMarker(dataManager: BuildDataManager) : MarkerFile(HAS_KOTLIN_MARKER_FILE_NAME, dataManager.dataPaths) +class RebuildAfterCacheVersionChangeMarker(dataManager: BuildDataManager) : MarkerFile(REBUILD_AFTER_CACHE_VERSION_CHANGE_MARKER, dataManager.dataPaths) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index 498829ae793..536f6d91219 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -24,9 +24,10 @@ abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJ val modifiedFiles = modifications.filterIsInstance().map { it.path } val paths = projectDescriptor.dataManager.dataPaths val targets = projectDescriptor.allModuleTargets + val hasKotlin = HasKotlinMarker(projectDescriptor.dataManager) if (modifiedFiles.any { it.endsWith("clear-has-kotlin") }) { - targets.forEach { KotlinBuilder.clearHasKotlin(it, paths) } + targets.forEach { hasKotlin.clean(it) } } if (modifiedFiles.none { it.endsWith("do-not-change-cache-versions") }) { diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log index 83489248281..5fdce9ad8e7 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -11,4 +11,10 @@ out/production/module1/A.class End of files Compiling files: module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module1/B.class +End of files +Compiling files: +module1/src/module1_B.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log index 83489248281..5fdce9ad8e7 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log @@ -11,4 +11,10 @@ out/production/module1/A.class End of files Compiling files: module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module1/B.class +End of files +Compiling files: +module1/src/module1_B.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index 3c6cd9b049b..7300f1cf983 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -23,12 +23,16 @@ Compiling files: module1/src/module1_A.java End of files Cleaning output files: +out/production/module2/B.class out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt End of files +Compiling files: +module2/src/module2_B.java +End of files Cleaning output files: out/production/module3/C.class out/production/module3/META-INF/module3.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log index b16aeb5f638..2ab0048b937 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -13,15 +13,9 @@ out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class out/production/module1/module1/Module1_aKt.class End of files -Cleaning output files: -out/production/module1/A.class -End of files Compiling files: module1/src/module1_a.kt End of files -Compiling files: -module1/src/module1_A.java -End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/Module2_bKt.class @@ -33,12 +27,6 @@ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/module3/Module3_cKt.class End of files -Cleaning output files: -out/production/module3/C.class -End of files Compiling files: module3/src/module3_c.kt -End of files -Compiling files: -module3/src/module3_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index d9e25129990..07ee39331d0 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -7,7 +7,11 @@ module1/src/module1_A.kt End of files Cleaning output files: out/production/module2/b/B.class +out/production/module2/b/C.class End of files Compiling files: module2/src/module2_B.kt +End of files +Compiling files: +module2/src/module2_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index 2883783148a..c9cf56e79b6 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -8,7 +8,11 @@ module1/src/module1_A.kt End of files Cleaning output files: out/production/module2/b/B.class +out/production/module2/b/C.class End of files Compiling files: module2/src/module2_B.kt +End of files +Compiling files: +module2/src/module2_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index bf4fea0aa71..dc9b74c5701 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -18,17 +18,8 @@ End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/Module2_aKt.class -out/production/module2/foo/Module2_bKt.class -out/production/module2/foo/Module2_cKt.class -End of files -Compiling files: -module2/src/module2_a.kt -module2/src/module2_b.kt -module2/src/module2_c.kt End of files Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/Module2_aKt.class out/production/module2/foo/Module2_bKt.class out/production/module2/foo/Module2_cKt.class End of files From be7a061a7007199d3e775774793da4b609187d0b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 1 Dec 2015 22:06:00 +0300 Subject: [PATCH 0689/1557] Do not recompile files compiled in current round Original commit: 4800cff87f69836078a076a7dad7711e04ef0df3 --- .../kotlin/jps/build/KotlinBuilder.kt | 23 ++++++++----------- .../jps/incremental/IncrementalCacheImpl.kt | 1 - ...perimentalIncrementalJpsTestGenerated.java | 12 ++++++++++ .../build/IncrementalJpsTestGenerated.java | 12 ++++++++++ .../pureKotlin/functionBecameInline/build.log | 4 +--- .../inlineModifiedWithUsage/build.log | 9 ++++++++ .../inlineModifiedWithUsage/inline.kt | 3 +++ .../inlineModifiedWithUsage/inline.kt.new | 3 +++ .../inlineModifiedWithUsage/usage.kt | 5 ++++ .../inlineModifiedWithUsage/usage.kt.new | 6 +++++ .../inlineUsedWhereDeclared/build.log | 16 +++++++++++++ .../inlineUsedWhereDeclared/inline.kt | 7 ++++++ .../inlineUsedWhereDeclared/inline.kt.new.1 | 7 ++++++ .../inlineUsedWhereDeclared/inline.kt.new.2 | 9 ++++++++ 14 files changed, 99 insertions(+), 18 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index fe2d5aea5c3..45e21ec3187 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -242,13 +242,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } - processChanges(filesToCompile.values(), allCompiledFiles, dataManager, caches, changesInfo, fsOperations) + processChanges(filesToCompile.values().toSet(), allCompiledFiles, dataManager, caches, changesInfo, fsOperations) + caches.forEach { it.cleanDirtyInlineFunctions() } return ADDITIONAL_PASS_REQUIRED } private fun processChanges( - compiledFiles: Collection, + compiledFiles: Set, allCompiledFiles: MutableSet, dataManager: BuildDataManager, caches: List, @@ -261,7 +262,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR when { inlineAdded -> { allCompiledFiles.clear() - fsOperations.markChunk(recursively = true) + fsOperations.markChunk(recursively = true, excludeFiles = compiledFiles) return } constantsChanged -> { @@ -275,7 +276,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (inlineChanged) { for (cache in caches) { - fsOperations.markFiles(cache.getFilesToReinline()) + fsOperations.markFiles(cache.getFilesToReinline(), excludeFiles = compiledFiles) } } } @@ -291,20 +292,14 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR if (change !is ChangeInfo.MembersChanged) continue - val files = change.names - .flatMap { lookupStorage.get(LookupSymbol(it, change.fqName.asString())) } - .asSequence() - .map { File(it) } - .filter { it !in compiledFiles && it.exists() } - .toList() + val files = change.names.asSequence() + .flatMap { lookupStorage.get(LookupSymbol(it, change.fqName.asString())).asSequence() } + .map(::File) - LOG.debug("Mark dirty files: $files") - fsOperations.markFiles(files) + fsOperations.markFiles(files.asIterable(), excludeFiles = compiledFiles) } LOG.debug("End of processing changes") - - caches.forEach { it.cleanDirtyInlineFunctions() } } if (IncrementalCompilation.isExperimental()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index e5bc9a750a6..3245982971d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -131,7 +131,6 @@ public class IncrementalCacheImpl( dependents.forEach(::addFilesAffectedByChangedInlineFuns) } - cleanDirtyInlineFunctions() return result.map { File(it) } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index a1d22faca06..6fbe156fd5d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -377,12 +377,24 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("inlineModifiedWithUsage") + public void testInlineModifiedWithUsage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); doTest(fileName); } + @TestMetadata("inlineUsedWhereDeclared") + public void testInlineUsedWhereDeclared() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/"); + doTest(fileName); + } + @TestMetadata("internalClassChanged") public void testInternalClassChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index b7379d4f0f1..007a6cb0e49 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -377,12 +377,24 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineModifiedWithUsage") + public void testInlineModifiedWithUsage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); doTest(fileName); } + @TestMetadata("inlineUsedWhereDeclared") + public void testInlineUsedWhereDeclared() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/"); + doTest(fileName); + } + @TestMetadata("internalClassChanged") public void testInternalClassChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log index 2692bd03c99..5e5f0f49f14 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log @@ -7,9 +7,7 @@ End of files Cleaning output files: out/production/module/X$main$1.class out/production/module/X.class -out/production/module/Y.class End of files Compiling files: -src/fun.kt src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log new file mode 100644 index 00000000000..330be2e1a29 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log @@ -0,0 +1,9 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/InlineKt.class +out/production/module/foo/UsageKt.class +End of files +Compiling files: +src/inline.kt +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt new file mode 100644 index 00000000000..0e41c31e1ef --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt @@ -0,0 +1,3 @@ +package foo + +inline fun f(): Int = 0 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new new file mode 100644 index 00000000000..891f70481be --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/inline.kt.new @@ -0,0 +1,3 @@ +package foo + +inline fun f(): Int = 1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt new file mode 100644 index 00000000000..2a8b034f986 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt @@ -0,0 +1,5 @@ +package foo + +fun useF() { + println(f()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new new file mode 100644 index 00000000000..6f5f66b9773 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/usage.kt.new @@ -0,0 +1,6 @@ +package foo + +fun useF() { + println(f()) + println(f()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log new file mode 100644 index 00000000000..6bcaff906d6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/InlineKt.class +End of files +Compiling files: +src/inline.kt +End of files + + +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/InlineKt.class +End of files +Compiling files: +src/inline.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt new file mode 100644 index 00000000000..5e0e29b4db7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt @@ -0,0 +1,7 @@ +package foo + +fun test() { + println(f()) +} + +inline fun f(): Int = 0 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1 new file mode 100644 index 00000000000..e50b3e84df8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.1 @@ -0,0 +1,7 @@ +package foo + +fun test() { + println(f()) +} + +inline fun f(): Int = 1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2 new file mode 100644 index 00000000000..71ccb6d1fbd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/inline.kt.new.2 @@ -0,0 +1,9 @@ +package foo + +fun test() { + println(f()) + println(g()) +} + +inline fun f(): Int = 1 +inline fun g(): Int = 1 \ No newline at end of file From 9782e83c7e53e8d3972a29beb96256207e529ef2 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 1 Dec 2015 23:05:43 +0300 Subject: [PATCH 0690/1557] Do not mark dirty same files Original commit: 7063e1f56abc3a52bd46b07109718fd24d8cc05b --- .../kotlin/jps/build/FSOperationsHelper.kt | 18 ++++++++++++++---- .../kotlin/jps/build/KotlinBuilder.kt | 7 +++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt index 967953edb84..000c183656f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt @@ -16,13 +16,18 @@ package org.jetbrains.kotlin.jps.build +import com.intellij.openapi.diagnostic.Logger import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.incremental.FSOperations import org.jetbrains.jps.incremental.fs.CompilationRound import java.io.File -class FSOperationsHelper(private val compileContext: CompileContext, private val chunk: ModuleChunk) { +class FSOperationsHelper( + private val compileContext: CompileContext, + private val chunk: ModuleChunk, + private val log: Logger +) { private var markedDirty = false fun hasMarkedDirty(): Boolean = markedDirty @@ -46,11 +51,16 @@ class FSOperationsHelper(private val compileContext: CompileContext, private val } fun markFiles(files: Iterable, excludeFiles: Set = setOf()) { - for (file in files) { - if (file in excludeFiles || !file.exists()) continue + val filesToMark = files.toMutableSet() + filesToMark.removeAll(excludeFiles) + log.debug("Mark dirty: $filesToMark") + + for (file in filesToMark) { + if (!file.exists()) continue FSOperations.markDirty(compileContext, CompilationRound.NEXT, file) - markedDirty = true } + + markedDirty = markedDirty || filesToMark.isNotEmpty() } } \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 45e21ec3187..938be5f43e8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -103,7 +103,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): ModuleLevelBuilder.ExitCode { LOG.debug("------------------------------------------") val messageCollector = MessageCollectorAdapter(context) - val fsOperations = FSOperationsHelper(context, chunk) + val fsOperations = FSOperationsHelper(context, chunk, LOG) try { val exitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, fsOperations) @@ -275,9 +275,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (inlineChanged) { - for (cache in caches) { - fsOperations.markFiles(cache.getFilesToReinline(), excludeFiles = compiledFiles) - } + val files = caches.flatMap { it.getFilesToReinline() } + fsOperations.markFiles(files, excludeFiles = compiledFiles) } } From a02c918251e162dac1ac5fa82d83a4f931c8015f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 2 Dec 2015 18:21:35 +0300 Subject: [PATCH 0691/1557] Minor: rename CACHE_DIRECTORY_NAME->KOTLIN_CACHE_DIRECTORY_NAME Original commit: 7fff17ba7cbc4edaca2f67e21b903d258673694b --- .../src/org/jetbrains/kotlin/jps/build/MarkerFile.kt | 4 ++-- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 8 ++------ .../kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt index a3b5cca9291..649bbe39177 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager -import org.jetbrains.kotlin.jps.incremental.CACHE_DIRECTORY_NAME +import org.jetbrains.kotlin.jps.incremental.KOTLIN_CACHE_DIRECTORY_NAME import java.io.File private val HAS_KOTLIN_MARKER_FILE_NAME = "has-kotlin-marker.txt" @@ -51,7 +51,7 @@ abstract class MarkerFile(private val fileName: String, private val paths: Build private val ModuleBuildTarget.markerFile: File get() { - val directory = File(paths.getTargetDataRoot(this), CACHE_DIRECTORY_NAME) + val directory = File(paths.getTargetDataRoot(this), KOTLIN_CACHE_DIRECTORY_NAME) return File(directory, fileName) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 3245982971d..7f4875a3b54 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -52,11 +52,7 @@ import java.io.File import java.security.MessageDigest import java.util.* -internal val CACHE_DIRECTORY_NAME = "kotlin" - -@TestOnly -public fun getCacheDirectoryName(): String = - CACHE_DIRECTORY_NAME +val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin" public class IncrementalCacheImpl( private val target: ModuleBuildTarget, @@ -77,7 +73,7 @@ public class IncrementalCacheImpl( private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } - private val baseDir = File(paths.getTargetDataRoot(target), CACHE_DIRECTORY_NAME) + private val baseDir = File(paths.getTargetDataRoot(target), KOTLIN_CACHE_DIRECTORY_NAME) private val cacheVersionProvider = CacheVersionProvider(paths) private val String.storageFile: File diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 110006b4079..e2b6e143e9c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -22,8 +22,8 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.incremental.CacheVersion import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider +import org.jetbrains.kotlin.jps.incremental.KOTLIN_CACHE_DIRECTORY_NAME import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget -import org.jetbrains.kotlin.jps.incremental.getCacheDirectoryName import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.utils.Printer import java.io.File @@ -95,7 +95,7 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps for (target in targets.sortedBy { it.presentableName }) { dumpCachesForTarget(p, paths, target, versions.normalVersion(target), versions.experimentalVersion(target), - subdirectory = getCacheDirectoryName()) + subdirectory = KOTLIN_CACHE_DIRECTORY_NAME) } return sb.toString() From a1c310812a3b9a54fef2505475d433d13b14ced8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 2 Dec 2015 18:41:33 +0300 Subject: [PATCH 0692/1557] Minor: refactor shouldRebuildBecauseVersionChanged Original commit: 73444ce59b34ac181c07e9ce3d44f85c8a5efa9a --- .../kotlin/jps/build/KotlinBuilder.kt | 37 +++++++++---------- .../kotlin/jps/incremental/CacheVersion.kt | 14 +++---- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 938be5f43e8..a1cdc8e75ed 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -151,14 +151,17 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val isChunkRebuilding = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context) || targets.any { rebuildAfterCacheVersionChanged[it] == true } - if (!isChunkRebuilding && - targets.any { hasKotlin[it] == true } && - shouldRebuildBecauseVersionChanged(context, dataManager, targets, fsOperations) - ) { - targets.forEach { rebuildAfterCacheVersionChanged[it] = true } - return CHUNK_REBUILD_REQUIRED - } + if (!isChunkRebuilding && targets.any { hasKotlin[it] == true }) { + val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) + val allVersions = cacheVersionsProvider.allVersions(targets) + val actions = allVersions.map { it.checkVersion() }.toSet() + applyActionsOnCacheVersionChange(actions, cacheVersionsProvider, context, dataManager, targets, fsOperations) + + if (actions.any { it.isChunkRebuildRequired }) { + return CHUNK_REBUILD_REQUIRED + } + } if (!hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { if (isChunkRebuilding) { targets.forEach { hasKotlin[it] = false } @@ -309,21 +312,20 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } - private fun shouldRebuildBecauseVersionChanged( + private fun applyActionsOnCacheVersionChange( + actions: Set, + cacheVersionsProvider: CacheVersionProvider, context: CompileContext, dataManager: BuildDataManager, targets: MutableSet, fsOperations: FSOperationsHelper - ): Boolean { - val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) - val allVersions = cacheVersionsProvider.allVersions(targets) - val actions = allVersions.map { it.checkVersion() }.toSet().sorted() + ) { val buildTargetIndex = context.projectDescriptor.buildTargetIndex val allTargets = buildTargetIndex.allTargets.filterIsInstance().toSet() val hasKotlin = HasKotlinMarker(dataManager) val rebuildAfterCacheVersionChanged = RebuildAfterCacheVersionChangeMarker(dataManager) - for (status in actions) { + for (status in actions.sorted()) { when (status) { CacheVersion.Action.REBUILD_ALL_KOTLIN -> { LOG.info("Kotlin global lookup map format changed, so rebuild all kotlin") @@ -341,8 +343,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider).clean() - - return true + return } CacheVersion.Action.REBUILD_CHUNK -> { LOG.info("Clearing caches for " + targets.joinToString { it.presentableName }) @@ -350,9 +351,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR for (target in targets) { dataManager.getKotlinCache(target).clean() hasKotlin.clean(target) + rebuildAfterCacheVersionChanged[target] = true } - - return true + return } CacheVersion.Action.CLEAN_NORMAL_CACHES -> { LOG.info("Clearing caches for all targets") @@ -378,8 +379,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } } - - return false } private fun saveVersions(context: CompileContext, chunk: ModuleChunk) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt index 01c04ee7501..e4a7107146f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -76,13 +76,13 @@ class CacheVersion( get() = versionFile // Order of entries is important, because actions are sorted in KotlinBuilder::checkVersions - enum class Action { - REBUILD_ALL_KOTLIN, - REBUILD_CHUNK, - CLEAN_NORMAL_CACHES, - CLEAN_EXPERIMENTAL_CACHES, - CLEAN_DATA_CONTAINER, - DO_NOTHING + enum class Action(val isChunkRebuildRequired: Boolean = false) { + REBUILD_ALL_KOTLIN(isChunkRebuildRequired = true), + REBUILD_CHUNK(isChunkRebuildRequired = true), + CLEAN_NORMAL_CACHES(), + CLEAN_EXPERIMENTAL_CACHES(), + CLEAN_DATA_CONTAINER(), + DO_NOTHING() } } From 1309da699617c64ef98c5c6f2ea9993f89a785ef Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 2 Dec 2015 20:25:25 +0300 Subject: [PATCH 0693/1557] Save system properties in incremental jps tests Original commit: d53cd3c70bf7c9edae10d5f7c07759b3a8b5780f --- .../jps/build/AbstractIncrementalJpsTest.kt | 27 ++++++++++++------- .../AbstractIncrementalLazyCachesTest.kt | 27 +++++-------------- ...experimentalIncrementalCompilationTests.kt | 8 +----- 3 files changed, 24 insertions(+), 38 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index a5b81e0b28e..ea41dcde371 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -53,6 +53,7 @@ import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.keysToMap +import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream @@ -106,14 +107,25 @@ public abstract class AbstractIncrementalJpsTest( Logger.getRootLogger().addAppender(console) } + private val systemPropertiesBackup = run { + val props = System.getProperties() + val output = ByteArrayOutputStream() + props.store(output, "System properties backup") + output.toByteArray() + } + + private fun restoreSystemProperties() { + val input = ByteArrayInputStream(systemPropertiesBackup) + val props = Properties() + props.load(input) + System.setProperties(props) + } + override fun setUp() { super.setUp() System.setProperty("kotlin.jps.tests", "true") lookupsDuringTest = hashSetOf() - - if (enableExperimentalIncrementalCompilation) { - IncrementalCompilation.enableExperimental() - } + IncrementalCompilation.setIsExperimental(enableExperimentalIncrementalCompilation) if (DEBUG_LOGGING_ENABLED) { enableDebugLogging() @@ -121,12 +133,7 @@ public abstract class AbstractIncrementalJpsTest( } override fun tearDown() { - System.clearProperty("kotlin.jps.tests") - - if (enableExperimentalIncrementalCompilation) { - IncrementalCompilation.disableExperimental() - } - + restoreSystemProperties() super.tearDown() } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index e2b6e143e9c..f7c635517d5 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -33,16 +33,11 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps get() = "expected-kotlin-caches.txt" override fun doTest(testDataPath: String) { - try { - super.doTest(testDataPath) + super.doTest(testDataPath) - val actual = dumpKotlinCachesFileNames() - val expectedFile = File(testDataPath, expectedCachesFileName) - UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual) - } - finally { - IncrementalCompilation.enableIncrementalCompilation() - } + val actual = dumpKotlinCachesFileNames() + val expectedFile = File(testDataPath, expectedCachesFileName) + UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual) } override fun performAdditionalModifications(modifications: List) { @@ -55,20 +50,10 @@ public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJps when { name.endsWith("incremental-compilation") -> { - if (modification.dataFile.readAsBool()) { - IncrementalCompilation.enableIncrementalCompilation() - } - else { - IncrementalCompilation.disableIncrementalCompilation() - } + IncrementalCompilation.setIsEnabled(modification.dataFile.readAsBool()) } name.endsWith("experimental-compilation") -> { - if (modification.dataFile.readAsBool()) { - IncrementalCompilation.enableExperimental() - } - else { - IncrementalCompilation.disableExperimental() - } + IncrementalCompilation.setIsExperimental(modification.dataFile.readAsBool()) } } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index d958e835def..7959a7025df 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -31,13 +31,7 @@ abstract class AbstractExperimentalIncrementalLazyCachesTest : AbstractIncrement get() = "experimental-expected-kotlin-caches.txt" } -abstract class AbstractExperimentalChangeIncrementalOptionTest : AbstractIncrementalLazyCachesTest() { - override fun setUp() { - super.setUp() - IncrementalCompilation.enableIncrementalCompilation() - IncrementalCompilation.disableExperimental() - } -} +abstract class AbstractExperimentalChangeIncrementalOptionTest : AbstractIncrementalLazyCachesTest() abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : AbstractIncrementalCacheVersionChangedTest() { override val enableExperimentalIncrementalCompilation = true From bbd5932a23ac4e5ec550312a4a69a11d8b026fc9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 30 Nov 2015 22:50:20 +0300 Subject: [PATCH 0694/1557] Report error when type parameter has a type parameter bound and any other bound To prevent issues with erasure on JVM: it's unclear what such type parameter should be erased to Original commit: d3c17ec337fe35c9c747296bee651dc114a5a587 --- .../lookupTracker/classifierMembers/constraints.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt index 1f41efa5406..579534024ae 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt @@ -2,6 +2,6 @@ package foo import bar.* -/*p:foo*/fun , C> test() - where C : /*p:foo*/Number, C : /*p:foo*/Comparable, C : B +/*p:foo*/fun , C, D> test() + where C : /*p:foo*/Number, C : /*p:foo*/Comparable, D : B {} From 7d8d4211550b43fa8d3a058158bdb082cbea8cde Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 8 Dec 2015 17:08:46 +0300 Subject: [PATCH 0695/1557] Simplify collection externalizers Original commit: 6ba5dcaa062dd3cb35a2183aa4029bc080aff28e --- .../jps/incremental/IncrementalCacheImpl.kt | 19 ++-- .../jps/incremental/storage/LookupMap.kt | 6 +- .../jps/incremental/storage/externalizers.kt | 89 ++++++------------- 3 files changed, 41 insertions(+), 73 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7f4875a3b54..24a32ced6dd 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -523,18 +523,18 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { - public fun add(facadeName: JvmClassName, partNames: List) { + private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { + public fun add(facadeName: JvmClassName, partNames: Collection) { storage[facadeName.internalName] = partNames } - public fun getMultifileClassParts(facadeName: String): List? = storage[facadeName] + public fun getMultifileClassParts(facadeName: String): Collection? = storage[facadeName] public fun remove(className: JvmClassName) { storage.remove(className.internalName) } - override fun dumpValue(value: List): String = value.toString() + override fun dumpValue(value: Collection): String = value.dumpCollection() } private inner class MultifileClassPartMap(storageFile: File) : BasicStringMap(storageFile, EnumeratorStringDescriptor.INSTANCE) { @@ -553,7 +553,7 @@ public class IncrementalCacheImpl( override fun dumpValue(value: String): String = value } - private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringListExternalizer) { + private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringCollectionExternalizer) { public fun clearOutputsForSource(sourceFile: File) { remove(sourceFile.absolutePath) } @@ -565,7 +565,7 @@ public class IncrementalCacheImpl( public operator fun get(sourceFile: File): Collection = storage[sourceFile.absolutePath].orEmpty().map { JvmClassName.byInternalName(it) } - override fun dumpValue(value: List) = value.toString() + override fun dumpValue(value: Collection) = value.dumpCollection() override fun clean() { storage.keys.forEach { remove(it) } @@ -594,16 +594,15 @@ public class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringListExternalizer) { - public fun getEntries(): Map> = + private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { + public fun getEntries(): Map> = storage.keys.toMap(JvmClassName::byInternalName) { storage[it]!! } public fun put(className: JvmClassName, changedFunctions: List) { storage[className.internalName] = changedFunctions } - override fun dumpValue(value: List) = - value.dumpCollection() + override fun dumpValue(value: Collection) = value.dumpCollection() } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index 7bc03663fdf..e5a73bb0564 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -18,16 +18,16 @@ package org.jetbrains.kotlin.jps.incremental.storage import java.io.File -internal class LookupMap(storage: File) : BasicMap>(storage, LookupSymbolKeyDescriptor, IntSetExternalizer) { +internal class LookupMap(storage: File) : BasicMap>(storage, LookupSymbolKeyDescriptor, IntCollectionExternalizer) { override fun dumpKey(key: LookupSymbolKey): String = key.toString() - override fun dumpValue(value: Set): String = value.toString() + override fun dumpValue(value: Collection): String = value.toString() public fun add(name: String, scope: String, fileId: Int) { storage.append(LookupSymbolKey(name, scope)) { out -> out.writeInt(fileId) } } - public operator fun get(key: LookupSymbolKey): Set? = storage[key] + public operator fun get(key: LookupSymbolKey): Collection? = storage[key] public operator fun set(key: LookupSymbolKey, fileIds: Set) { storage[key] = fileIds diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt index 96a5071a136..9190c808011 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt @@ -18,11 +18,11 @@ package org.jetbrains.kotlin.jps.incremental.storage import com.intellij.openapi.util.io.FileUtil import com.intellij.util.io.DataExternalizer +import com.intellij.util.io.EnumeratorStringDescriptor import com.intellij.util.io.IOUtil import com.intellij.util.io.KeyDescriptor import gnu.trove.THashSet -import gnu.trove.TIntHashSet -import gnu.trove.decorator.TIntHashSetDecorator +import org.jetbrains.jps.incremental.storage.PathStringDescriptor import java.io.DataInput import java.io.DataInputStream import java.io.DataOutput @@ -125,44 +125,6 @@ object StringToLongMapExternalizer : StringMapExternalizer() { } } - -object StringListExternalizer : DataExternalizer> { - override fun save(output: DataOutput, value: List) { - value.forEach { IOUtil.writeUTF(output, it) } - } - - override fun read(input: DataInput): List { - val result = ArrayList() - - while ((input as DataInputStream).available() > 0) { - result.add(IOUtil.readUTF(input)) - } - - return result - } -} - - -object PathCollectionExternalizer : DataExternalizer> { - override fun save(output: DataOutput, value: Collection) { - for (str in value) { - IOUtil.writeUTF(output, str) - } - } - - override fun read(input: DataInput): Collection { - val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) - val stream = input as DataInputStream - - while (stream.available() > 0) { - val str = IOUtil.readUTF(stream) - result.add(str) - } - - return result - } -} - object ConstantsMapExternalizer : DataExternalizer> { override fun save(output: DataOutput, map: Map?) { output.writeInt(map!!.size()) @@ -222,25 +184,6 @@ object ConstantsMapExternalizer : DataExternalizer> { } } - -object IntSetExternalizer : DataExternalizer> { - override fun save(output: DataOutput, value: Set) { - value.forEach { output.writeInt(it) } - } - - override fun read(input: DataInput): Set { - val result = TIntHashSet() - val stream = input as DataInputStream - - while (stream.available() > 0) { - val str = stream.readInt() - result.add(str) - } - - return TIntHashSetDecorator(result) - } -} - object IntExternalizer : DataExternalizer { override fun read(input: DataInput): Int = input.readInt() @@ -261,4 +204,30 @@ object FileKeyDescriptor : KeyDescriptor { override fun isEqual(val1: File?, val2: File?): Boolean = FileUtil.FILE_HASHING_STRATEGY.equals(val1, val2) -} \ No newline at end of file +} + +open class CollectionExternalizer( + private val elementExternalizer: DataExternalizer, + private val newCollection: ()->MutableCollection +) : DataExternalizer> { + override fun read(input: DataInput): Collection { + val result = newCollection() + val stream = input as DataInputStream + + while (stream.available() > 0) { + result.add(elementExternalizer.read(stream)) + } + + return result + } + + override fun save(output: DataOutput, value: Collection) { + value.forEach { elementExternalizer.save(output, it) } + } +} + +object StringCollectionExternalizer : CollectionExternalizer(EnumeratorStringDescriptor(), { HashSet() }) + +object PathCollectionExternalizer : CollectionExternalizer(PathStringDescriptor(), { THashSet(FileUtil.PATH_HASHING_STRATEGY) }) + +object IntCollectionExternalizer : CollectionExternalizer(IntExternalizer, { HashSet() }) From 6e08ea4524f3ff53c38044a58a8ab6d4256cb809 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 6 Nov 2015 14:47:14 +0300 Subject: [PATCH 0696/1557] Save class hierarchy to incremental caches Author: Alexey Tsvetkov Original commit: c567376e355b4a0da038d065482f481a415f01dd --- .../kotlin/jps/incremental/CacheVersion.kt | 2 +- .../jps/incremental/IncrementalCacheImpl.kt | 68 +++++++++++++++++-- .../jps/incremental/storage/BasicMap.kt | 3 + .../incremental/storage/ClassOneToManyMap.kt | 55 +++++++++++++++ ...talIncrementalLazyCachesTestGenerated.java | 6 ++ .../IncrementalLazyCachesTestGenerated.java | 6 ++ .../experimentalOn/expected-kotlin-caches.txt | 2 + .../classInheritance/build.log | 8 +++ .../expected-kotlin-caches.txt | 6 ++ .../experimental-expected-kotlin-caches.txt | 14 ++++ .../lazyKotlinCaches/classInheritance/main.kt | 5 ++ .../classInheritance/main.kt.touch | 0 12 files changed, 169 insertions(+), 6 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt index e4a7107146f..8759a94a67a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.load.java.JvmAbi import java.io.File private val NORMAL_VERSION = 7 -private val EXPERIMENTAL_VERSION = 1 +private val EXPERIMENTAL_VERSION = 2 private val DATA_CONTAINER_VERSION = 1 private val NORMAL_VERSION_FILE_NAME = "format-version.txt" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 24a32ced6dd..7f7493ff775 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -45,6 +45,8 @@ import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.serialization.ProtoBuf import org.jetbrains.kotlin.serialization.deserialization.NameResolver +import org.jetbrains.kotlin.serialization.deserialization.TypeTable +import org.jetbrains.kotlin.serialization.deserialization.supertypes import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.org.objectweb.asm.* @@ -69,12 +71,20 @@ public class IncrementalCacheImpl( val DIRTY_OUTPUT_CLASSES = "dirty-output-classes" val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions" val INLINED_TO = "inlined-to" + val SUBTYPES = "subtypes" + val SUPERTYPES = "supertypes" private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } private val baseDir = File(paths.getTargetDataRoot(target), KOTLIN_CACHE_DIRECTORY_NAME) private val cacheVersionProvider = CacheVersionProvider(paths) + private val experimentalMaps = arrayListOf>() + + private fun > registerExperimentalMap(map: M): M { + experimentalMaps.add(map) + return registerMap(map) + } private val String.storageFile: File get() = File(baseDir, this + "." + CACHE_EXTENSION) @@ -89,10 +99,15 @@ public class IncrementalCacheImpl( private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile)) private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) + private val subtypesMap = registerExperimentalMap(SubtypesMap(SUBTYPES.storageFile)) + private val supertypesMap = registerExperimentalMap(SupertypesMap(SUPERTYPES.storageFile)) private val dependents = arrayListOf() private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } + private val dependentsWithThis: Iterable + get() = dependents + this + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { inlinedTo.add(fromPath, jvmSignature, toPath) } @@ -118,13 +133,10 @@ public class IncrementalCacheImpl( for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { val classFilePath = getClassFilePath(className.internalName) - fun addFilesAffectedByChangedInlineFuns(cache: IncrementalCacheImpl) { + for (cache in dependentsWithThis) { val targetFiles = functions.flatMap { cache.inlinedTo[classFilePath, it] } result.addAll(targetFiles) } - - addFilesAffectedByChangedInlineFuns(this) - dependents.forEach(::addFilesAffectedByChangedInlineFuns) } return result.map { File(it) } @@ -149,7 +161,7 @@ public class IncrementalCacheImpl( public fun saveFileToCache(generatedClass: GeneratedJvmClass): CompilationResult { val sourceFiles: Collection = generatedClass.sourceFiles val kotlinClass: LocalFileKotlinClass = generatedClass.outputClass - val className = JvmClassName.byClassId(kotlinClass.classId) + val className = kotlinClass.className dirtyOutputClassesMap.notDirty(className.internalName) sourceFiles.forEach { @@ -185,6 +197,8 @@ public class IncrementalCacheImpl( inlineFunctionsMap.process(kotlinClass, isPackage = true) } header.isCompatibleClassKind() && !header.isLocalClass -> { + addToClassStorage(kotlinClass) + protoMap.process(kotlinClass, isPackage = false) + constantsMap.process(kotlinClass) + inlineFunctionsMap.process(kotlinClass, isPackage = false) @@ -268,6 +282,9 @@ public class IncrementalCacheImpl( constantsMap.remove(it) inlineFunctionsMap.remove(it) } + + removeAllFromClassStorage(dirtyClasses) + dirtyOutputClassesMap.clean() return changesInfo } @@ -316,6 +333,7 @@ public class IncrementalCacheImpl( public fun cleanExperimental() { cacheVersionProvider.experimentalVersion(target).clean() + experimentalMaps.forEach { it.clean() } } private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { @@ -576,6 +594,46 @@ public class IncrementalCacheImpl( } } + private fun addToClassStorage(kotlinClass: LocalFileKotlinClass) { + if (!IncrementalCompilation.isExperimental()) return + + val classData = JvmProtoBufUtil.readClassDataFrom(kotlinClass.classHeader.annotationData!!, kotlinClass.classHeader.strings!!) + val supertypes = classData.classProto.supertypes(TypeTable(classData.classProto.typeTable)) + val parents = supertypes.map { classData.nameResolver.getClassId(it.className).asSingleFqName() } + .filter { it.asString() != "kotlin.Any" } + val child = kotlinClass.classId.asSingleFqName() + + parents.forEach { subtypesMap.add(it, child) } + supertypesMap[child] = parents + } + + private fun removeAllFromClassStorage(removedClasses: Collection) { + if (!IncrementalCompilation.isExperimental() || removedClasses.isEmpty()) return + + val removedFqNames = removedClasses.map { it.fqNameForClassNameWithoutDollars }.toSet() + + for (cache in dependentsWithThis) { + val parentsFqNames = hashSetOf() + val childrenFqNames = hashSetOf() + + for (removedFqName in removedFqNames) { + parentsFqNames.addAll(cache.supertypesMap[removedFqName]) + childrenFqNames.addAll(cache.subtypesMap[removedFqName]) + + cache.supertypesMap.remove(removedFqName) + cache.subtypesMap.remove(removedFqName) + } + + for (child in childrenFqNames) { + cache.supertypesMap.removeValues(child, removedFqNames) + } + + for (parent in parentsFqNames) { + cache.subtypesMap.removeValues(parent, removedFqNames) + } + } + } + private inner class DirtyOutputClassesMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { public fun markDirty(className: String) { storage[className] = true diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 839e645b726..64bf6b88f91 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -60,7 +60,10 @@ internal abstract class BasicMap, V>( }.toString() } + @TestOnly protected abstract fun dumpKey(key: K): String + + @TestOnly protected abstract fun dumpValue(value: V): String } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt new file mode 100644 index 00000000000..249a96e8d02 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt @@ -0,0 +1,55 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental.storage + +import org.jetbrains.kotlin.jps.incremental.dumpCollection +import org.jetbrains.kotlin.name.FqName +import java.io.File + +internal open class ClassOneToManyMap( + storageFile: File +) : BasicStringMap>(storageFile, StringCollectionExternalizer) { + override fun dumpValue(value: Collection): String = value.dumpCollection() + + fun add(key: FqName, value: FqName) { + storage.append(key.asString()) { out -> out.writeUTF(value.asString()) } + } + + operator fun get(key: FqName): Collection = + storage[key.asString()]?.map(::FqName) ?: setOf() + + operator fun set(key: FqName, values: Collection) { + if (values.isEmpty()) { + remove(key) + return + } + + storage[key.asString()] = values.map(FqName::asString) + } + + fun remove(key: FqName) { + storage.remove(key.asString()) + } + + fun removeValues(key: FqName, removed: Set) { + val notRemoved = this[key].filter { it !in removed } + this[key] = notRemoved + } +} + +internal class SubtypesMap(storageFile: File) : ClassOneToManyMap(storageFile) +internal class SupertypesMap(storageFile: File) : ClassOneToManyMap(storageFile) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java index 1cacaaa5088..0a61111e4b0 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java @@ -41,6 +41,12 @@ public class ExperimentalIncrementalLazyCachesTestGenerated extends AbstractExpe doTest(fileName); } + @TestMetadata("classInheritance") + public void testClassInheritance() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/"); + doTest(fileName); + } + @TestMetadata("constant") public void testConstant() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 865585c9c52..a84128bbfb3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -41,6 +41,12 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC doTest(fileName); } + @TestMetadata("classInheritance") + public void testClassInheritance() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/"); + doTest(fileName); + } + @TestMetadata("constant") public void testConstant() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/constant/"); diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt index 3df952e931c..c892b694310 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt @@ -16,6 +16,8 @@ Module 'module2' production package-parts.tab proto.tab source-to-classes.tab + subtypes.tab + supertypes.tab Module 'module2' tests Module 'module3' production experimental-format-version.txt diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log new file mode 100644 index 00000000000..0eb0c755f29 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log @@ -0,0 +1,8 @@ +Cleaning output files: +out/production/module/A.class +out/production/module/B.class +out/production/module/C.class +End of files +Compiling files: +src/main.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt new file mode 100644 index 00000000000..cf4dcf7ea18 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt @@ -0,0 +1,6 @@ +kotlin-data-container +Module 'module' production + format-version.txt + proto.tab + source-to-classes.tab +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt new file mode 100644 index 00000000000..61e7c351e3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt @@ -0,0 +1,14 @@ +kotlin-data-container + data-container-format-version.txt + counters.tab + file-to-id.tab + id-to-file.tab + lookups.tab +Module 'module' production + experimental-format-version.txt + format-version.txt + proto.tab + source-to-classes.tab + subtypes.tab + supertypes.tab +Module 'module' tests diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt new file mode 100644 index 00000000000..e425830313d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt @@ -0,0 +1,5 @@ +open class A + +open class B : A() + +class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/main.kt.touch new file mode 100644 index 00000000000..e69de29bb2d From cc4bdb814d86c5906626fe0e8f1fcb61a5611237 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 8 Dec 2015 21:39:06 +0300 Subject: [PATCH 0697/1557] Increment cache version Wildcard generation could cause source level incompatibility, so we should rebuild Original commit: e6bba017986e7715f472900c15a0b385a4b4a1c0 --- .../src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt index 8759a94a67a..ca76e199f75 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.jps.incremental.CacheVersion.Action import org.jetbrains.kotlin.load.java.JvmAbi import java.io.File -private val NORMAL_VERSION = 7 +private val NORMAL_VERSION = 8 private val EXPERIMENTAL_VERSION = 2 private val DATA_CONTAINER_VERSION = 1 From 93dd3dfe25fd0dd8cd0b1a8f7368ec49ab17f0f2 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 9 Dec 2015 20:40:58 +0300 Subject: [PATCH 0698/1557] Minor: move buildFinished closer to buildStarted Original commit: 49778d2fb68e8f54c3929520dff4e6eafe115f2f --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a1cdc8e75ed..cfac6296cea 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -28,7 +28,6 @@ import org.jetbrains.jps.builders.impl.BuildTargetRegistryImpl import org.jetbrains.jps.builders.impl.TargetOutputIndexImpl import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor -import org.jetbrains.jps.builders.java.dependencyView.Mappings import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.java.JavaBuilder @@ -95,6 +94,10 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } + override fun buildFinished(context: CompileContext?) { + statisticsLogger.reportTotal() + } + override fun build( context: CompileContext, chunk: ModuleChunk, @@ -727,10 +730,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } } } - - override fun buildFinished(context: CompileContext?) { - statisticsLogger.reportTotal() - } } private val Iterable>.moduleTargets: Iterable From 9f5046b3e790aab5768708925a9809ae37d18e6b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 9 Dec 2015 21:27:30 +0300 Subject: [PATCH 0699/1557] Rebuild only kotlin when cache version is changed Original commit: 6a74b1c8bfaef8d138781c7aceed381a7a155ca6 --- .../kotlin/jps/build/KotlinBuilder.kt | 33 ++++++++++------ .../kotlin/jps/incremental/CacheVersion.kt | 14 +++---- .../data-container-version-build.log | 20 ---------- .../data-container-version-build.log | 14 ------- .../module1Modified/build.log | 18 --------- .../data-container-version-build.log | 32 ---------------- .../moduleWithConstantModified/build.log | 4 -- .../data-container-version-build.log | 13 ------- .../moduleWithInlineModified/build.log | 4 -- .../data-container-version-build.log | 14 ------- .../cacheVersionChanged/touchedFile/build.log | 4 +- .../touchedOnlyJavaFile/build.log | 2 - .../data-container-version-build.log | 17 --------- .../cacheVersionChanged/withError/build.log | 2 - .../data-container-version-build.log | 38 ------------------- .../incrementalOffOn/build.log | 2 - 16 files changed, 30 insertions(+), 201 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/data-container-version-build.log delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index cfac6296cea..b167b4818fb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -98,6 +98,25 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR statisticsLogger.reportTotal() } + override fun chunkBuildStarted(context: CompileContext, chunk: ModuleChunk) { + super.chunkBuildStarted(context, chunk) + + if (JavaBuilderUtil.isForcedRecompilationAllJavaModules(context)) return + + val targets = chunk.targets + val dataManager = context.projectDescriptor.dataManager + val hasKotlin = HasKotlinMarker(dataManager) + + if (targets.none { hasKotlin[it] == true }) return + + val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) + val allVersions = cacheVersionsProvider.allVersions(targets) + val actions = allVersions.map { it.checkVersion() }.toSet() + + val fsOperations = FSOperationsHelper(context, chunk, LOG) + applyActionsOnCacheVersionChange(actions, cacheVersionsProvider, context, dataManager, targets, fsOperations) + } + override fun build( context: CompileContext, chunk: ModuleChunk, @@ -154,17 +173,6 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val isChunkRebuilding = JavaBuilderUtil.isForcedRecompilationAllJavaModules(context) || targets.any { rebuildAfterCacheVersionChanged[it] == true } - if (!isChunkRebuilding && targets.any { hasKotlin[it] == true }) { - val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) - val allVersions = cacheVersionsProvider.allVersions(targets) - val actions = allVersions.map { it.checkVersion() }.toSet() - - applyActionsOnCacheVersionChange(actions, cacheVersionsProvider, context, dataManager, targets, fsOperations) - - if (actions.any { it.isChunkRebuildRequired }) { - return CHUNK_REBUILD_REQUIRED - } - } if (!hasKotlinDirtyOrRemovedFiles(dirtyFilesHolder, chunk)) { if (isChunkRebuilding) { targets.forEach { hasKotlin[it] = false } @@ -356,6 +364,9 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR hasKotlin.clean(target) rebuildAfterCacheVersionChanged[target] = true } + + fsOperations.markChunk() + return } CacheVersion.Action.CLEAN_NORMAL_CACHES -> { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt index ca76e199f75..cb28c1014ce 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -76,13 +76,13 @@ class CacheVersion( get() = versionFile // Order of entries is important, because actions are sorted in KotlinBuilder::checkVersions - enum class Action(val isChunkRebuildRequired: Boolean = false) { - REBUILD_ALL_KOTLIN(isChunkRebuildRequired = true), - REBUILD_CHUNK(isChunkRebuildRequired = true), - CLEAN_NORMAL_CACHES(), - CLEAN_EXPERIMENTAL_CACHES(), - CLEAN_DATA_CONTAINER(), - DO_NOTHING() + enum class Action { + REBUILD_ALL_KOTLIN, + REBUILD_CHUNK, + CLEAN_NORMAL_CACHES, + CLEAN_EXPERIMENTAL_CACHES, + CLEAN_DATA_CONTAINER, + DO_NOTHING } } diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log deleted file mode 100644 index 5fdce9ad8e7..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/data-container-version-build.log +++ /dev/null @@ -1,20 +0,0 @@ -Cleaning output files: -out/production/module1/C.class -End of files -Compiling files: -module1/src/module1_C.java -End of files - - -Cleaning output files: -out/production/module1/A.class -End of files -Compiling files: -module1/src/module1_A.kt -End of files -Cleaning output files: -out/production/module1/B.class -End of files -Compiling files: -module1/src/module1_B.kt -End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/data-container-version-build.log deleted file mode 100644 index 3b6e54c1052..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/data-container-version-build.log +++ /dev/null @@ -1,14 +0,0 @@ -Cleaning output files: -out/production/module1/A.class -End of files -Compiling files: -module1/src/module1_A.java -End of files - - -Cleaning output files: -out/production/module1/B.class -End of files -Compiling files: -module1/src/module1_B.java -End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index 7300f1cf983..ae0d40bb5e6 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -1,46 +1,28 @@ Cleaning output files: -out/production/module4/D.class out/production/module4/module4/D.class End of files Compiling files: module4/src/module4_d.kt End of files -Compiling files: -module4/src/module4_D.java -End of files Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class out/production/module1/module1/Module1_aKt.class End of files -Cleaning output files: -out/production/module1/A.class -End of files Compiling files: module1/src/module1_a.kt End of files -Compiling files: -module1/src/module1_A.java -End of files Cleaning output files: -out/production/module2/B.class out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/Module2_bKt.class End of files Compiling files: module2/src/module2_b.kt End of files -Compiling files: -module2/src/module2_B.java -End of files Cleaning output files: -out/production/module3/C.class out/production/module3/META-INF/module3.kotlin_module out/production/module3/module3/Module3_cKt.class End of files Compiling files: module3/src/module3_c.kt -End of files -Compiling files: -module3/src/module3_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log deleted file mode 100644 index 2ab0048b937..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ /dev/null @@ -1,32 +0,0 @@ -Cleaning output files: -out/production/module4/D.class -out/production/module4/module4/D.class -End of files -Compiling files: -module4/src/module4_d.kt -End of files -Compiling files: -module4/src/module4_D.java -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1_aKt.class -End of files -Compiling files: -module1/src/module1_a.kt -End of files -Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/module2/Module2_bKt.class -End of files -Compiling files: -module2/src/module2_b.kt -End of files -Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3_cKt.class -End of files -Compiling files: -module3/src/module3_c.kt -End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index 07ee39331d0..d9e25129990 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -7,11 +7,7 @@ module1/src/module1_A.kt End of files Cleaning output files: out/production/module2/b/B.class -out/production/module2/b/C.class End of files Compiling files: module2/src/module2_B.kt -End of files -Compiling files: -module2/src/module2_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log deleted file mode 100644 index 6765eb04250..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log +++ /dev/null @@ -1,13 +0,0 @@ -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/Module1_AKt.class -End of files -Compiling files: -module1/src/module1_A.kt -End of files -Cleaning output files: -out/production/module2/b/B.class -End of files -Compiling files: -module2/src/module2_B.kt -End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index c9cf56e79b6..2883783148a 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -8,11 +8,7 @@ module1/src/module1_A.kt End of files Cleaning output files: out/production/module2/b/B.class -out/production/module2/b/C.class End of files Compiling files: module2/src/module2_B.kt -End of files -Compiling files: -module2/src/module2_C.java End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log deleted file mode 100644 index 93bb946a783..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log +++ /dev/null @@ -1,14 +0,0 @@ -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/Module1_AKt.class -End of files -Compiling files: -module1/src/module1_A.kt -End of files -Cleaning output files: -out/production/module2/b/B.class -End of files -Compiling files: -module2/src/module2_B.kt -End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log index 84c1b712769..241969e6b52 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log @@ -1,10 +1,8 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class -End of files -Cleaning output files: out/production/module/other/OtherKt.class out/production/module/test/AKt.class +out/production/module/test/BKt.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log index 0070e64876a..4c18d5c71da 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log @@ -1,7 +1,5 @@ Cleaning output files: out/production/module/A.class -End of files -Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class out/production/module/test/AKt.class diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log deleted file mode 100644 index 0070e64876a..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log +++ /dev/null @@ -1,17 +0,0 @@ -Cleaning output files: -out/production/module/A.class -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/other/OtherKt.class -out/production/module/test/AKt.class -out/production/module/test/BKt.class -End of files -Compiling files: -src/a.kt -src/b.kt -src/other.kt -End of files -Compiling files: -src/A.java -End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log index 3f1259bdca5..e066711ad3f 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -8,8 +8,6 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class out/production/module1/module1/Module1_aKt.class -End of files -Cleaning output files: out/production/module1/module1/Module1_fKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log deleted file mode 100644 index 5003113aa98..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log +++ /dev/null @@ -1,38 +0,0 @@ -Cleaning output files: -out/production/module4/module4/D.class -End of files -Compiling files: -module4/src/module4_d.kt -End of files -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1_aKt.class -out/production/module1/module1/Module1_fKt.class -End of files -Compiling files: -module1/src/module1_a.kt -module1/src/module1_f.kt -End of files -COMPILATION FAILED -Name expected - - -Compiling files: -module1/src/module1_a.kt -module1/src/module1_f.kt -End of files -Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/module2/Module2_bKt.class -End of files -Compiling files: -module2/src/module2_b.kt -End of files -Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3_cKt.class -End of files -Compiling files: -module3/src/module3_c.kt -End of files diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index dc9b74c5701..d9957c7d841 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -18,8 +18,6 @@ End of files Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/Module2_aKt.class -End of files -Cleaning output files: out/production/module2/foo/Module2_bKt.class out/production/module2/foo/Module2_cKt.class End of files From 0bb5882cca7119a73193786db50dde917e5362ed Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 9 Dec 2015 21:54:46 +0300 Subject: [PATCH 0700/1557] Minor: remove default values for markChunk parameters Original commit: ef4b3c99f4b956da4e5f7dbacb1e86f3706ea76b --- .../org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt | 2 +- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt index 000c183656f..64b06dd97d3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt @@ -32,7 +32,7 @@ class FSOperationsHelper( fun hasMarkedDirty(): Boolean = markedDirty - fun markChunk(recursively: Boolean = false, kotlinOnly: Boolean = true, excludeFiles: Set = setOf()) { + fun markChunk(recursively: Boolean, kotlinOnly: Boolean, excludeFiles: Set = setOf()) { fun shouldMark(file: File): Boolean { if (kotlinOnly && !KotlinSourceFileCollector.isKotlinSourceFile(file)) return false diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b167b4818fb..401e6aa598f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -226,7 +226,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR saveVersions(context, chunk) if (targets.any { hasKotlin[it] == null }) { - fsOperations.markChunk(excludeFiles = filesToCompile.values().toSet()) + fsOperations.markChunk(recursively = false, kotlinOnly = true, excludeFiles = filesToCompile.values().toSet()) } for (target in targets) { @@ -276,7 +276,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR when { inlineAdded -> { allCompiledFiles.clear() - fsOperations.markChunk(recursively = true, excludeFiles = compiledFiles) + fsOperations.markChunk(recursively = true, kotlinOnly = true, excludeFiles = compiledFiles) return } constantsChanged -> { @@ -284,7 +284,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return } protoChanged -> { - fsOperations.markChunk(excludeFiles = allCompiledFiles) + fsOperations.markChunk(recursively = false, kotlinOnly = true, excludeFiles = allCompiledFiles) } } @@ -365,7 +365,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR rebuildAfterCacheVersionChanged[target] = true } - fsOperations.markChunk() + fsOperations.markChunk(recursively = false, kotlinOnly = true) return } From f5bfec68dbf858f479720a27783270d699b9c2be Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Thu, 10 Dec 2015 12:12:44 +0300 Subject: [PATCH 0701/1557] COMMA_IN_WHEN_CONDITION_WITHOUT_ARGUMENT is an ERROR now. Migrated code. Updated test data in IDE tests. Dropped whenWithRangeTestsAndMultiConditions.kt: "Introduce subject" is not applicable to 'when' with ||-ed conditions. Original commit: 0fe74a8b4355a6927154a11bd93dc016501d0688 --- .../kotlin/jps/incremental/AbstractProtoComparisonTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 0a80f2626bc..07353e5ed9c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -102,8 +102,8 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { ) val diff = when { - newClassHeader.isCompatibleClassKind(), - newClassHeader.isCompatibleFileFacadeKind(), + newClassHeader.isCompatibleClassKind() || + newClassHeader.isCompatibleFileFacadeKind() || newClassHeader.isCompatibleMultifileClassPartKind() -> difference(oldProto, newProto) else -> { From 3e8231bedb1377e09314be6a557d78d3631c7894 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 9 Dec 2015 18:43:27 +0300 Subject: [PATCH 0702/1557] Enum.values: deprecation (warning) --> deprecation (error) Original commit: c8b50eec1e68fa6dd80e87c3646431eec21434a5 --- .../incremental/lookupTracker/classifierMembers/usages.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 6297ffd3418..85b1ca467b4 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -34,7 +34,6 @@ import bar.* /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/values /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/values() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf("") /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo From 54e89b72d47e9ea60a2f071ac1f3cf5b4643a5cb Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Tue, 8 Dec 2015 18:59:05 +0300 Subject: [PATCH 0703/1557] Update lookupTracker test data for tower resolution algorithm Original commit: 79b30dddf9f66d9130859ba5a7e3faeb5c90cba4 --- .../lookupTracker/classifierMembers/foo.kt | 10 ++-- .../lookupTracker/classifierMembers/usages.kt | 46 +++++++++---------- .../lookupTracker/conventions/comparison.kt | 8 ++-- .../conventions/delegateProperty.kt | 12 ++--- .../conventions/mathematicalLike.kt | 14 +++--- .../lookupTracker/conventions/other.kt | 12 ++--- .../incremental/lookupTracker/java/usages.kt | 2 +- .../lookupTracker/localDeclarations/locals.kt | 2 +- .../lookupTracker/packageDeclarations/foo1.kt | 10 ++-- .../syntheticProperties/usages.kt | 16 +++---- 10 files changed, 66 insertions(+), 66 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 34f67fad97a..d724928ceb2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() this./*c:foo.A*/a this./*c:foo.A*/foo() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A(getBaz) c:foo.A(getBAZ)*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/O./*c:foo.A.O*/v = "OK" + /*c:foo.A c:foo.A.Companion*/baz() + /*c:foo.A*/Companion./*c:foo.A.Companion*/a + /*c:foo.A*/O./*c:foo.A.O*/v = "OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = 1 fun foo() { /*c:foo.E*/a - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Y./*c:foo.E*/a + /*c:foo.E*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() + /*c:foo.E*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 85b1ca467b4..eecd3a6242d 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -3,38 +3,38 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) { - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/b - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/c - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/d = "new value" - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A()./*c:foo.A*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B()./*c:foo.A.B*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/a + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/b + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/c + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/d = "new value" + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) + /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo*/A + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/a + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion + /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/O + /*p:foo*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() i./*c:foo.I*/a = 2 - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/foo() - var ii: /*p:foo*/I = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj + /*p:foo*/Obj./*c:foo.Obj*/a + /*p:foo*/Obj./*c:foo.Obj*/foo() + var ii: /*p:foo*/I = /*p:foo*/Obj ii./*c:foo.I*/a ii./*c:foo.I*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/b - val iii = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/Obj./*c:foo.Obj*/bar() + /*p:foo*/Obj./*c:foo.Obj*/b + val iii = /*p:foo*/Obj./*c:foo.Obj*/bar() iii./*c:foo.I*/foo() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/values() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E p:foo(invoke) p:bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/values() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf("") /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/bar() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index d7f73c68b45..45124e49c44 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -11,8 +11,8 @@ package foo.bar a /*c:foo.bar.A(compareTo)*/>= b a /*c:foo.bar.A(compareTo)*/<= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/> c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/< c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/>= c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo) p:java.lang(compareTo) p:kotlin(compareTo) p:kotlin.annotation(compareTo) p:kotlin.jvm(compareTo) p:kotlin.io(compareTo)*/<= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= c + a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= c } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index d444859d877..34f86b9f118 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,11 +20,11 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue) p:java.lang(setValue) p:kotlin(setValue) p:kotlin.annotation(setValue) p:kotlin.jvm(setValue) p:kotlin.io(setValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D2(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.bar.D3(getValue) p:foo.bar(getValue) p:java.lang(getValue) p:kotlin(getValue) p:kotlin.annotation(getValue) p:kotlin.jvm(getValue) p:kotlin.io(getValue) c:foo.bar.D3(setValue) c:foo.bar.D3(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 69c457b8ef9..b43a8b57bf4 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -5,20 +5,20 @@ package foo.bar d/*c:foo.bar.A(inc)*/++ /*c:foo.bar.A(inc)*/++d - d/*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec)*/-- - /*c:foo.bar.A(dec) p:foo.bar(dec) p:java.lang(dec) p:kotlin(dec) p:kotlin.annotation(dec) p:kotlin.jvm(dec) p:kotlin.io(dec)*/--d + d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- + /*c:foo.bar.A(dec) p:foo.bar(dec)*/--d a /*c:foo.bar.A(plus)*/+ b - a /*c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus)*/- b - /*c:foo.bar.A(not) p:foo.bar(not) p:java.lang(not) p:kotlin(not) p:kotlin.annotation(not) p:kotlin.jvm(not) p:kotlin.io(not)*/!a + a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- b + /*c:foo.bar.A(not) p:foo.bar(not)*/!a // for val a /*c:foo.bar.A(timesAssign)*/*= b - a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign)*//= b + a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= b // for var d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus)*/+= b - d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus) p:java.lang(minus) p:kotlin(minus) p:kotlin.annotation(minus) p:kotlin.jvm(minus) p:kotlin.io(minus)*/-= b + d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= b d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.io(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b - d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) p:java.lang(divAssign) p:kotlin(divAssign) p:kotlin.annotation(divAssign) p:kotlin.jvm(divAssign) p:kotlin.io(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b + d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index 9e9e8aa46d4..d1b1fca1636 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) p:foo.bar(set) p:java.lang(set) p:kotlin(set) p:kotlin.annotation(set) p:kotlin.jvm(set) p:kotlin.io(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] + /*c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] b /*c:foo.bar.A(contains)*/in a - "s" /*c:foo.bar.A(contains) p:foo.bar(contains) p:java.lang(contains) p:kotlin(contains) p:kotlin.annotation(contains) p:kotlin.jvm(contains) p:kotlin.io(contains)*/!in a + "s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in a /*c:foo.bar.A(invoke)*/a() - /*c:foo.bar.A(invoke) p:foo.bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/a(1) + /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) - val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/t) = a; + val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = a; - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2) p:java.lang(component2) p:kotlin(component2) p:kotlin.annotation(component2) p:kotlin.jvm(component2) p:kotlin.io(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) p:java.lang(iterator) p:kotlin(iterator) p:kotlin.annotation(iterator) p:kotlin.jvm(iterator) p:kotlin.io(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) p:java.lang(hasNext) p:kotlin(hasNext) p:kotlin.annotation(hasNext) p:kotlin.jvm(hasNext) p:kotlin.io(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index f836b6e74c9..0f0c9745c72 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -4,7 +4,7 @@ import bar./*p:bar*/C import baz.* /*p:foo*/fun usages() { - val c = /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C() + val c = C() c./*c:bar.C*/field c./*c:bar.C*/field = 2 diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index 3ba9645f6c2..f139ae7a727 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -31,7 +31,7 @@ import bar.* } localFun() - 1./*p:local.declarations p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/localExtFun() + 1.localExtFun() val c = LocalC() c.a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index d859f60fc67..20e33188aaa 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -3,15 +3,15 @@ package foo import bar.* import baz./*p:baz*/C -/*p:foo*/val a = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/A() +/*p:foo*/val a = /*p:foo p:bar*/A() /*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B { - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/a - return /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/B() + /*p:foo*/a + return /*p:foo p:bar*/B() } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.MyClass(getB)*/b - return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/MyClass() + /*c:foo.MyClass p:foo*/b + return /*c:foo.MyClass p:foo*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 1d737978e1d..34670329dbd 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -4,8 +4,8 @@ import /*p:*/JavaClass import foo./*p:foo*/KotlinClass /*p:foo.bar*/fun test() { - val j = /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/JavaClass() - val k = /*p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/KotlinClass() + val j = JavaClass() + val k = KotlinClass() j./*c:JavaClass*/getFoo() j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getSetFoo) c:JavaClass(getSETFoo)*/setFoo(2) @@ -17,14 +17,14 @@ import foo./*p:foo*/KotlinClass j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz = "" j./*c:JavaClass*/setBoo(2) j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBoo) c:JavaClass(getBOO)*/boo = 2 - k./*c:foo.KotlinClass*/getFoo() - k./*c:foo.KotlinClass*/setFoo(2) + k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass + k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz)*/bazBaz = "" - k./*c:foo.KotlinClass*/setBoo(2) - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO)*/boo = 2 + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz = "" + k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) c:JavaClass*/boo = 2 } From 5b8c9c0d1fa6b9deb4f8e48d99b61d66a8c9118e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 10 Dec 2015 15:26:00 +0300 Subject: [PATCH 0704/1557] Serialize/deserialize annotations on enum entries #KT-10338 Fixed Original commit: 3e2eb8c1a0a4374500e18d6eac8834774c233a04 --- .../jps/incremental/IncrementalCacheImpl.kt | 2 +- .../jps/incremental/ProtoCompareGenerated.kt | 42 ++++++++++++++++++- .../jps/incremental/protoDifferenceUtils.kt | 4 +- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7f7493ff775..bbbaf1514c6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -249,7 +249,7 @@ public class IncrementalCacheImpl( ProtoBuf.Class::getFunctionList, ProtoBuf.Class::getPropertyList ) + - classData.classProto.enumEntryList.map { classData.nameResolver.getString(it) }.toSet() + classData.classProto.enumEntryNameList.map { classData.nameResolver.getString(it) }.toSet() ChangeInfo.Removed(className.fqNameForClassNameWithoutDollars, memberNames) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index a4f9787fddf..1ab985461c7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -94,6 +94,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassProperty(old, new)) return false + if (!checkEqualsClassEnumEntryName(old, new)) return false + if (!checkEqualsClassEnumEntry(old, new)) return false if (old.hasTypeTable() != new.hasTypeTable()) return false @@ -120,6 +122,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi CONSTRUCTOR_LIST, FUNCTION_LIST, PROPERTY_LIST, + ENUM_ENTRY_NAME_LIST, ENUM_ENTRY_LIST, TYPE_TABLE, CLASS_ANNOTATION_LIST @@ -154,6 +157,8 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassProperty(old, new)) result.add(ProtoBufClassKind.PROPERTY_LIST) + if (!checkEqualsClassEnumEntryName(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_NAME_LIST) + if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST) if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufClassKind.TYPE_TABLE) @@ -395,6 +400,15 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEquals(old: ProtoBuf.EnumEntry, new: ProtoBuf.EnumEntry): Boolean { + if (old.hasName() != new.hasName()) return false + if (old.hasName()) { + if (old.name != new.name) return false + } + + return true + } + open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { if (!checkClassIdEquals(old.id, new.id)) return false @@ -659,11 +673,21 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } + open fun checkEqualsClassEnumEntryName(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { + if (old.enumEntryNameCount != new.enumEntryNameCount) return false + + for(i in 0..old.enumEntryNameCount - 1) { + if (!checkStringEquals(old.getEnumEntryName(i), new.getEnumEntryName(i))) return false + } + + return true + } + open fun checkEqualsClassEnumEntry(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { if (old.enumEntryCount != new.enumEntryCount) return false for(i in 0..old.enumEntryCount - 1) { - if (!checkStringEquals(old.getEnumEntry(i), new.getEnumEntry(i))) return false + if (!checkEquals(old.getEnumEntry(i), new.getEnumEntry(i))) return false } return true @@ -859,8 +883,12 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: ( hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes) } + for(i in 0..enumEntryNameCount - 1) { + hashCode = 31 * hashCode + stringIndexes(getEnumEntryName(i)) + } + for(i in 0..enumEntryCount - 1) { - hashCode = 31 * hashCode + stringIndexes(getEnumEntry(i)) + hashCode = 31 * hashCode + getEnumEntry(i).hashCode(stringIndexes, fqNameIndexes) } if (hasTypeTable()) { @@ -1090,6 +1118,16 @@ public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameInde return hashCode } +public fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { + var hashCode = 1 + + if (hasName()) { + hashCode = 31 * hashCode + name + } + + return hashCode +} + public fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 5124aa85eda..6581f60fadb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -206,8 +206,10 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList)) ProtoBufClassKind.PROPERTY_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList)) + ProtoBufClassKind.ENUM_ENTRY_NAME_LIST -> + names.addAll(calcDifferenceForNames(oldProto.enumEntryNameList, newProto.enumEntryNameList)) ProtoBufClassKind.ENUM_ENTRY_LIST -> - names.addAll(calcDifferenceForNames(oldProto.enumEntryList, newProto.enumEntryList)) + names.addAll(calcDifferenceForNames(oldProto.enumEntryList.map { it.name }, newProto.enumEntryList.map { it.name })) ProtoBufClassKind.TYPE_TABLE -> { // TODO } From 55020c886aae07780ba58036ff86d96756f1ccce Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sun, 13 Dec 2015 02:18:10 +0300 Subject: [PATCH 0705/1557] Fix testData for LookupTracker Original commit: bf9d50ccc4e72fcc93182c6c9c88711f93a89777 --- .../lookupTracker/classifierMembers/usages.kt | 18 +++++------ .../conventions/delegateProperty.kt | 4 +-- .../conventions/mathematicalLike.kt | 8 ++--- .../incremental/lookupTracker/java/usages.kt | 22 +++++++------- .../lookupTracker/packageDeclarations/foo1.kt | 2 +- .../syntheticProperties/usages.kt | 30 +++++++++---------- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index eecd3a6242d..26ae83188a3 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" - /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() i./*c:foo.I*/a = 2 /*p:foo*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo*/Obj./*c:foo.Obj*/bar() iii./*c:foo.I*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E p:foo(invoke) p:bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.io(invoke)*/values() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf("") - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/bar() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E p:foo(invoke) p:bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.collections(invoke) p:kotlin.ranges(invoke) p:kotlin.sequences(invoke) p:kotlin.text(invoke) p:kotlin.io(invoke)*/values() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/valueOf("") + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/foo + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 34f86b9f118..43f706acf39 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,8 +20,8 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() /*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() /*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index b43a8b57bf4..8fd70159f73 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -17,8 +17,8 @@ package foo.bar a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= b // for var - d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus)*/+= b - d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= b - d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.io(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b - d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b + d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus)*/+= b + d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= b + d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b + d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 0f0c9745c72..604e17d850d 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -11,27 +11,27 @@ import baz.* c./*c:bar.C*/func() c./*c:bar.C*/B() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfield - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfield = "new" - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/S() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfield = "new" + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/S() // inherited from I c./*c:bar.C*/ifunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/isfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/IS() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/IS() val i: /*p:foo*/I = c i./*c:foo.I*/ifunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/I./*c:foo.I*/isfield - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/I./*c:foo.I*/IS() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/I./*c:foo.I*/isfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/I./*c:foo.I*/IS() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/F + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 20e33188aaa..856eb166509 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,7 +4,7 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B { /*p:foo*/a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 34670329dbd..2310b787f4a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = KotlinClass() j./*c:JavaClass*/getFoo() - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getSetFoo) c:JavaClass(getSETFoo)*/setFoo(2) - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = 2 - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = "" - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz = "" + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getSetFoo) c:JavaClass(getSETFoo)*/setFoo(2) + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = 2 + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = "" + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz = "" j./*c:JavaClass*/setBoo(2) - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:JavaClass(getBoo) c:JavaClass(getBOO)*/boo = 2 + j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBoo) c:JavaClass(getBOO)*/boo = 2 k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz = "" + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz = "" k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.io c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) c:JavaClass*/boo = 2 + k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) c:JavaClass*/boo = 2 } From 66b8a68df759c824c0faa5d81e59cc999d6a28db Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Mon, 14 Dec 2015 12:21:03 +0300 Subject: [PATCH 0706/1557] Code cleanup: get rid of unnecessary !! / as, fake warning comments and issues Original commit: 233e8e58e8a0a73f4e4ea188ab69a8850fd9034e --- .../org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 0aa3005fd30..c50274e0e94 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -202,7 +202,7 @@ public object KotlinCompilerRunner { K2JS_COMPILER -> CompileService.TargetPlatform.JS else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName") } - val res = KotlinCompilerClient.incrementalCompile(connection.daemon!!, connection.sessionId, targetPlatform, argsArray, services, compilerOut, daemonOut) + val res = KotlinCompilerClient.incrementalCompile(connection.daemon, connection.sessionId, targetPlatform, argsArray, services, compilerOut, daemonOut) processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { From 09a2a5ecd394a3862aceab3e461d3e54aaaec5d4 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 15 Dec 2015 15:46:24 +0300 Subject: [PATCH 0707/1557] Code fix: TestOnly on a property without backing field Original commit: f55574df36a9e2a561c85fd62b97c04d1f661e6c --- .../src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt index cb28c1014ce..493a6e59875 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -71,7 +71,7 @@ class CacheVersion( versionFile.delete() } - @TestOnly + @get:TestOnly val formatVersionFile: File get() = versionFile From 43b6a9dbbcb9ab4fcecaa3527029bba5e32e77f3 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 18 Nov 2015 18:02:34 +0300 Subject: [PATCH 0708/1557] Minor: use ".touch" extension instead of ".new" in incremental compilation tests when it possible Original commit: d9b67ae0ef02905339934cedde96f513da9f22c7 --- .../exportedModule/module1_A.kt.new | 3 --- .../exportedModule/module1_A.kt.touch | 0 .../module1Modified/module1_a.kt.new | 6 ------ .../module1Modified/module1_a.kt.touch | 0 .../module2Modified/module2_b.kt.new | 7 ------- .../module2Modified/module2_b.kt.touch | 0 .../moduleWithInlineModified/module1_A.kt.new | 7 ------- .../moduleWithInlineModified/module1_A.kt.touch | 0 .../cacheVersionChanged/touchedFile/b.kt.new | 5 ----- .../cacheVersionChanged/touchedFile/b.kt.touch | 0 .../JavaClass.java.new | 3 --- .../JavaClass.java.touch | 0 .../kotlinConstantUnchangedUsedInJava/const.kt.new | 7 ------- .../const.kt.touch | 0 .../custom/projectPathCaseChanged/foo.kt.new | 2 -- .../custom/projectPathCaseChanged/foo.kt.touch | 0 .../projectPathCaseChangedMultiFile/foo.kt.new | 2 -- .../projectPathCaseChangedMultiFile/foo.kt.touch | 0 .../incremental/lazyKotlinCaches/class/A.kt.new | 1 - .../incremental/lazyKotlinCaches/class/A.kt.touch | 0 .../lazyKotlinCaches/function/utils.kt.new | 1 - .../lazyKotlinCaches/function/utils.kt.touch | 0 .../inlineFunctionWithoutUsage/inline.kt.new | 3 --- .../inlineFunctionWithoutUsage/inline.kt.touch | 0 .../lazyKotlinCaches/noKotlin/A.java.new | 2 -- .../lazyKotlinCaches/noKotlin/A.java.touch | 0 .../module1_a.kt.new | 7 ------- .../module1_a.kt.touch | 0 .../accessingFunctionsViaPackagePart/b.kt.new | 3 --- .../accessingFunctionsViaPackagePart/b.kt.touch | 0 .../accessingFunctionsViaPackagePart/usage.kt.new | 5 ----- .../accessingFunctionsViaPackagePart/usage.kt.touch | 0 .../pureKotlin/accessingPropertiesViaField/b.kt.new | 3 --- .../accessingPropertiesViaField/b.kt.touch | 0 .../accessingPropertiesViaField/usage.kt.new | 8 -------- .../accessingPropertiesViaField/usage.kt.touch | 0 .../incremental/pureKotlin/annotations/other.kt.new | 4 ---- .../pureKotlin/annotations/other.kt.touch | 0 .../pureKotlin/constantsUnchanged/const.kt.new | 9 --------- .../pureKotlin/constantsUnchanged/const.kt.touch | 0 .../pureKotlin/defaultArguments/a.kt.new | 3 --- .../pureKotlin/defaultArguments/a.kt.touch | 0 .../pureKotlin/dependencyClassReferenced/a.kt.new | 6 ------ .../pureKotlin/dependencyClassReferenced/a.kt.touch | 0 .../independentClasses/{Foo.kt.new => Foo.kt.touch} | 0 .../inlineFunctionsUnchanged/inline.kt.new | 13 ------------- .../inlineFunctionsUnchanged/inline.kt.touch | 0 .../multifileClassInlineFunction/usage.kt.new | 6 ------ .../multifileClassInlineFunction/usage.kt.touch | 0 .../usage.kt.new | 6 ------ .../usage.kt.touch | 0 .../pureKotlin/optionalParameter/other.kt.new | 5 ----- .../pureKotlin/optionalParameter/other.kt.touch | 0 .../pureKotlin/ourClassReferenced/Klass.kt.new.2 | 3 --- .../pureKotlin/ourClassReferenced/Klass.kt.touch.2 | 0 .../pureKotlin/ourClassReferenced/a.kt.new.1 | 8 -------- .../pureKotlin/ourClassReferenced/a.kt.new.2 | 8 -------- .../pureKotlin/ourClassReferenced/a.kt.touch.1 | 0 .../pureKotlin/ourClassReferenced/a.kt.touch.2 | 0 .../{a.kt.new.3 => a.kt.touch.3} | 0 .../usage.kt.new | 6 ------ .../usage.kt.touch | 0 .../usage.kt.new | 5 ----- .../usage.kt.touch | 0 .../pureKotlin/simpleClassDependency/Foo.kt.new | 8 -------- .../pureKotlin/simpleClassDependency/Foo.kt.touch | 0 .../incremental/pureKotlin/subpackage/nested.kt | 1 - .../incremental/pureKotlin/subpackage/nested.kt.new | 12 ------------ .../pureKotlin/subpackage/nested.kt.touch | 0 .../constantUnchanged/JavaClass.java.new | 3 --- .../constantUnchanged/JavaClass.java.touch | 0 .../notChangeSignature/JavaClass.java.new | 4 ---- .../notChangeSignature/JavaClass.java.touch | 0 .../kotlinUsedInJava/constantUnchanged/const.kt.new | 7 ------- .../constantUnchanged/const.kt.touch | 0 .../kotlinUsedInJava/notChangeSignature/fun.kt.new | 5 ----- .../notChangeSignature/fun.kt.touch | 0 77 files changed, 197 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch delete mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new create mode 100644 jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch delete mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch rename jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/{Foo.kt.new => Foo.kt.touch} (100%) delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2 delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1 delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2 rename jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/{a.kt.new.3 => a.kt.touch.3} (100%) delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch delete mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch delete mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch delete mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new deleted file mode 100644 index 21df9b5ad05..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.new +++ /dev/null @@ -1,3 +0,0 @@ -package a - -open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/module1_A.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new deleted file mode 100644 index ae1b119fb6d..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package module1 - -class A - -fun a() { -} diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/module1_a.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new deleted file mode 100644 index b7e97d330f4..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.new +++ /dev/null @@ -1,7 +0,0 @@ -package module2 - -import module1.* - -fun b(param: A) { - a() -} diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/module2_b.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new deleted file mode 100644 index 557b1805d4c..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.new +++ /dev/null @@ -1,7 +0,0 @@ -package a - -open class A - -inline fun f(): A { - return A() -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/module1_A.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new deleted file mode 100644 index f4131c37ad1..00000000000 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package test - -fun g() { - other.other() -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/b.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new deleted file mode 100644 index 888f27db4e3..00000000000 --- a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.new +++ /dev/null @@ -1,3 +0,0 @@ -public class JavaClass { - public static final String CONST = "A"; -} diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/JavaClass.java.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new deleted file mode 100644 index 7dd5eac1a73..00000000000 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new +++ /dev/null @@ -1,7 +0,0 @@ -package test - -class Klass { - companion object { - val CONST = "bar" - } -} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new deleted file mode 100644 index 99cec0dbea1..00000000000 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.new +++ /dev/null @@ -1,2 +0,0 @@ -fun f() { -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/foo.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new deleted file mode 100644 index f23d7f69d2f..00000000000 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.new +++ /dev/null @@ -1,2 +0,0 @@ -fun foo() { -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/foo.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new deleted file mode 100644 index 3dbcdef91ed..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.new +++ /dev/null @@ -1 +0,0 @@ -public class A diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/A.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new deleted file mode 100644 index 7417787603f..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.new +++ /dev/null @@ -1 +0,0 @@ -fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/utils.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new deleted file mode 100644 index 406f6ee4388..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.new +++ /dev/null @@ -1,3 +0,0 @@ -package inline - -inline fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/inline.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new deleted file mode 100644 index 61ff2abcc95..00000000000 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.new +++ /dev/null @@ -1,2 +0,0 @@ -public class A { -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/A.java.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new deleted file mode 100644 index 8311da66012..00000000000 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.new +++ /dev/null @@ -1,7 +0,0 @@ -package test - -fun a() { - -} - -val a = "" diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.touch b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/module1_a.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new deleted file mode 100644 index f3809d03866..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.new +++ /dev/null @@ -1,3 +0,0 @@ -package test - -fun b() = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/b.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new deleted file mode 100644 index db702d74fea..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package test - -fun main(args: Array) { - println(a() + b() + other.other()) -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/usage.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new deleted file mode 100644 index 43cf69057ff..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.new +++ /dev/null @@ -1,3 +0,0 @@ -package test - -var b = "b" \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/b.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new deleted file mode 100644 index 024de4a9c42..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.new +++ /dev/null @@ -1,8 +0,0 @@ -package test - -fun main(args: Array) { - val x = a + b + other.other - a = "aa" - b = "bb" - other.other = "other.other" -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/usage.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new deleted file mode 100644 index 092462c70e0..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.new +++ /dev/null @@ -1,4 +0,0 @@ -package test - -fun dummyFunction() { -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/other.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new deleted file mode 100644 index 8bdd5ae5b5d..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new +++ /dev/null @@ -1,9 +0,0 @@ -package test - -const val CONST = "foo" - -class Klass { - companion object { - const val CONST = "bar" - } -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new deleted file mode 100644 index 1609642a906..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.new +++ /dev/null @@ -1,3 +0,0 @@ -fun a(p1: String, p2: String? = null) { - -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new deleted file mode 100644 index 89692d95832..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package test - -fun a(ref: kotlin.test.Asserter) { - b(ref) - println(":)") -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.new rename to jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new deleted file mode 100644 index 9edab4e5554..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.new +++ /dev/null @@ -1,13 +0,0 @@ -package inline - -inline fun f(body: () -> Unit) { - println("i'm inline function") - body() -} - -class Klass { - inline fun f(body: () -> Unit) { - println("i'm inline function") - body() - } -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/inline.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new deleted file mode 100644 index e5bb1ff5213..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package test - -fun main(args: Array) { - f { println("to be inlined") } - other.f { println("to be inlined") } -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/usage.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new deleted file mode 100644 index e5bb1ff5213..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package test - -fun main(args: Array) { - f { println("to be inlined") } - other.f { println("to be inlined") } -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/usage.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new deleted file mode 100644 index d2639425252..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package test - -fun other() { - -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/other.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2 deleted file mode 100644 index a8ac38430eb..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.new.2 +++ /dev/null @@ -1,3 +0,0 @@ -package klass - -class Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/Klass.kt.touch.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1 deleted file mode 100644 index 3682a9d2913..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.1 +++ /dev/null @@ -1,8 +0,0 @@ -package test - -import klass.* - -fun a(klass: Klass) { - b(klass) - println(":)") -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2 deleted file mode 100644 index 3682a9d2913..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.new.2 +++ /dev/null @@ -1,8 +0,0 @@ -package test - -import klass.* - -fun a(klass: Klass) { - b(klass) - println(":)") -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2 b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/a.kt.touch.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.3 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.new.3 rename to jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new deleted file mode 100644 index e5bb1ff5213..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package test - -fun main(args: Array) { - f { println("to be inlined") } - other.f { println("to be inlined") } -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/usage.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new deleted file mode 100644 index ee2e6216365..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package test - -fun main(args: Array) { - f { println("to be inlined") } -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/usage.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new deleted file mode 100644 index a9fb2ea18ed..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.new +++ /dev/null @@ -1,8 +0,0 @@ -package test -class Foo { - fun f() { - Bar() - } - - class Boo -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/Foo.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt index 35287cfaf30..83ce65bc9df 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt @@ -9,4 +9,3 @@ fun main(args: Array) { f { } g() } - diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new deleted file mode 100644 index 35287cfaf30..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.new +++ /dev/null @@ -1,12 +0,0 @@ -package outer.nested - -import outer.f - -fun g() { -} - -fun main(args: Array) { - f { } - g() -} - diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/nested.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new deleted file mode 100644 index 888f27db4e3..00000000000 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.new +++ /dev/null @@ -1,3 +0,0 @@ -public class JavaClass { - public static final String CONST = "A"; -} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/JavaClass.java.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new deleted file mode 100644 index 15f4844a8da..00000000000 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.new +++ /dev/null @@ -1,4 +0,0 @@ -public class JavaClass { - public static void foo() { - } -} diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/JavaClass.java.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new deleted file mode 100644 index 7dd5eac1a73..00000000000 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new +++ /dev/null @@ -1,7 +0,0 @@ -package test - -class Klass { - companion object { - val CONST = "bar" - } -} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new deleted file mode 100644 index c9398192af4..00000000000 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.new +++ /dev/null @@ -1,5 +0,0 @@ -package test - -fun foo() { - -} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt.touch new file mode 100644 index 00000000000..e69de29bb2d From 5d8730f91239f193027df2add566a86bfd0145fb Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 18 Nov 2015 21:08:07 +0300 Subject: [PATCH 0709/1557] Minor: uncomment code fragments in ic tests which already should work Original commit: ba180f915aab23e0e0ca38647c6591bb18e213bb --- .../packageMultifileClassOneFileWithPublicChanges/pkg1.kt | 5 ++--- .../pkg1.kt.new | 5 ++--- .../packageMultifileClassOneFileWithPublicChanges/pkg2.kt | 5 ++--- .../pkg2.kt.new | 5 ++--- .../packageMultifileClassPrivateOnlyChanged/pkg1.kt | 5 ++--- .../packageMultifileClassPrivateOnlyChanged/pkg1.kt.new | 5 ++--- .../packageMultifileClassPrivateOnlyChanged/pkg2.kt | 5 ++--- .../packageMultifileClassPrivateOnlyChanged/pkg2.kt.new | 5 ++--- .../incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt | 5 ++--- .../pureKotlin/packagePrivateOnlyChanged/pkg.kt.new | 5 ++--- 10 files changed, 20 insertions(+), 30 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt index 0dc1be70318..a12c5ff1569 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt @@ -4,9 +4,8 @@ package test fun commonFun1() {} -// TODO uncomment when generated value will also be private in bytecode -//private val deletedVal1: Int = 20 +private val deletedVal1: Int = 20 private fun deletedFun1(): Int = 10 -private fun changedFun1(arg: Int) {} \ No newline at end of file +private fun changedFun1(arg: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new index 1aafd0fd8f0..8a45c20ac77 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg1.kt.new @@ -4,9 +4,8 @@ package test fun commonFun1() {} -// TODO uncomment when generated value will also be private in bytecode -//private val addedVal1: Int = 20 +private val addedVal1: Int = 20 private fun addedFun1(): Int = 50 -private fun changedFun1(arg: String) {} \ No newline at end of file +private fun changedFun1(arg: String) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt index fb983eec742..d6dc1f33a87 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt @@ -6,9 +6,8 @@ fun commonFun2() {} fun publicDeletedFun2() {} -// TODO uncomment when generated value will also be private in bytecode -//private val deletedVal2: Int = 20 +private val deletedVal2: Int = 20 private fun deletedFun2(): Int = 10 -private fun changedFun2(arg: Int) {} \ No newline at end of file +private fun changedFun2(arg: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new index a7dcc9a42f8..cf3e6de1d84 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/pkg2.kt.new @@ -6,9 +6,8 @@ fun commonFun2() {} fun publicAddedFun2() {} -// TODO uncomment when generated value will also be private in bytecode -//private val addedVal2: Int = 20 +private val addedVal2: Int = 20 private fun addedFun2(): Int = 50 -private fun changedFun2(arg: String) {} \ No newline at end of file +private fun changedFun2(arg: String) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt index 0dc1be70318..a12c5ff1569 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt @@ -4,9 +4,8 @@ package test fun commonFun1() {} -// TODO uncomment when generated value will also be private in bytecode -//private val deletedVal1: Int = 20 +private val deletedVal1: Int = 20 private fun deletedFun1(): Int = 10 -private fun changedFun1(arg: Int) {} \ No newline at end of file +private fun changedFun1(arg: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new index 1aafd0fd8f0..8a45c20ac77 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg1.kt.new @@ -4,9 +4,8 @@ package test fun commonFun1() {} -// TODO uncomment when generated value will also be private in bytecode -//private val addedVal1: Int = 20 +private val addedVal1: Int = 20 private fun addedFun1(): Int = 50 -private fun changedFun1(arg: String) {} \ No newline at end of file +private fun changedFun1(arg: String) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt index 421a66fe21b..6b58f659dff 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt @@ -4,9 +4,8 @@ package test fun commonFun2() {} -// TODO uncomment when generated value will also be private in bytecode -//private val deletedVal2: Int = 20 +private val deletedVal2: Int = 20 private fun deletedFun2(): Int = 10 -private fun changedFun2(arg: Int) {} \ No newline at end of file +private fun changedFun2(arg: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new index 2921e042103..d8719658566 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/pkg2.kt.new @@ -4,9 +4,8 @@ package test fun commonFun2() {} -// TODO uncomment when generated value will also be private in bytecode -//private val addedVal2: Int = 20 +private val addedVal2: Int = 20 private fun addedFun2(): Int = 50 -private fun changedFun2(arg: String) {} \ No newline at end of file +private fun changedFun2(arg: String) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt index 7dd67f6b538..127853531dc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt @@ -2,9 +2,8 @@ package test fun commonFun() {} -// TODO uncomment when generated value will also be private in bytecode -//private val deletedVal: Int = 20 +private val deletedVal: Int = 20 private fun deletedFun(): Int = 10 -private fun changedFun(arg: Int) {} \ No newline at end of file +private fun changedFun(arg: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new index b8d74bb235b..97e4d777801 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/pkg.kt.new @@ -2,9 +2,8 @@ package test fun commonFun() {} -// TODO uncomment when generated value will also be private in bytecode -//private val addedVal: Int = 20 +private val addedVal: Int = 20 private fun addedFun(): Int = 50 -private fun changedFun(arg: String) {} \ No newline at end of file +private fun changedFun(arg: String) {} From d9ea7bbd37422ae230db3c77fd5459be90b84d79 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 18 Dec 2015 01:35:43 +0300 Subject: [PATCH 0710/1557] Do not discriminate synthesized candidates. #KT-9965 Fixed Original commit: 8b5a194dd64826233dd8e41487635bd15609fd94 --- .../incremental/lookupTracker/classifierMembers/usages.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 26ae83188a3..84872a2ebe8 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -34,7 +34,7 @@ import bar.* /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E p:foo(invoke) p:bar(invoke) p:java.lang(invoke) p:kotlin(invoke) p:kotlin.annotation(invoke) p:kotlin.jvm(invoke) p:kotlin.collections(invoke) p:kotlin.ranges(invoke) p:kotlin.sequences(invoke) p:kotlin.text(invoke) p:kotlin.io(invoke)*/values() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/values() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/valueOf("") /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/foo /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/bar() From 48d45b54db1e2b9dffcf74754061435d76b2220a Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Tue, 24 Nov 2015 16:01:52 +0300 Subject: [PATCH 0711/1557] Add kotlin.test library to build distribution and provide for tests Original commit: b57d2ff702f0051be390532ec8d045d7dd3dfe66 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 1 + .../kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index ea41dcde371..11d72201d7c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -500,6 +500,7 @@ public abstract class AbstractIncrementalJpsTest( moduleNames = nameToModule.keySet() } AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject) + AbstractKotlinJpsBuildTestCase.addKotlinTestRuntimeDependency(myProject) return moduleNames } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index b633b033098..ede371c900a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -91,6 +91,10 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { return addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); } + static JpsLibrary addKotlinTestRuntimeDependency(@NotNull JpsProject project) { + return addDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false, "kotlin-test", PathUtil.getKotlinPathsForDistDirectory().getKotlinTestPath()); + } + static JpsLibrary addKotlinJavaScriptStdlibDependency(@NotNull JpsProject project) { return addKotlinJavaScriptStdlibDependency(JpsJavaDependencyScope.COMPILE, project.getModules(), false); } From 271f6ffdcbbcc021fe8fa62c921c2c0f6d3ed5d6 Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Wed, 25 Nov 2015 14:17:26 +0300 Subject: [PATCH 0712/1557] Add library kotlin-test to IDEA project Original commit: 790524e391a2ae9ed6f9f77223753a589d96c15a --- jps/jps-plugin/jps-plugin.iml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 7e51764c54e..69920e17ed0 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -22,5 +22,6 @@ + - \ No newline at end of file + From 2d6de9f95dcbc01a8adfcec4111597bd74fba7e2 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 18 Dec 2015 15:23:11 +0300 Subject: [PATCH 0713/1557] Synthetic extensions wins against top-level extension. Original commit: 1574dc78df5ea2f187b610b9a4706fc7ff5095e7 --- .../lookupTracker/classifierMembers/usages.kt | 4 +-- .../lookupTracker/conventions/comparison.kt | 8 ++--- .../conventions/delegateProperty.kt | 12 ++++---- .../conventions/mathematicalLike.kt | 18 +++++------ .../lookupTracker/conventions/other.kt | 10 +++---- .../lookupTracker/packageDeclarations/foo1.kt | 2 +- .../syntheticProperties/usages.kt | 30 +++++++++---------- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 84872a2ebe8..7438fedacec 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" - /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA)*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA)*/vara() + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vara() i./*c:foo.I*/a = 2 /*p:foo*/Obj./*c:foo.Obj*/a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index 45124e49c44..33669a221f5 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -11,8 +11,8 @@ package foo.bar a /*c:foo.bar.A(compareTo)*/>= b a /*c:foo.bar.A(compareTo)*/<= b - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= c - a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= c + a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/> c + a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/< c + a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/>= c + a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/<= c } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 43f706acf39..579e0b9ec69 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,11 +20,11 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 8fd70159f73..486fbf26478 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -5,20 +5,20 @@ package foo.bar d/*c:foo.bar.A(inc)*/++ /*c:foo.bar.A(inc)*/++d - d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- - /*c:foo.bar.A(dec) p:foo.bar(dec)*/--d + d/*c:foo.bar.A(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC) p:foo.bar(dec)*/-- + /*c:foo.bar.A(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC) p:foo.bar(dec)*/--d a /*c:foo.bar.A(plus)*/+ b - a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- b - /*c:foo.bar.A(not) p:foo.bar(not)*/!a + a /*c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/- b + /*c:foo.bar.A(not) c:foo.bar.A(getNot) c:foo.bar.A(getNOT) p:foo.bar(not)*/!a // for val a /*c:foo.bar.A(timesAssign)*/*= b - a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= b + a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= b // for var - d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) c:foo.bar.A(plus)*/+= b - d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= b - d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES)*/*= b - d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV)*//= b + d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= b + d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= b + d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times)*/*= b + d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div)*//= b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index d1b1fca1636..5bb64a7dc33 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] + /*c:foo.bar.A(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] b /*c:foo.bar.A(contains)*/in a - "s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in a + "s" /*c:foo.bar.A(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS) p:foo.bar(contains)*/!in a /*c:foo.bar.A(invoke)*/a() /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) - val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = a; + val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/t) = a; - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getHASNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(getIterator) c:foo.bar.A(getITERATOR) p:foo.bar(iterator) c:foo.bar.A(hasNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getHASNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 856eb166509..e212405db19 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /*c:foo.MyClass p:foo*/b + /*c:foo.MyClass c:foo.MyClass(getB) p:foo*/b return /*c:foo.MyClass p:foo*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 2310b787f4a..34e7367eea7 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = KotlinClass() j./*c:JavaClass*/getFoo() - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getSetFoo) c:JavaClass(getSETFoo)*/setFoo(2) - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = 2 - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = "" - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz)*/bazBaz = "" + j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/setFoo(2) + j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = 2 + j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo + j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar + j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = "" + j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz + j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz = "" j./*c:JavaClass*/setBoo(2) - j./*c:JavaClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass(getBoo) c:JavaClass(getBOO)*/boo = 2 + j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/boo = 2 k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) c:JavaClass*/bazBaz = "" + k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 + k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo + k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar + k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" + k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz + k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz = "" k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - k./*c:foo.KotlinClass p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) c:JavaClass*/boo = 2 + k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/boo = 2 } From b5ce541bbf137839f9c8471309fa85fe712d7495 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 18 Dec 2015 18:54:37 +0300 Subject: [PATCH 0714/1557] Fix compilation. - rename isFinal extension property to avoid ambiguity with synthetic property in DeserializedClassTypeConstructor - add explicit parameter to lambda File.listFiles - return true from lambda Query.forEach Original commit: bcaa755c4e297e9c52753f1e37dc647ccee3ea4f --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- .../kotlin/jps/incremental/AbstractProtoComparisonTest.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 11d72201d7c..aad6117b245 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -245,8 +245,8 @@ public abstract class AbstractIncrementalJpsTest( return modifications } - val haveFilesWithoutNumbers = testDataDir.listFiles { it.getName().matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false - val haveFilesWithNumbers = testDataDir.listFiles { it.getName().matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithoutNumbers = testDataDir.listFiles { it -> it.getName().matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithNumbers = testDataDir.listFiles { it -> it.getName().matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false if (haveFilesWithoutNumbers && haveFilesWithNumbers) { fail("Bad test data format: files ending with both unnumbered and numbered $COMMANDS_AS_MESSAGE_PART were found") diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 07353e5ed9c..1b446159b37 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -65,7 +65,7 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { } private fun compileFileAndGetClasses(testPath: String, testDir: File, prefix: String): List { - val files = File(testPath).listFiles { it.name.startsWith(prefix) }!! + val files = File(testPath).listFiles { it -> it.name.startsWith(prefix) }!! val sourcesDirectory = testDir.createSubDirectory("sources") val classesDirectory = testDir.createSubDirectory("$prefix.src") @@ -74,7 +74,7 @@ public abstract class AbstractProtoComparisonTest : UsefulTestCase() { } MockLibraryUtil.compileKotlin(sourcesDirectory.path, classesDirectory) - return File(classesDirectory, "test").listFiles() { it.name.endsWith(".class") }?.sortedBy { it.name }!! + return File(classesDirectory, "test").listFiles() { it -> it.name.endsWith(".class") }?.sortedBy { it.name }!! } private fun Printer.printDifference(oldClassFile: File, newClassFile: File) { From bd94993156ee0e7529f9eb1debf4002ac3aa1537 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 15 Dec 2015 18:30:09 +0300 Subject: [PATCH 0715/1557] Add kotlin-reflect as a separate library Exclude in core modules, since they do not have kotlin-reflect.jar in dependencies when are built in build.xml Original commit: 2ccd6d54b7b606eabeb03e69496799bf9bd7c6fc --- jps/jps-common/idea-jps-common.iml | 1 + jps/jps-plugin/bare-plugin/bare-plugin.iml | 1 + 2 files changed, 2 insertions(+) diff --git a/jps/jps-common/idea-jps-common.iml b/jps/jps-common/idea-jps-common.iml index 44071adbdcd..8902bc86b9b 100644 --- a/jps/jps-common/idea-jps-common.iml +++ b/jps/jps-common/idea-jps-common.iml @@ -8,5 +8,6 @@ + \ No newline at end of file diff --git a/jps/jps-plugin/bare-plugin/bare-plugin.iml b/jps/jps-plugin/bare-plugin/bare-plugin.iml index feff85211d8..9d0cabb35a3 100644 --- a/jps/jps-plugin/bare-plugin/bare-plugin.iml +++ b/jps/jps-plugin/bare-plugin/bare-plugin.iml @@ -10,5 +10,6 @@ + \ No newline at end of file From dece44df8659785b7cd500b9343843c02a1e88e8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 18 Dec 2015 21:52:08 +0300 Subject: [PATCH 0716/1557] Fix terminology: internal name instead of FQ name Original commit: 6048ebf871b8e4f72e4d9582d94e8a2a78dfadee --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index bbbaf1514c6..653f7494278 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -296,8 +296,8 @@ public class IncrementalCacheImpl( return obsoletePackageParts } - override fun getPackagePartData(fqName: String): JvmPackagePartProto? { - return protoMap[JvmClassName.byInternalName(fqName)]?.let { value -> + override fun getPackagePartData(partInternalName: String): JvmPackagePartProto? { + return protoMap[JvmClassName.byInternalName(partInternalName)]?.let { value -> JvmPackagePartProto(value.bytes, value.strings) } } From 8d1a6b8c9ff307a0ae2faa5f9c703b83615ff634 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 23 Dec 2015 22:26:55 +0300 Subject: [PATCH 0717/1557] Drop old enum entries from binary format Original commit: fc74759231c4d54c710f2e3402e767a5f1facbcc --- .../jps/incremental/IncrementalCacheImpl.kt | 5 ++--- .../jps/incremental/ProtoCompareGenerated.kt | 19 ------------------- .../jps/incremental/protoDifferenceUtils.kt | 2 -- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 653f7494278..ebcd3394391 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -218,7 +218,7 @@ public class IncrementalCacheImpl( public fun clearCacheForRemovedClasses(): CompilationResult { - fun T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List) = + fun T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List): Set = members.flatMap { this.it().filterNot { it.isPrivate }.names(nameResolver) }.toSet() fun createChangeInfo(className: JvmClassName): ChangeInfo? { @@ -248,8 +248,7 @@ public class IncrementalCacheImpl( ProtoBuf.Class::getConstructorList, ProtoBuf.Class::getFunctionList, ProtoBuf.Class::getPropertyList - ) + - classData.classProto.enumEntryNameList.map { classData.nameResolver.getString(it) }.toSet() + ) + classData.classProto.enumEntryList.map { classData.nameResolver.getString(it.name) } ChangeInfo.Removed(className.fqNameForClassNameWithoutDollars, memberNames) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 1ab985461c7..ac285dc6624 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -94,8 +94,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassProperty(old, new)) return false - if (!checkEqualsClassEnumEntryName(old, new)) return false - if (!checkEqualsClassEnumEntry(old, new)) return false if (old.hasTypeTable() != new.hasTypeTable()) return false @@ -122,7 +120,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi CONSTRUCTOR_LIST, FUNCTION_LIST, PROPERTY_LIST, - ENUM_ENTRY_NAME_LIST, ENUM_ENTRY_LIST, TYPE_TABLE, CLASS_ANNOTATION_LIST @@ -157,8 +154,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEqualsClassProperty(old, new)) result.add(ProtoBufClassKind.PROPERTY_LIST) - if (!checkEqualsClassEnumEntryName(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_NAME_LIST) - if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST) if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufClassKind.TYPE_TABLE) @@ -673,16 +668,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - open fun checkEqualsClassEnumEntryName(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.enumEntryNameCount != new.enumEntryNameCount) return false - - for(i in 0..old.enumEntryNameCount - 1) { - if (!checkStringEquals(old.getEnumEntryName(i), new.getEnumEntryName(i))) return false - } - - return true - } - open fun checkEqualsClassEnumEntry(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { if (old.enumEntryCount != new.enumEntryCount) return false @@ -883,10 +868,6 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: ( hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes) } - for(i in 0..enumEntryNameCount - 1) { - hashCode = 31 * hashCode + stringIndexes(getEnumEntryName(i)) - } - for(i in 0..enumEntryCount - 1) { hashCode = 31 * hashCode + getEnumEntry(i).hashCode(stringIndexes, fqNameIndexes) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 6581f60fadb..32e59dc71ed 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -206,8 +206,6 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList)) ProtoBufClassKind.PROPERTY_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList)) - ProtoBufClassKind.ENUM_ENTRY_NAME_LIST -> - names.addAll(calcDifferenceForNames(oldProto.enumEntryNameList, newProto.enumEntryNameList)) ProtoBufClassKind.ENUM_ENTRY_LIST -> names.addAll(calcDifferenceForNames(oldProto.enumEntryList.map { it.name }, newProto.enumEntryList.map { it.name })) ProtoBufClassKind.TYPE_TABLE -> { From da67ebb1e23d66ace1a6fd00c558bb985478dd58 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 23 Dec 2015 23:22:55 +0300 Subject: [PATCH 0718/1557] Drop old JVM binary format extensions: static in outer, impl class name Original commit: dc6a1762828bea945727dc3758f8de32ecb9a175 --- .../jps/incremental/ProtoCompareGenerated.kt | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index ac285dc6624..81ea446d258 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -212,11 +212,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false } - if (old.hasExtension(JvmProtoBuf.methodImplClassName) != new.hasExtension(JvmProtoBuf.methodImplClassName)) return false - if (old.hasExtension(JvmProtoBuf.methodImplClassName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.methodImplClassName), new.getExtension(JvmProtoBuf.methodImplClassName))) return false - } - return true } @@ -270,11 +265,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkEquals(old.getExtension(JvmProtoBuf.propertySignature), new.getExtension(JvmProtoBuf.propertySignature))) return false } - if (old.hasExtension(JvmProtoBuf.propertyImplClassName) != new.hasExtension(JvmProtoBuf.propertyImplClassName)) return false - if (old.hasExtension(JvmProtoBuf.propertyImplClassName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.propertyImplClassName), new.getExtension(JvmProtoBuf.propertyImplClassName))) return false - } - return true } @@ -524,11 +514,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (!checkStringEquals(old.desc, new.desc)) return false } - if (old.hasIsStaticInOuter() != new.hasIsStaticInOuter()) return false - if (old.hasIsStaticInOuter()) { - if (old.isStaticInOuter != new.isStaticInOuter) return false - } - return true } @@ -924,10 +909,6 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes) } - if (hasExtension(JvmProtoBuf.methodImplClassName)) { - hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.methodImplClassName)) - } - return hashCode } @@ -976,10 +957,6 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes hashCode = 31 * hashCode + getExtension(JvmProtoBuf.propertySignature).hashCode(stringIndexes, fqNameIndexes) } - if (hasExtension(JvmProtoBuf.propertyImplClassName)) { - hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.propertyImplClassName)) - } - return hashCode } @@ -1228,10 +1205,6 @@ public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, f hashCode = 31 * hashCode + stringIndexes(desc) } - if (hasIsStaticInOuter()) { - hashCode = 31 * hashCode + isStaticInOuter.hashCode() - } - return hashCode } From 3c7c92dcb379bb4a01fe90f9d3a2b1a1c58711d5 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 23 Dec 2015 23:39:16 +0300 Subject: [PATCH 0719/1557] Drop compatibility flag, suppressing optimized generation of delegated property metadata Original commit: 64b48f4458e183bba480112c33a0a60d77ac3c32 --- .../delegatedPropertyInlineExtensionAccessor/build.log | 3 --- .../pureKotlin/delegatedPropertyInlineMethodAccessor/build.log | 3 --- 2 files changed, 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log index 2e91170dfdf..c874c387c3b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log @@ -6,9 +6,7 @@ Compiling files: src/inlineGet.kt End of files Cleaning output files: -out/production/module/usage/UsageVal$x$1.class out/production/module/usage/UsageVal.class -out/production/module/usage/UsageVar$x$1.class out/production/module/usage/UsageVar.class End of files Compiling files: @@ -25,7 +23,6 @@ Compiling files: src/inlineSet.kt End of files Cleaning output files: -out/production/module/usage/UsageVar$x$1.class out/production/module/usage/UsageVar.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log index b85fde4388d..eafebdfd179 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log @@ -5,9 +5,7 @@ Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/usage/UsageVal$x$1.class out/production/module/usage/UsageVal.class -out/production/module/usage/UsageVar$x$1.class out/production/module/usage/UsageVar.class End of files Compiling files: @@ -23,7 +21,6 @@ Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/usage/UsageVar$x$1.class out/production/module/usage/UsageVar.class End of files Compiling files: From 1227f8ad55bae31b622fabdfd5b5851dcf42e3dc Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 24 Dec 2015 03:13:52 +0300 Subject: [PATCH 0720/1557] Drop 'index' JVM binary format extension Compute the JVM parameer index manually instead Original commit: 39c10867a0df528e55c34866cea061b27f27fc46 --- .../kotlin/jps/incremental/ProtoCompareGenerated.kt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 81ea446d258..9dd6ea9ef24 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -430,11 +430,6 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi if (old.varargElementTypeId != new.varargElementTypeId) return false } - if (old.hasExtension(JvmProtoBuf.index) != new.hasExtension(JvmProtoBuf.index)) return false - if (old.hasExtension(JvmProtoBuf.index)) { - if (old.getExtension(JvmProtoBuf.index) != new.getExtension(JvmProtoBuf.index)) return false - } - return true } @@ -1123,10 +1118,6 @@ public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameI hashCode = 31 * hashCode + varargElementTypeId } - if (hasExtension(JvmProtoBuf.index)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.index) - } - return hashCode } From eafea736382928cdb8f3abf513f63b6eceb99db4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 25 Dec 2015 19:31:45 +0300 Subject: [PATCH 0721/1557] Mark enum entry names as name ids for incremental compilation purposes Original commit: 697228eae0c7de10f1dcc5b27400cca07b8d8dfd --- .../jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 9dd6ea9ef24..b35449f5e86 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -388,7 +388,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi open fun checkEquals(old: ProtoBuf.EnumEntry, new: ProtoBuf.EnumEntry): Boolean { if (old.hasName() != new.hasName()) return false if (old.hasName()) { - if (old.name != new.name) return false + if (!checkStringEquals(old.name, new.name)) return false } return true @@ -1075,7 +1075,7 @@ public fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexe var hashCode = 1 if (hasName()) { - hashCode = 31 * hashCode + name + hashCode = 31 * hashCode + stringIndexes(name) } return hashCode From 0218b84990e1111d5e57639058996692228bf075 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Fri, 25 Dec 2015 15:05:31 +0300 Subject: [PATCH 0722/1557] Private visibility for non-const, non-jvmField class companion property backing field Original commit: e116cc3206043c515bcda56793be23c186a19578 --- ...xperimentalIncrementalJpsTestGenerated.java | 12 ++++++++++++ .../jps/build/IncrementalConstantSearchTest.kt | 8 ++++++++ .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../kotlinConstantChangedUsedInJava/const.kt | 2 +- .../const.kt.new | 2 +- .../kotlinConstantUnchangedUsedInJava/const.kt | 2 +- .../kotlinJvmFieldChangedUsedInJava/Usage.java | 7 +++++++ .../kotlinJvmFieldChangedUsedInJava/build.log | 13 +++++++++++++ .../kotlinJvmFieldChangedUsedInJava/const.kt | 9 +++++++++ .../const.kt.new | 9 +++++++++ .../Usage.java | 7 +++++++ .../build.log | 7 +++++++ .../kotlinJvmFieldUnchangedUsedInJava/const.kt | 8 ++++++++ .../const.kt.touch | 0 .../kotlinUsedInJava/constantChanged/const.kt | 2 +- .../constantChanged/const.kt.new | 2 +- .../constantUnchanged/const.kt | 2 +- .../jvmFieldChanged/Usage.java | 7 +++++++ .../kotlinUsedInJava/jvmFieldChanged/build.log | 18 ++++++++++++++++++ .../kotlinUsedInJava/jvmFieldChanged/const.kt | 9 +++++++++ .../jvmFieldChanged/const.kt.new | 9 +++++++++ .../jvmFieldUnchanged/Usage.java | 7 +++++++ .../jvmFieldUnchanged/build.log | 7 +++++++ .../jvmFieldUnchanged/const.kt | 8 ++++++++ .../jvmFieldUnchanged/const.kt.touch | 0 25 files changed, 163 insertions(+), 6 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 6fbe156fd5d..ccaf4667333 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -892,6 +892,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("jvmFieldChanged") + public void testJvmFieldChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/"); + doTest(fileName); + } + + @TestMetadata("jvmFieldUnchanged") + public void testJvmFieldUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/"); + doTest(fileName); + } + @TestMetadata("methodAddedInSuper") public void testMethodAddedInSuper() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt index 8293f92313f..b6cd03cd68e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt @@ -34,10 +34,18 @@ public class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() { doTest("jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/") } + fun testKotlinJvmFieldChangedUsedInJava() { + doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/") + } + fun testKotlinConstantUnchangedUsedInJava() { doTest("jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/") } + fun testKotlinJvmFieldUnchangedUsedInJava() { + doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/") + } + override val mockConstantSearch: Callbacks.ConstantAffectionResolver? get() = object : Callbacks.ConstantAffectionResolver { override fun request( diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 007a6cb0e49..49b4ef012aa 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -892,6 +892,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("jvmFieldChanged") + public void testJvmFieldChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/"); + doTest(fileName); + } + + @TestMetadata("jvmFieldUnchanged") + public void testJvmFieldUnchanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/"); + doTest(fileName); + } + @TestMetadata("methodAddedInSuper") public void testMethodAddedInSuper() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/"); diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt index 4680ae2c26f..cd3256a7612 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt @@ -3,6 +3,6 @@ package test class Klass { companion object { // Old and new constant values are different, but their hashes are the same - val CONST = "BF" + const val CONST = "BF" } } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new index e9ccf1ab8db..49b604cd74f 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new @@ -3,6 +3,6 @@ package test class Klass { companion object { // Old and new constant values are different, but their hashes are the same - val CONST = "Ae" + const val CONST = "Ae" } } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt index 7dd5eac1a73..44e612f1bb9 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt @@ -2,6 +2,6 @@ package test class Klass { companion object { - val CONST = "bar" + const val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java new file mode 100644 index 00000000000..9430b8d5f66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java @@ -0,0 +1,7 @@ +import test.*; + +class Usage { + public static void main(String[] args) { + System.out.println(Klass.CONST + Klass.CONST); + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log new file mode 100644 index 00000000000..29b384519d1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/test/Klass$Companion.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/Usage.class +End of files +Compiling files: +src/Usage.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt new file mode 100644 index 00000000000..f5d8342d491 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt @@ -0,0 +1,9 @@ +package test + +class Klass { + companion object { + // Old and new constant values are different, but their hashes are the same + @JvmField + val CONST = "BF" + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new new file mode 100644 index 00000000000..247548db1f8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new @@ -0,0 +1,9 @@ +package test + +class Klass { + companion object { + // Old and new constant values are different, but their hashes are the same + @JvmField + val CONST = "Ae" + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java new file mode 100644 index 00000000000..9430b8d5f66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java @@ -0,0 +1,7 @@ +import test.*; + +class Usage { + public static void main(String[] args) { + System.out.println(Klass.CONST + Klass.CONST); + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log new file mode 100644 index 00000000000..8dfe7647a28 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/Klass$Companion.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt new file mode 100644 index 00000000000..203275f2160 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt @@ -0,0 +1,8 @@ +package test + +class Klass { + companion object { + @JvmField + val CONST = "bar" + } +} diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt index 4680ae2c26f..cd3256a7612 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt @@ -3,6 +3,6 @@ package test class Klass { companion object { // Old and new constant values are different, but their hashes are the same - val CONST = "BF" + const val CONST = "BF" } } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new index e9ccf1ab8db..49b604cd74f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new @@ -3,6 +3,6 @@ package test class Klass { companion object { // Old and new constant values are different, but their hashes are the same - val CONST = "Ae" + const val CONST = "Ae" } } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt index 7dd5eac1a73..44e612f1bb9 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt @@ -2,6 +2,6 @@ package test class Klass { companion object { - val CONST = "bar" + const val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java new file mode 100644 index 00000000000..9430b8d5f66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java @@ -0,0 +1,7 @@ +import test.*; + +class Usage { + public static void main(String[] args) { + System.out.println(Klass.CONST + Klass.CONST); + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log new file mode 100644 index 00000000000..e0426c17165 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/test/Klass$Companion.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/Usage.class +out/production/module/test/Klass$Companion.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files +Compiling files: +src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt new file mode 100644 index 00000000000..f5d8342d491 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt @@ -0,0 +1,9 @@ +package test + +class Klass { + companion object { + // Old and new constant values are different, but their hashes are the same + @JvmField + val CONST = "BF" + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new new file mode 100644 index 00000000000..247548db1f8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new @@ -0,0 +1,9 @@ +package test + +class Klass { + companion object { + // Old and new constant values are different, but their hashes are the same + @JvmField + val CONST = "Ae" + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java new file mode 100644 index 00000000000..9430b8d5f66 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java @@ -0,0 +1,7 @@ +import test.*; + +class Usage { + public static void main(String[] args) { + System.out.println(Klass.CONST + Klass.CONST); + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log new file mode 100644 index 00000000000..8dfe7647a28 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log @@ -0,0 +1,7 @@ +Cleaning output files: +out/production/module/test/Klass$Companion.class +out/production/module/test/Klass.class +End of files +Compiling files: +src/const.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt new file mode 100644 index 00000000000..203275f2160 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt @@ -0,0 +1,8 @@ +package test + +class Klass { + companion object { + @JvmField + val CONST = "bar" + } +} diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt.touch new file mode 100644 index 00000000000..e69de29bb2d From 49230ffd4627795f203947b12fe8cfa85373f135 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Fri, 25 Dec 2015 18:08:06 +0300 Subject: [PATCH 0723/1557] Companion public val annotated with @JvmFIeld or const Original commit: e671d051050037b7268142dd270c017e29d3abf0 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 401e6aa598f..de2221dcbb7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -71,7 +71,9 @@ import java.util.* public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { + @JvmField public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" + public val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") } From 7fb6a965f2e3da043539bfb5ad6b1e4b77782a9d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 29 Dec 2015 03:42:55 +0300 Subject: [PATCH 0724/1557] Cleanup in modules: j2k, jps, ant and generators. Original commit: fcfb063eca5a816adc166bad4680501dd4af4360 --- .../kotlin/jps/build/KotlinBuilder.kt | 22 +++++++++---------- .../jps/incremental/IncrementalCacheImpl.kt | 16 +++++++------- .../jps/incremental/protoDifferenceUtils.kt | 2 +- .../jps/incremental/storage/externalizers.kt | 22 +++++++++---------- .../jps/build/AbstractIncrementalJpsTest.kt | 14 ++++++------ .../kotlin/jps/build/KotlinJpsBuildTest.kt | 10 ++++----- 6 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index de2221dcbb7..0b1fe8aa686 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -412,7 +412,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): OutputItemsCollectorImpl? { if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { - LOG.debug("Compiling to JS ${filesToCompile.values().size()} files in ${filesToCompile.keySet().joinToString { it.presentableName }}") + LOG.debug("Compiling to JS ${filesToCompile.values().size} files in ${filesToCompile.keySet().joinToString { it.presentableName }}") return compileToJs(chunk, commonArguments, environment, null, messageCollector, project) } @@ -428,7 +428,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR fun concatenate(strings: Array?, cp: List) = arrayOf(*(strings ?: emptyArray()), *cp.toTypedArray()) - for (argumentProvider in ServiceLoader.load(javaClass())) { + for (argumentProvider in ServiceLoader.load(KotlinJpsCompilerArgumentsProvider::class.java)) { // appending to pluginOptions commonArguments.pluginOptions = concatenate(commonArguments.pluginOptions, argumentProvider.getExtraArguments(representativeTarget, context)) @@ -452,8 +452,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR context: CompileContext ): CompilerEnvironment { val compilerServices = Services.Builder() - .register(javaClass(), IncrementalCompilationComponentsImpl(incrementalCaches, lookupTracker)) - .register(javaClass(), object : CompilationCanceledStatus { + .register(IncrementalCompilationComponents::class.java, IncrementalCompilationComponentsImpl(incrementalCaches, lookupTracker)) + .register(CompilationCanceledStatus::class.java, object : CompilationCanceledStatus { override fun checkCanceled() { if (context.getCancelStatus().isCanceled()) throw CompilationCanceledException() } @@ -481,7 +481,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): List { // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below val sourceToTarget = HashMap() - if (chunk.getTargets().size() > 1) { + if (chunk.getTargets().size > 1) { for (target in chunk.getTargets()) { for (file in KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { sourceToTarget.put(file, target) @@ -567,7 +567,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } if (!compilationErrors) { - incrementalCaches.values().forEach { + incrementalCaches.values.forEach { val newChangesInfo = it.clearCacheForRemovedClasses() changesInfo += newChangesInfo } @@ -608,7 +608,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val outputItemCollector = OutputItemsCollectorImpl() val representativeTarget = chunk.representativeTarget() - if (chunk.getModules().size() > 1) { + if (chunk.getModules().size > 1) { // We do not support circular dependencies, but if they are present, we do our best should not break the build, // so we simply yield a warning and report NOTHING_DONE messageCollector.report( @@ -661,7 +661,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() - if (chunk.getModules().size() > 1) { + if (chunk.getModules().size > 1) { messageCollector.report( WARNING, "Circular dependencies are only partially supported. The following modules depend on each other: " @@ -680,7 +680,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val removedFilesInTarget = KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target) if (!removedFilesInTarget.isEmpty()) { if (processedTargetsWithRemoved.add(target)) { - totalRemovedFiles += removedFilesInTarget.size() + totalRemovedFiles += removedFilesInTarget.size } } } @@ -696,7 +696,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) - KotlinBuilder.LOG.debug("Compiling to JVM ${filesToCompile.values().size()} files" + KotlinBuilder.LOG.debug("Compiling to JVM ${filesToCompile.values().size} files" + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") + " in " + filesToCompile.keySet().joinToString { it.presentableName }) @@ -746,7 +746,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR } private val Iterable>.moduleTargets: Iterable - get() = filterIsInstance(javaClass()) + get() = filterIsInstance(ModuleBuildTarget::class.java) private fun getLookupTracker(project: JpsProject): LookupTracker { var lookupTracker = LookupTracker.DO_NOTHING diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index ebcd3394391..7815445a4c9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -171,7 +171,7 @@ public class IncrementalCacheImpl( val header = kotlinClass.classHeader val changesInfo = when { header.isCompatibleFileFacadeKind() -> { - assert(sourceFiles.size() == 1) { "Package part from several source files: $sourceFiles" } + assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) protoMap.process(kotlinClass, isPackage = true) + @@ -188,7 +188,7 @@ public class IncrementalCacheImpl( inlineFunctionsMap.process(kotlinClass, isPackage = true) } header.isCompatibleMultifileClassPartKind() -> { - assert(sourceFiles.size() == 1) { "Multifile class part from several source files: $sourceFiles" } + assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) multifileClassPartMap.add(className.internalName, header.multifileClassName!!) @@ -481,7 +481,7 @@ public class IncrementalCacheImpl( val added = hashSetOf() val changed = hashSetOf() - val allFunctions = oldMap.keySet() + newMap.keySet() + val allFunctions = oldMap.keys + newMap.keys for (fn in allFunctions) { val oldHash = oldMap[fn] @@ -653,7 +653,7 @@ public class IncrementalCacheImpl( private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { public fun getEntries(): Map> = - storage.keys.toMap(JvmClassName::byInternalName) { storage[it]!! } + storage.keys.toMapBy(JvmClassName::byInternalName) { storage[it]!! } public fun put(className: JvmClassName, changedFunctions: List) { storage[className.internalName] = changedFunctions @@ -759,10 +759,10 @@ private fun ByteArray.md5(): Long { @TestOnly private fun , V> Map.dumpMap(dumpValue: (V)->String): String = - StringBuilder { + buildString { append("{") - for (key in keySet().sorted()) { - if (length() != 1) { + for (key in keys.sorted()) { + if (length != 1) { append(", ") } @@ -770,7 +770,7 @@ private fun , V> Map.dumpMap(dumpValue: (V)->String): St append("$key -> $value") } append("}") - }.toString() + } @TestOnly public fun > Collection.dumpCollection(): String = diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 32e59dc71ed..dafaa167d2d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -82,7 +82,7 @@ private abstract class DifferenceCalculator() { val newMap = newList.groupBy { it.getHashCode({ compareObject.newGetIndexOfString(it) }, { compareObject.newGetIndexOfClassId(it) }) } - val hashes = oldMap.keySet() + newMap.keySet() + val hashes = oldMap.keys + newMap.keys for (hash in hashes) { val oldMembers = oldMap[hash] val newMembers = newMap[hash] diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt index 9190c808011..39acab1e1de 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt @@ -69,9 +69,9 @@ object PathFunctionPairKeyDescriptor : KeyDescriptor { object ProtoMapValueExternalizer : DataExternalizer { override fun save(output: DataOutput, value: ProtoMapValue) { output.writeBoolean(value.isPackageFacade) - output.writeInt(value.bytes.size()) + output.writeInt(value.bytes.size) output.write(value.bytes) - output.writeInt(value.strings.size()) + output.writeInt(value.strings.size) for (string in value.strings) { output.writeUTF(string) @@ -92,9 +92,9 @@ object ProtoMapValueExternalizer : DataExternalizer { abstract class StringMapExternalizer : DataExternalizer> { override fun save(output: DataOutput, map: Map?) { - output.writeInt(map!!.size()) + output.writeInt(map!!.size) - for ((key, value) in map.entrySet()) { + for ((key, value) in map.entries) { IOUtil.writeString(key, output) writeValue(output, value) } @@ -127,29 +127,29 @@ object StringToLongMapExternalizer : StringMapExternalizer() { object ConstantsMapExternalizer : DataExternalizer> { override fun save(output: DataOutput, map: Map?) { - output.writeInt(map!!.size()) - for (name in map.keySet().sorted()) { + output.writeInt(map!!.size) + for (name in map.keys.sorted()) { IOUtil.writeString(name, output) val value = map[name]!! when (value) { is Int -> { - output.writeByte(Kind.INT.ordinal()) + output.writeByte(Kind.INT.ordinal) output.writeInt(value) } is Float -> { - output.writeByte(Kind.FLOAT.ordinal()) + output.writeByte(Kind.FLOAT.ordinal) output.writeFloat(value) } is Long -> { - output.writeByte(Kind.LONG.ordinal()) + output.writeByte(Kind.LONG.ordinal) output.writeLong(value) } is Double -> { - output.writeByte(Kind.DOUBLE.ordinal()) + output.writeByte(Kind.DOUBLE.ordinal) output.writeDouble(value) } is String -> { - output.writeByte(Kind.STRING.ordinal()) + output.writeByte(Kind.STRING.ordinal) IOUtil.writeString(value, output) } else -> throw IllegalStateException("Unexpected constant class: ${value.javaClass}") diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index aad6117b245..6757c89843e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -96,7 +96,7 @@ public abstract class AbstractIncrementalJpsTest( protected open val experimentalBuildLogFileName = "experimental-ic-build.log" private fun enableDebugLogging() { - com.intellij.openapi.diagnostic.Logger.setFactory(javaClass()) + com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java) TestLoggerFactory.dumpLogToStdout("") TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org") @@ -315,7 +315,7 @@ public abstract class AbstractIncrementalJpsTest( for (line in dependenciesTxt.readLines()) { val split = line.split("->") val module = split[0] - val dependencies = if (split.size() > 1) split[1] else "" + val dependencies = if (split.size > 1) split[1] else "" val dependencyList = dependencies.split(",").filterNot { it.isEmpty() } result[module] = dependencyList.map(::parseDependency) } @@ -369,13 +369,13 @@ public abstract class AbstractIncrementalJpsTest( createJavaMappingsDump(project) private fun createKotlinIncrementalCacheDump(project: ProjectDescriptor): String { - return StringBuilder { + return buildString { for (target in project.allModuleTargets.sortedBy { it.presentableName }) { append("\n") append(project.dataManager.getKotlinCache(target).dump()) append("\n\n\n") } - }.toString() + } } private fun createLookupCacheDump(project: ProjectDescriptor): String { @@ -480,7 +480,7 @@ public abstract class AbstractIncrementalJpsTest( moduleNames = null } else { - val nameToModule = moduleDependencies.keySet() + val nameToModule = moduleDependencies.keys .keysToMap { addModule(it, arrayOf(getAbsolutePath("$it/src")), null, null, jdk)!! } for ((moduleName, dependencies) in moduleDependencies) { @@ -492,12 +492,12 @@ public abstract class AbstractIncrementalJpsTest( } } - for (module in nameToModule.values()) { + for (module in nameToModule.values) { val moduleName = module.name prepareSources(relativePathToSrc = "$moduleName/src", filePrefix = moduleName + "_") } - moduleNames = nameToModule.keySet() + moduleNames = nameToModule.keys } AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(myProject) AbstractKotlinJpsBuildTestCase.addKotlinTestRuntimeDependency(myProject) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index e35f4947fd8..7fa5e2d9675 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -277,7 +277,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { ZipUtil.extract(jslibJar, jslibDir, null) } catch (ex: IOException) { - throw IllegalStateException(ex.getMessage()) + throw IllegalStateException(ex.message) } addKotlinJavaScriptDependency("KotlinJavaScript", jslibDir) @@ -587,10 +587,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { zip.close() } catch (ex: FileNotFoundException) { - throw IllegalStateException(ex.getMessage()) + throw IllegalStateException(ex.message) } catch (ex: IOException) { - throw IllegalStateException(ex.getMessage()) + throw IllegalStateException(ex.message) } } @@ -656,11 +656,11 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { public override fun isCanceled(): Boolean { val messages = buildResult.getMessages(BuildMessage.Kind.INFO) - for (i in checkFromIndex..messages.size()-1) { + for (i in checkFromIndex..messages.size - 1) { if (messages.get(i).getMessageText().startsWith("Kotlin JPS plugin version")) return true; } - checkFromIndex = messages.size(); + checkFromIndex = messages.size; return false; } } From e990dc20923b7750b225bb5308ac4f775a9df44b Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 7 Jan 2016 18:12:30 +0100 Subject: [PATCH 0725/1557] idea: cleanup 'public', property access syntax Original commit: 43a6e13f4bb916bb40321e94371a632e8630359d --- .../src/org/jetbrains/kotlin/config/CompilerSettings.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 67c73cf0b77..2d06cf18557 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -16,10 +16,10 @@ package org.jetbrains.kotlin.config -public class CompilerSettings { - public var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS - public var copyJsLibraryFiles: Boolean = true - public var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY +class CompilerSettings { + var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS + var copyJsLibraryFiles: Boolean = true + var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY companion object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" From 92ee7361b51b924fd423556d8ae6d06f6517aa82 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 7 Jan 2016 18:14:31 +0100 Subject: [PATCH 0726/1557] jps-plugin: cleanup 'public', property access syntax Original commit: 33ef7ad02451e3cab99535e67941c9b76a059e08 --- .../idea/bare/BareJpsPluginRegistrar.kt | 10 +- .../compilerRunner/KotlinCompilerRunner.kt | 8 +- .../kotlin/jps/build/JpsJsModuleUtils.kt | 10 +- .../kotlin/jps/build/KotlinBuilder.kt | 51 +++--- .../KotlinJpsCompilerArgumentsProvider.kt | 6 +- .../jps/build/TeamcityStatisticsLogger.kt | 2 +- .../jps/incremental/IncrementalCacheImpl.kt | 81 +++++---- .../IncrementalCompilationComponentsImpl.kt | 2 +- .../jps/incremental/LocalFileKotlinClass.kt | 2 +- .../kotlin/jps/incremental/LookupStorage.kt | 10 +- .../jps/incremental/ProtoCompareGenerated.kt | 64 +++---- .../jps/incremental/protoDifferenceUtils.kt | 10 +- .../jps/incremental/storage/BasicMap.kt | 2 +- .../jps/incremental/storage/BasicMapsOwner.kt | 3 +- .../jps/incremental/storage/FileToIdMap.kt | 8 +- .../jps/incremental/storage/IdToFileMap.kt | 8 +- .../jps/incremental/storage/LookupMap.kt | 10 +- .../kotlin/jps/incremental/storage/values.kt | 6 +- .../jetbrains/kotlin/modules/modulesUtil.kt | 2 +- .../jps/build/AbstractIncrementalJpsTest.kt | 10 +- .../AbstractIncrementalLazyCachesTest.kt | 2 +- .../build/IncrementalConstantSearchTest.kt | 2 +- .../IncrementalProjectPathCaseChangedTest.kt | 6 +- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 158 +++++++++--------- .../jps/build/SimpleKotlinJpsBuildTest.kt | 6 +- .../classFilesComparison.kt | 6 +- .../AbstractProtoComparisonTest.kt | 4 +- .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 16 +- 28 files changed, 250 insertions(+), 255 deletions(-) diff --git a/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt index 12b8da13837..5e1eab70fb0 100644 --- a/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt +++ b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt @@ -22,17 +22,17 @@ import com.intellij.openapi.components.ApplicationComponent import com.intellij.openapi.extensions.Extensions import com.intellij.openapi.extensions.PluginId -public class BareJpsPluginRegistrar : ApplicationComponent { +class BareJpsPluginRegistrar : ApplicationComponent { override fun initComponent() { val mainKotlinPlugin = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin")) - if (mainKotlinPlugin != null && mainKotlinPlugin.isEnabled()) { + if (mainKotlinPlugin != null && mainKotlinPlugin.isEnabled) { // do nothing } else { val compileServerPlugin = CompileServerPlugin() - compileServerPlugin.setClasspath("jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-bare-plugin.jar") - compileServerPlugin.setPluginDescriptor(PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin.bare"))) + compileServerPlugin.classpath = "jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-bare-plugin.jar" + compileServerPlugin.pluginDescriptor = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin.bare")) Extensions.getRootArea() .getExtensionPoint(CompileServerPlugin.EP_NAME) @@ -44,6 +44,6 @@ public class BareJpsPluginRegistrar : ApplicationComponent { } override fun getComponentName(): String { - return javaClass.getName() + return javaClass.name } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index c50274e0e94..6ea568067ad 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -44,12 +44,12 @@ import java.lang.reflect.Modifier import java.util.* import java.util.concurrent.TimeUnit -public object KotlinCompilerRunner { +object KotlinCompilerRunner { private val K2JVM_COMPILER = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" private val K2JS_COMPILER = "org.jetbrains.kotlin.cli.js.K2JSCompiler" private val INTERNAL_ERROR = ExitCode.INTERNAL_ERROR.toString() - public fun runK2JvmCompiler( + fun runK2JvmCompiler( commonArguments: CommonCompilerArguments, k2jvmArguments: K2JVMCompilerArguments, compilerSettings: CompilerSettings, @@ -63,7 +63,7 @@ public object KotlinCompilerRunner { runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) } - public fun runK2JsCompiler( + fun runK2JsCompiler( commonArguments: CommonCompilerArguments, k2jsArguments: K2JSCompilerArguments, compilerSettings: CompilerSettings, @@ -138,7 +138,7 @@ public object KotlinCompilerRunner { } - internal class DaemonConnection(public val daemon: CompileService?, public val sessionId: Int = CompileService.NO_SESSION) + internal class DaemonConnection(val daemon: CompileService?, val sessionId: Int = CompileService.NO_SESSION) internal object getDaemonConnection { private @Volatile var connection: DaemonConnection? = null diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index 97a89c990cc..c5ea466adb5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -37,10 +37,10 @@ object JpsJsModuleUtils { } fun getLibraryFiles(target: ModuleBuildTarget, result: MutableList) { - val libraries = JpsUtils.getAllDependencies(target).getLibraries() + val libraries = JpsUtils.getAllDependencies(target).libraries for (library in libraries) { for (root in library.getRoots(JpsOrderRootType.COMPILED)) { - val path = JpsPathUtil.urlToPath(root.getUrl()) + val path = JpsPathUtil.urlToPath(root.url) // ignore files, added only for IDE support (stubs and indexes) if (!path.startsWith(KotlinJavascriptMetadataUtils.VFS_PROTOCOL + "://")) { result.add(path) @@ -52,12 +52,12 @@ object JpsJsModuleUtils { fun getDependencyModulesAndSources(target: ModuleBuildTarget, result: MutableList) { JpsUtils.getAllDependencies(target).processModules(object : Consumer { override fun consume(module: JpsModule) { - if (module == target.getModule() || module.getModuleType() != JpsJavaModuleType.INSTANCE) return + if (module == target.module || module.moduleType != JpsJavaModuleType.INSTANCE) return val moduleBuildTarget = ModuleBuildTarget(module, JavaModuleBuildTargetType.PRODUCTION) val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget) - val metaInfoFile = getOutputMetaFile(outputDir, module.getName()) - result.add(metaInfoFile.getAbsolutePath()) + val metaInfoFile = getOutputMetaFile(outputDir, module.name) + result.add(metaInfoFile.absolutePath) } }) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 0b1fe8aa686..3bc88b3926c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -69,12 +69,11 @@ import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.util.* -public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { +class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { - @JvmField - public val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" + @JvmField val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" - public val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") + val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") } @@ -438,7 +437,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR messageCollector.report( INFO, - "Plugin loaded: ${argumentProvider.javaClass.getSimpleName()}", + "Plugin loaded: ${argumentProvider.javaClass.simpleName}", CompilerMessageLocation.NO_LOCATION ) } @@ -455,7 +454,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR .register(IncrementalCompilationComponents::class.java, IncrementalCompilationComponentsImpl(incrementalCaches, lookupTracker)) .register(CompilationCanceledStatus::class.java, object : CompilationCanceledStatus { override fun checkCanceled() { - if (context.getCancelStatus().isCanceled()) throw CompilationCanceledException() + if (context.cancelStatus.isCanceled) throw CompilationCanceledException() } }) .build() @@ -481,8 +480,8 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): List { // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below val sourceToTarget = HashMap() - if (chunk.getTargets().size > 1) { - for (target in chunk.getTargets()) { + if (chunk.targets.size > 1) { + for (target in chunk.targets) { for (file in KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) { sourceToTarget.put(file, target) } @@ -492,7 +491,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val result = ArrayList() val representativeTarget = chunk.representativeTarget() - for (outputItem in outputItemCollector.getOutputs()) { + for (outputItem in outputItemCollector.outputs) { val sourceFiles = outputItem.sourceFiles val outputFile = outputItem.outputFile val target = @@ -500,7 +499,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR chunk.targets.filter { it.outputDir?.let { outputFile.startsWith(it) } ?: false }.singleOrNull() ?: representativeTarget - if (outputFile.getName().endsWith(".class")) { + if (outputFile.name.endsWith(".class")) { result.add(GeneratedJvmClass(target, sourceFiles, outputFile)) } else { @@ -518,15 +517,15 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR filesToCompile: MultiMap, generatedClasses: List ) { - val previousMappings = context.getProjectDescriptor().dataManager.getMappings() + val previousMappings = context.projectDescriptor.dataManager.mappings val delta = previousMappings.createDelta() - val callback = delta.getCallback() + val callback = delta.callback for (generatedClass in generatedClasses) { callback.associate( - FileUtil.toSystemIndependentName(generatedClass.outputFile.getAbsolutePath()), - generatedClass.sourceFiles.map { FileUtil.toSystemIndependentName(it.getAbsolutePath()) }, - ClassReader(generatedClass.outputClass.getFileContents()) + FileUtil.toSystemIndependentName(generatedClass.outputFile.absolutePath), + generatedClass.sourceFiles.map { FileUtil.toSystemIndependentName(it.absolutePath) }, + ClassReader(generatedClass.outputClass.fileContents) ) } @@ -537,7 +536,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, generatedFiles: List) { for (generatedFile in generatedFiles) { - outputConsumer.registerOutputFile(generatedFile.target, generatedFile.outputFile, generatedFile.sourceFiles.map { it.getPath() }) + outputConsumer.registerOutputFile(generatedFile.target, generatedFile.outputFile, generatedFile.sourceFiles.map { it.path }) } } @@ -608,13 +607,13 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val outputItemCollector = OutputItemsCollectorImpl() val representativeTarget = chunk.representativeTarget() - if (chunk.getModules().size > 1) { + if (chunk.modules.size > 1) { // We do not support circular dependencies, but if they are present, we do our best should not break the build, // so we simply yield a warning and report NOTHING_DONE messageCollector.report( WARNING, "Circular dependencies are not supported. The following JS modules depend on each other: " - + chunk.getModules().map { it.getName() }.joinToString(", ") + ". " + + chunk.modules.map { it.name }.joinToString(", ") + ". " + "Kotlin is not compiled for these modules", CompilerMessageLocation.NO_LOCATION ) @@ -628,7 +627,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) - val moduleName = representativeTarget.getModule().getName() + val moduleName = representativeTarget.module.name val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName) val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) @@ -643,7 +642,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) if (compilerSettings.copyJsLibraryFiles) { - val outputLibraryRuntimeDirectory = File(outputDir, compilerSettings.outputDirectoryForJsLibraryFiles).getAbsolutePath() + val outputLibraryRuntimeDirectory = File(outputDir, compilerSettings.outputDirectoryForJsLibraryFiles).absolutePath val libraryFilesToCopy = arrayListOf() JpsJsModuleUtils.getLibraryFiles(representativeTarget, libraryFilesToCopy) LibraryUtils.copyJsFilesFromLibraries(libraryFilesToCopy, outputLibraryRuntimeDirectory) @@ -661,11 +660,11 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() - if (chunk.getModules().size > 1) { + if (chunk.modules.size > 1) { messageCollector.report( WARNING, "Circular dependencies are only partially supported. The following modules depend on each other: " - + chunk.getModules().map { it.getName() }.joinToString(", ") + ". " + + chunk.modules.map { it.name }.joinToString(", ") + ". " + "Kotlin will compile them, but some strange effect may happen", CompilerMessageLocation.NO_LOCATION ) @@ -676,7 +675,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR val processedTargetsWithRemoved = getProcessedTargetsWithRemovedFilesContainer(context) var totalRemovedFiles = 0 - for (target in chunk.getTargets()) { + for (target in chunk.targets) { val removedFilesInTarget = KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, target) if (!removedFilesInTarget.isEmpty()) { if (processedTargetsWithRemoved.add(target)) { @@ -692,7 +691,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return null } - val project = context.getProjectDescriptor().getProject() + val project = context.projectDescriptor.project val k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) @@ -706,7 +705,7 @@ public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR return outputItemCollector } - public class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { + class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { var prefix = "" @@ -832,7 +831,7 @@ private fun hasKotlinDirtyOrRemovedFiles( return chunk.targets.any { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isNotEmpty() } } -public open class GeneratedFile internal constructor( +open class GeneratedFile internal constructor( val target: ModuleBuildTarget, val sourceFiles: Collection, val outputFile: File diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt index f4709719d65..20513a1f2cc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinJpsCompilerArgumentsProvider.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.incremental.ModuleBuildTarget -public interface KotlinJpsCompilerArgumentsProvider { - public fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List - public fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List +interface KotlinJpsCompilerArgumentsProvider { + fun getExtraArguments(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List + fun getClasspath(moduleBuildTarget: ModuleBuildTarget, context: CompileContext): List } \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt index fe34b0191ea..7dbcb461b05 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TeamcityStatisticsLogger.kt @@ -65,7 +65,7 @@ class TeamcityStatisticsLogger { private fun printPerChunkStatistics(moduleChunk: ModuleChunk, timeToCompileNs: Long) { printStatisticMessage( - "${KotlinBuilder.KOTLIN_BUILDER_NAME} for ${moduleChunk.getPresentableShortName()} compilation time, ms", + "${KotlinBuilder.KOTLIN_BUILDER_NAME} for ${moduleChunk.presentableShortName} compilation time, ms", timeToCompileNs.nanosToMillis().toString() ) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 7815445a4c9..37ae9427f03 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -56,7 +56,7 @@ import java.util.* val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin" -public class IncrementalCacheImpl( +class IncrementalCacheImpl( private val target: ModuleBuildTarget, paths: BuildDataPaths ) : BasicMapsOwner(), IncrementalCache { @@ -112,11 +112,11 @@ public class IncrementalCacheImpl( inlinedTo.add(fromPath, jvmSignature, toPath) } - public fun addDependentCache(cache: IncrementalCacheImpl) { + fun addDependentCache(cache: IncrementalCacheImpl) { dependents.add(cache) } - public fun markOutputClassesDirty(removedAndCompiledSources: List) { + fun markOutputClassesDirty(removedAndCompiledSources: List) { for (sourceFile in removedAndCompiledSources) { val classes = sourceToClassesMap[sourceFile] classes.forEach { @@ -127,7 +127,7 @@ public class IncrementalCacheImpl( } } - public fun getFilesToReinline(): Collection { + fun getFilesToReinline(): Collection { val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { @@ -142,7 +142,7 @@ public class IncrementalCacheImpl( return result.map { File(it) } } - public fun cleanDirtyInlineFunctions() { + fun cleanDirtyInlineFunctions() { dirtyInlineFunctionsMap.clean() } @@ -150,7 +150,7 @@ public class IncrementalCacheImpl( return toSystemIndependentName(File(outputDir, "$internalClassName.class").canonicalPath) } - public fun saveModuleMappingToCache(sourceFiles: Collection, file: File): CompilationResult { + fun saveModuleMappingToCache(sourceFiles: Collection, file: File): CompilationResult { val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME) protoMap.process(jvmClassName, file.readBytes(), emptyArray(), isPackage = false, checkChangesIsOpenPart = false) dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME) @@ -158,7 +158,7 @@ public class IncrementalCacheImpl( return CompilationResult.NO_CHANGES } - public fun saveFileToCache(generatedClass: GeneratedJvmClass): CompilationResult { + fun saveFileToCache(generatedClass: GeneratedJvmClass): CompilationResult { val sourceFiles: Collection = generatedClass.sourceFiles val kotlinClass: LocalFileKotlinClass = generatedClass.outputClass val className = kotlinClass.className @@ -216,7 +216,7 @@ public class IncrementalCacheImpl( KotlinBuilder.LOG.debug("$className is changed: $this") } - public fun clearCacheForRemovedClasses(): CompilationResult { + fun clearCacheForRemovedClasses(): CompilationResult { fun T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List): Set = members.flatMap { this.it().filterNot { it.isPrivate }.names(nameResolver) }.toSet() @@ -324,26 +324,26 @@ public class IncrementalCacheImpl( return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)]?.bytes } - public override fun clean() { + override fun clean() { super.clean() cacheVersionProvider.normalVersion(target).clean() cacheVersionProvider.experimentalVersion(target).clean() } - public fun cleanExperimental() { + fun cleanExperimental() { cacheVersionProvider.experimentalVersion(target).clean() experimentalMaps.forEach { it.clean() } } private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { - public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { + fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { val header = kotlinClass.classHeader val bytes = BitEncoding.decodeBytes(header.annotationData!!) return put(kotlinClass.className, bytes, header.strings!!, isPackage, checkChangesIsOpenPart = true) } - public fun process(className: JvmClassName, data: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean): CompilationResult { + fun process(className: JvmClassName, data: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean): CompilationResult { return put(className, data, strings, isPackage, checkChangesIsOpenPart) } @@ -386,7 +386,7 @@ public class IncrementalCacheImpl( operator fun get(className: JvmClassName): ProtoMapValue? = storage[className.internalName] - public fun remove(className: JvmClassName) { + fun remove(className: JvmClassName) { storage.remove(className.internalName) } @@ -415,12 +415,12 @@ public class IncrementalCacheImpl( operator fun contains(className: JvmClassName): Boolean = className.internalName in storage - public fun process(kotlinClass: LocalFileKotlinClass): CompilationResult { + fun process(kotlinClass: LocalFileKotlinClass): CompilationResult { return put(kotlinClass.className, getConstantsMap(kotlinClass.fileContents)) } private fun put(className: JvmClassName, constantsMap: Map?): CompilationResult { - val key = className.getInternalName() + val key = className.internalName val oldMap = storage[key] if (oldMap == constantsMap) return CompilationResult.NO_CHANGES @@ -435,7 +435,7 @@ public class IncrementalCacheImpl( return CompilationResult(constantsChanged = true) } - public fun remove(className: JvmClassName) { + fun remove(className: JvmClassName) { put(className, null) } @@ -471,7 +471,7 @@ public class IncrementalCacheImpl( return result } - public fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { + fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents), isPackage) } @@ -517,7 +517,7 @@ public class IncrementalCacheImpl( changes = changes) } - public fun remove(className: JvmClassName) { + fun remove(className: JvmClassName) { storage.remove(className.internalName) } @@ -526,28 +526,28 @@ public class IncrementalCacheImpl( } private inner class PackagePartMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { - public fun addPackagePart(className: JvmClassName) { + fun addPackagePart(className: JvmClassName) { storage[className.internalName] = true } - public fun remove(className: JvmClassName) { + fun remove(className: JvmClassName) { storage.remove(className.internalName) } - public fun isPackagePart(className: JvmClassName): Boolean = + fun isPackagePart(className: JvmClassName): Boolean = className.internalName in storage override fun dumpValue(value: Boolean) = "" } private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { - public fun add(facadeName: JvmClassName, partNames: Collection) { + fun add(facadeName: JvmClassName, partNames: Collection) { storage[facadeName.internalName] = partNames } - public fun getMultifileClassParts(facadeName: String): Collection? = storage[facadeName] + fun getMultifileClassParts(facadeName: String): Collection? = storage[facadeName] - public fun remove(className: JvmClassName) { + fun remove(className: JvmClassName) { storage.remove(className.internalName) } @@ -555,15 +555,15 @@ public class IncrementalCacheImpl( } private inner class MultifileClassPartMap(storageFile: File) : BasicStringMap(storageFile, EnumeratorStringDescriptor.INSTANCE) { - public fun add(partName: String, facadeName: String) { + fun add(partName: String, facadeName: String) { storage[partName] = facadeName } - public fun getFacadeName(partName: String): String? { + fun getFacadeName(partName: String): String? { return storage.get(partName) } - public fun remove(className: JvmClassName) { + fun remove(className: JvmClassName) { storage.remove(className.internalName) } @@ -571,15 +571,15 @@ public class IncrementalCacheImpl( } private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringCollectionExternalizer) { - public fun clearOutputsForSource(sourceFile: File) { + fun clearOutputsForSource(sourceFile: File) { remove(sourceFile.absolutePath) } - public fun add(sourceFile: File, className: JvmClassName) { + fun add(sourceFile: File, className: JvmClassName) { storage.append(sourceFile.absolutePath, { out -> IOUtil.writeUTF(out, className.internalName) }) } - public operator fun get(sourceFile: File): Collection = + operator fun get(sourceFile: File): Collection = storage[sourceFile.absolutePath].orEmpty().map { JvmClassName.byInternalName(it) } override fun dumpValue(value: Collection) = value.dumpCollection() @@ -634,28 +634,28 @@ public class IncrementalCacheImpl( } private inner class DirtyOutputClassesMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { - public fun markDirty(className: String) { + fun markDirty(className: String) { storage[className] = true } - public fun notDirty(className: String) { + fun notDirty(className: String) { storage.remove(className) } - public fun getDirtyOutputClasses(): Collection = + fun getDirtyOutputClasses(): Collection = storage.keys - public fun isDirty(className: String): Boolean = + fun isDirty(className: String): Boolean = storage.contains(className) override fun dumpValue(value: Boolean) = "" } private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { - public fun getEntries(): Map> = + fun getEntries(): Map> = storage.keys.toMapBy(JvmClassName::byInternalName) { storage[it]!! } - public fun put(className: JvmClassName, changedFunctions: List) { + fun put(className: JvmClassName, changedFunctions: List) { storage[className.internalName] = changedFunctions } @@ -672,14 +672,14 @@ public class IncrementalCacheImpl( * * target files - collection of files inlineFunction has been inlined to */ private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { - public fun add(sourcePath: String, jvmSignature: String, targetPath: String) { + fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val key = PathFunctionPair(sourcePath, jvmSignature) storage.append(key) { out -> IOUtil.writeUTF(out, targetPath) } } - public operator fun get(sourcePath: String, jvmSignature: String): Collection { + operator fun get(sourcePath: String, jvmSignature: String): Collection { val key = PathFunctionPair(sourcePath, jvmSignature) return storage[key] ?: emptySet() } @@ -717,7 +717,7 @@ data class CompilationResult( val changes: Sequence = emptySequence() ) { companion object { - public val NO_CHANGES: CompilationResult = CompilationResult() + val NO_CHANGES: CompilationResult = CompilationResult() } operator fun plus(other: CompilationResult): CompilationResult = @@ -772,6 +772,5 @@ private fun , V> Map.dumpMap(dumpValue: (V)->String): St append("}") } -@TestOnly -public fun > Collection.dumpCollection(): String = +@TestOnly fun > Collection.dumpCollection(): String = "[${sorted().joinToString(", ", transform = Any::toString)}]" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt index 940313a74c1..7214001281f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.TargetId -public class IncrementalCompilationComponentsImpl( +class IncrementalCompilationComponentsImpl( caches: Map, private val lookupTracker: LookupTracker ): IncrementalCompilationComponents { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt index 1ff5e0ace77..356b58443eb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt @@ -40,7 +40,7 @@ class LocalFileKotlinClass private constructor( } } - public val className: JvmClassName by lazy { JvmClassName.byClassId(classId) } + val className: JvmClassName by lazy { JvmClassName.byClassId(classId) } override fun getLocation(): String = file.absolutePath diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt index 0345dbb290c..27110d361d1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt @@ -65,14 +65,14 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { } } - public fun add(lookupSymbol: LookupSymbol, containingPaths: Collection) { + fun add(lookupSymbol: LookupSymbol, containingPaths: Collection) { val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope) val fileIds = containingPaths.map { addFileIfNeeded(File(it)) }.toHashSet() fileIds.addAll(lookupMap[key] ?: emptySet()) lookupMap[key] = fileIds } - public fun removeLookupsFrom(file: File) { + fun removeLookupsFrom(file: File) { val id = fileToId[file] ?: return idToFile.remove(id) fileToId.remove(file) @@ -149,14 +149,12 @@ class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { } } - @TestOnly - public fun forceGC() { + @TestOnly fun forceGC() { removeGarbageIfNeeded(force = true) flush(false) } - @TestOnly - public fun dump(lookupSymbols: Set): String { + @TestOnly fun dump(lookupSymbols: Set): String { flush(false) val sb = StringBuilder() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index b35449f5e86..ad8bf822ae9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -25,12 +25,12 @@ import java.util.* /** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */ -open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, public val newNameResolver: NameResolver) { +open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameResolver: NameResolver) { private val strings = Interner() - public val oldStringIndexesMap: MutableMap = hashMapOf() - public val newStringIndexesMap: MutableMap = hashMapOf() - public val oldClassIdIndexesMap: MutableMap = hashMapOf() - public val newClassIdIndexesMap: MutableMap = hashMapOf() + val oldStringIndexesMap: MutableMap = hashMapOf() + val newStringIndexesMap: MutableMap = hashMapOf() + val oldClassIdIndexesMap: MutableMap = hashMapOf() + val newClassIdIndexesMap: MutableMap = hashMapOf() private val classIds = Interner() @@ -46,13 +46,13 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - public enum class ProtoBufPackageKind { + enum class ProtoBufPackageKind { FUNCTION_LIST, PROPERTY_LIST, TYPE_TABLE } - public fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { + fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { val result = EnumSet.noneOf(ProtoBufPackageKind::class.java) if (!checkEqualsPackageFunction(old, new)) result.add(ProtoBufPackageKind.FUNCTION_LIST) @@ -109,7 +109,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - public enum class ProtoBufClassKind { + enum class ProtoBufClassKind { FLAGS, FQ_NAME, COMPANION_OBJECT_NAME, @@ -125,7 +125,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi CLASS_ANNOTATION_LIST } - public fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet { + fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet { val result = EnumSet.noneOf(ProtoBufClassKind::class.java) if (old.hasFlags() != new.hasFlags()) result.add(ProtoBufClassKind.FLAGS) @@ -758,10 +758,10 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return true } - public fun oldGetIndexOfString(index: Int): Int = getIndexOfString(index, oldStringIndexesMap, oldNameResolver) - public fun newGetIndexOfString(index: Int): Int = getIndexOfString(index, newStringIndexesMap, newNameResolver) + fun oldGetIndexOfString(index: Int): Int = getIndexOfString(index, oldStringIndexesMap, oldNameResolver) + fun newGetIndexOfString(index: Int): Int = getIndexOfString(index, newStringIndexesMap, newNameResolver) - public fun getIndexOfString(index: Int, map: MutableMap, nameResolver: NameResolver): Int { + fun getIndexOfString(index: Int, map: MutableMap, nameResolver: NameResolver): Int { map[index]?.let { return it } val result = strings.intern(nameResolver.getString(index)) @@ -769,10 +769,10 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi return result } - public fun oldGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, oldClassIdIndexesMap, oldNameResolver) - public fun newGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, newClassIdIndexesMap, newNameResolver) + fun oldGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, oldClassIdIndexesMap, oldNameResolver) + fun newGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, newClassIdIndexesMap, newNameResolver) - public fun getIndexOfClassId(index: Int, map: MutableMap, nameResolver: NameResolver): Int { + fun getIndexOfClassId(index: Int, map: MutableMap, nameResolver: NameResolver): Int { map[index]?.let { return it } val result = classIds.intern(nameResolver.getClassId(index)) @@ -789,7 +789,7 @@ open class ProtoCompareGenerated(public val oldNameResolver: NameResolver, publi } } -public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 for(i in 0..functionCount - 1) { @@ -807,7 +807,7 @@ public fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: return hashCode } -public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { @@ -863,7 +863,7 @@ public fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: ( return hashCode } -public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { @@ -907,7 +907,7 @@ public fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes return hashCode } -public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { @@ -955,7 +955,7 @@ public fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes return hashCode } -public fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 for(i in 0..typeCount - 1) { @@ -969,7 +969,7 @@ public fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexe return hashCode } -public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 hashCode = 31 * hashCode + id @@ -999,7 +999,7 @@ public fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIn return hashCode } -public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 for(i in 0..argumentCount - 1) { @@ -1053,7 +1053,7 @@ public fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (I return hashCode } -public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { @@ -1071,7 +1071,7 @@ public fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameInde return hashCode } -public fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasName()) { @@ -1081,7 +1081,7 @@ public fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexe return hashCode } -public fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 hashCode = 31 * hashCode + fqNameIndexes(id) @@ -1093,7 +1093,7 @@ public fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndex return hashCode } -public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasFlags()) { @@ -1121,7 +1121,7 @@ public fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameI return hashCode } -public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasName()) { @@ -1135,7 +1135,7 @@ public fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, return hashCode } -public fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasField()) { @@ -1157,7 +1157,7 @@ public fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int return hashCode } -public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasProjection()) { @@ -1175,7 +1175,7 @@ public fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIn return hashCode } -public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 hashCode = 31 * hashCode + stringIndexes(nameId) @@ -1185,7 +1185,7 @@ public fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fq return hashCode } -public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasName()) { @@ -1199,7 +1199,7 @@ public fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, f return hashCode } -public fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { +fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 if (hasType()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index dafaa167d2d..d92a0c2bc15 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -29,13 +29,13 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.kotlin.utils.HashSetUtil import java.util.* -public sealed class DifferenceKind() { - public object NONE: DifferenceKind() - public object CLASS_SIGNATURE: DifferenceKind() - public class MEMBERS(val names: Collection): DifferenceKind() +sealed class DifferenceKind() { + object NONE: DifferenceKind() + object CLASS_SIGNATURE: DifferenceKind() + class MEMBERS(val names: Collection): DifferenceKind() } -public fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): DifferenceKind { +fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): DifferenceKind { if (oldData.isPackageFacade != newData.isPackageFacade) return DifferenceKind.CLASS_SIGNATURE val differenceObject = diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt index 64bf6b88f91..d2ba1c11631 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt @@ -72,7 +72,7 @@ internal abstract class BasicStringMap( keyDescriptor: KeyDescriptor, valueExternalizer: DataExternalizer ) : BasicMap(storageFile, keyDescriptor, valueExternalizer) { - public constructor( + constructor( storageFile: File, valueExternalizer: DataExternalizer ) : this(storageFile, EnumeratorStringDescriptor.INSTANCE, valueExternalizer) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt index c0d6f0903cb..6e11fb22d50 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt @@ -43,6 +43,5 @@ open class BasicMapsOwner : StorageOwner { maps.forEach { it.flush(memoryCachesOnly) } } - @TestOnly - public fun dump(): String = maps.map { it.dump() }.joinToString("\n\n") + @TestOnly fun dump(): String = maps.map { it.dump() }.joinToString("\n\n") } \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt index 56ad012b6da..fdae86816b5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt @@ -24,15 +24,15 @@ internal class FileToIdMap(file: File) : BasicMap(file, FileKeyDescri override fun dumpValue(value: Int): String = value.toString() - public operator fun get(file: File): Int? = storage[file] + operator fun get(file: File): Int? = storage[file] - public operator fun set(file: File, id: Int) { + operator fun set(file: File, id: Int) { storage[file] = id } - public fun remove(file: File) { + fun remove(file: File) { storage.remove(file) } - public fun toMap(): Map = storage.keys.keysToMap { storage[it]!! } + fun toMap(): Map = storage.keys.keysToMap { storage[it]!! } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt index b11a2d886ae..cd6ce62bc4e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt @@ -24,15 +24,15 @@ internal class IdToFileMap(file: File) : BasicMap(file, ExternalInteg override fun dumpValue(value: File): String = value.toString() - public operator fun get(id: Int): File? = storage[id] + operator fun get(id: Int): File? = storage[id] - public operator fun contains(id: Int): Boolean = id in storage + operator fun contains(id: Int): Boolean = id in storage - public operator fun set(id: Int, file: File) { + operator fun set(id: Int, file: File) { storage[id] = file } - public fun remove(id: Int) { + fun remove(id: Int) { storage.remove(id) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index e5a73bb0564..4b6ccba6d1d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -23,20 +23,20 @@ internal class LookupMap(storage: File) : BasicMap): String = value.toString() - public fun add(name: String, scope: String, fileId: Int) { + fun add(name: String, scope: String, fileId: Int) { storage.append(LookupSymbolKey(name, scope)) { out -> out.writeInt(fileId) } } - public operator fun get(key: LookupSymbolKey): Collection? = storage[key] + operator fun get(key: LookupSymbolKey): Collection? = storage[key] - public operator fun set(key: LookupSymbolKey, fileIds: Set) { + operator fun set(key: LookupSymbolKey, fileIds: Set) { storage[key] = fileIds } - public fun remove(key: LookupSymbolKey) { + fun remove(key: LookupSymbolKey) { storage.remove(key) } - public val keys: Collection + val keys: Collection get() = storage.keys } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt index 3eb85f4bb34..986415f3d61 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.incremental.storage import com.intellij.openapi.util.io.FileUtil data class LookupSymbolKey(val nameHash: Int, val scopeHash: Int) : Comparable { - public constructor(name: String, scope: String) : this(name.hashCode(), scope.hashCode()) + constructor(name: String, scope: String) : this(name.hashCode(), scope.hashCode()) override fun compareTo(other: LookupSymbolKey): Int { val nameCmp = nameHash.compareTo(other.nameHash) @@ -31,8 +31,8 @@ data class LookupSymbolKey(val nameHash: Int, val scopeHash: Int) : Comparable { override fun compareTo(other: PathFunctionPair): Int { val pathComp = FileUtil.comparePaths(path, other.path) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt index a972911e445..af1d570f297 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt @@ -18,5 +18,5 @@ package org.jetbrains.kotlin.modules import org.jetbrains.jps.incremental.ModuleBuildTarget -public fun TargetId(moduleBuildTarget: ModuleBuildTarget): TargetId = +fun TargetId(moduleBuildTarget: ModuleBuildTarget): TargetId = TargetId(moduleBuildTarget.id, moduleBuildTarget.targetType.typeId) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 6757c89843e..37cac8b92db 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -62,7 +62,7 @@ import kotlin.properties.Delegates import kotlin.test.assertEquals import kotlin.test.assertFalse -public abstract class AbstractIncrementalJpsTest( +abstract class AbstractIncrementalJpsTest( private val allowNoFilesWithSuffixInTestData: Boolean = false, private val checkDumpsCaseInsensitively: Boolean = false, private val allowNoBuildLogFileInTestData: Boolean = false @@ -230,7 +230,7 @@ public abstract class AbstractIncrementalJpsTest( val modifications = ArrayList() for (file in testDataDir.listFiles()!!) { - val fileName = file.getName() + val fileName = file.name if (fileName.endsWith(newSuffix)) { modifications.add(ModifyContent(getDirPrefix(fileName) + "/" + fileName.removeSuffix(newSuffix), file)) @@ -245,8 +245,8 @@ public abstract class AbstractIncrementalJpsTest( return modifications } - val haveFilesWithoutNumbers = testDataDir.listFiles { it -> it.getName().matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false - val haveFilesWithNumbers = testDataDir.listFiles { it -> it.getName().matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithoutNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false if (haveFilesWithoutNumbers && haveFilesWithNumbers) { fail("Bad test data format: files ending with both unnumbered and numbered $COMMANDS_AS_MESSAGE_PART were found") @@ -512,7 +512,7 @@ public abstract class AbstractIncrementalJpsTest( // TODO replace with org.jetbrains.jps.builders.TestProjectBuilderLogger private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { private val logBuf = StringBuilder() - public val log: String + val log: String get() = logBuf.toString() val compiledFiles = hashSetOf() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index f7c635517d5..2ee10bc107a 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.utils.Printer import java.io.File -public abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() { +abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() { protected open val expectedCachesFileName: String get() = "expected-kotlin-caches.txt" diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt index b6cd03cd68e..ee1387980b6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt @@ -21,7 +21,7 @@ import com.intellij.util.concurrency.FixedFuture import java.io.File import java.util.concurrent.Future -public class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() { +class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() { fun testJavaConstantChangedUsedInKotlin() { doTest("jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/") } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt index 437c9e11ab8..717cef06ac3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.SystemInfoRt import org.jetbrains.jps.model.java.JavaSourceRootType -public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) { +class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) { fun testProjectPathCaseChanged() { doTest("jps-plugin/testData/incremental/custom/projectPathCaseChanged/") } @@ -37,8 +37,8 @@ public class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest( } override fun performAdditionalModifications(modifications: List) { - val module = myProject.getModules()[0] - val sourceRoot = module.getSourceRoots()[0].getUrl() + val module = myProject.modules[0] + val sourceRoot = module.sourceRoots[0].url assert(sourceRoot.endsWith("/src")) val newSourceRoot = sourceRoot.replace("/src", "/SRC") module.removeSourceRoot(sourceRoot, JavaSourceRootType.SOURCE) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 7fa5e2d9675..bd6d2403e3b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -60,7 +60,7 @@ import java.util.zip.ZipOutputStream import kotlin.test.assertFalse import kotlin.test.assertTrue -public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { +class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { companion object { private val PROJECT_NAME = "kotlinProject" private val ADDITIONAL_MODULE_NAME = "module2" @@ -113,8 +113,8 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val list = arrayListOf() for (moduleName in moduleNames) { val outputDir = File("out/production/$moduleName") - list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName).getPath())) - list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName).getPath())) + list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputFile(outputDir, moduleName).path)) + list.add(toSystemIndependentName(JpsJsModuleUtils.getOutputMetaFile(outputDir, moduleName).path)) } return list.toTypedArray() } @@ -133,7 +133,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { private fun assertFilesExistInOutput(module: JpsModule, vararg relativePaths: String) { for (path in relativePaths) { val outputFile = findFileInOutputDir(module, path) - assertTrue(outputFile.exists(), "Output not written: " + outputFile.getAbsolutePath() + "\n Directory contents: \n" + dirContents(outputFile.getParentFile())) + assertTrue(outputFile.exists(), "Output not written: " + outputFile.absolutePath + "\n Directory contents: \n" + dirContents(outputFile.parentFile)) } } @@ -151,7 +151,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val outputDir = File(JpsPathUtil.urlToPath(outputUrl)) for (path in relativePaths) { val outputFile = File(outputDir, path) - assertFalse(outputFile.exists(), "Output directory \"" + outputFile.getAbsolutePath() + "\" contains \"" + path + "\"") + assertFalse(outputFile.exists(), "Output directory \"" + outputFile.absolutePath + "\" contains \"" + path + "\"") } } @@ -159,7 +159,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val files = dir.listFiles() ?: return "" val builder = StringBuilder() for (file in files) { - builder.append(" * ").append(file.getName()).append("\n") + builder.append(" * ").append(file.name).append("\n") } return builder.toString() } @@ -173,7 +173,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { return "out/production/$moduleName/${JvmCodegenUtil.getMappingFileName(moduleName)}" } - public fun mergeArrays(vararg stringArrays: Array): Array { + fun mergeArrays(vararg stringArrays: Array): Array { val result = HashSet() for (array in stringArrays) { result.addAll(Arrays.asList(*array)) @@ -186,7 +186,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { super.setUp() val sourceFilesRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) workDir = AbstractKotlinJpsBuildTestCase.copyTestDataToTmpDir(sourceFilesRoot) - getOrCreateProjectDir() + orCreateProjectDir } override fun tearDown() { @@ -198,21 +198,21 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { private fun initProject() { addJdk(JDK_NAME) - loadProject(workDir.getAbsolutePath() + File.separator + PROJECT_NAME + ".ipr") + loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr") } - public fun doTest() { + fun doTest() { initProject() makeAll().assertSuccessful() } - public fun doTestWithRuntime() { + fun doTestWithRuntime() { initProject() addKotlinRuntimeDependency() makeAll().assertSuccessful() } - public fun doTestWithKotlinJavaScriptLibrary() { + fun doTestWithKotlinJavaScriptLibrary() { initProject() addKotlinJavaScriptStdlibDependency() createKotlinJavaScriptLibraryArchive() @@ -220,17 +220,17 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { makeAll().assertSuccessful() } - public fun testKotlinProject() { + fun testKotlinProject() { doTest() checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "Test1Kt")) } - public fun testSourcePackagePrefix() { + fun testSourcePackagePrefix() { doTest() } - public fun testSourcePackageLongPrefix() { + fun testSourcePackageLongPrefix() { initProject() val buildResult = makeAll() buildResult.assertSuccessful() @@ -239,7 +239,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText) } - public fun testSourcePackagePrefixKnownIssueWithInnerClasses() { + fun testSourcePackagePrefixKnownIssueWithInnerClasses() { initProject() val buildResult = makeAll() buildResult.assertFailed() @@ -247,7 +247,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertTrue("Message wasn't found. $errors", errors.first().contains("class xxx.JavaWithInner.TextRenderer, unresolved supertypes: TableRow")) } - public fun testKotlinJavaScriptProject() { + fun testKotlinJavaScriptProject() { initProject() addKotlinJavaScriptStdlibDependency() makeAll().assertSuccessful() @@ -256,7 +256,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public fun testKotlinJavaScriptProjectWithTwoModules() { + fun testKotlinJavaScriptProjectWithTwoModules() { initProject() addKotlinJavaScriptStdlibDependency() makeAll().assertSuccessful() @@ -269,9 +269,9 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(arrayOf(touch("src/test1.kt"), touch("module2/src/module2.kt")), null, k2jsOutput(PROJECT_NAME, ADDITIONAL_MODULE_NAME)) } - public fun testKotlinJavaScriptProjectWithDirectoryAsStdlib() { + fun testKotlinJavaScriptProjectWithDirectoryAsStdlib() { initProject() - val jslibJar = PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath() + val jslibJar = PathUtil.getKotlinPathsForDistDirectory().jsStdLibJarPath val jslibDir = File(workDir, "KotlinJavaScript") try { ZipUtil.extract(jslibJar, jslibDir, null) @@ -287,7 +287,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() { + fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() { initProject() addKotlinJavaScriptStdlibDependency() addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY)) @@ -297,28 +297,28 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public fun testKotlinJavaScriptProjectWithLibrary() { + fun testKotlinJavaScriptProjectWithLibrary() { doTestWithKotlinJavaScriptLibrary() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public fun testKotlinJavaScriptProjectWithLibraryCustomOutputDir() { + fun testKotlinJavaScriptProjectWithLibraryCustomOutputDir() { doTestWithKotlinJavaScriptLibrary() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public fun testKotlinJavaScriptProjectWithLibraryNoCopy() { + fun testKotlinJavaScriptProjectWithLibraryNoCopy() { doTestWithKotlinJavaScriptLibrary() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY, contentOfOutputDir(PROJECT_NAME)) checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) } - public fun testKotlinJavaScriptProjectWithLibraryAndErrors() { + fun testKotlinJavaScriptProjectWithLibraryAndErrors() { initProject() addKotlinJavaScriptStdlibDependency() createKotlinJavaScriptLibraryArchive() @@ -328,20 +328,20 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) } - public fun testExcludeFolderInSourceRoot() { + fun testExcludeFolderInSourceRoot() { doTest() - val module = myProject.getModules().get(0) + val module = myProject.modules.get(0) assertFilesExistInOutput(module, "Foo.class") assertFilesNotExistInOutput(module, *EXCLUDE_FILES) checkWhen(touch("src/foo.kt"), null, arrayOf(klass("kotlinProject", "Foo"))) } - public fun testExcludeModuleFolderInSourceRootOfAnotherModule() { + fun testExcludeModuleFolderInSourceRootOfAnotherModule() { doTest() - for (module in myProject.getModules()) { + for (module in myProject.modules) { assertFilesExistInOutput(module, "Foo.class") } @@ -349,10 +349,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/module2/src/foo.kt"), null, arrayOf(klass("module2", "Foo"))) } - public fun testExcludeFileUsingCompilerSettings() { + fun testExcludeFileUsingCompilerSettings() { doTest() - val module = myProject.getModules().get(0) + val module = myProject.modules.get(0) assertFilesExistInOutput(module, "Foo.class", "Bar.class") assertFilesNotExistInOutput(module, *EXCLUDE_FILES) @@ -361,10 +361,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/dir/YetAnotherExcluded.kt"), null, NOTHING) } - public fun testExcludeFolderNonRecursivelyUsingCompilerSettings() { + fun testExcludeFolderNonRecursivelyUsingCompilerSettings() { doTest() - val module = myProject.getModules().get(0) + val module = myProject.modules.get(0) assertFilesExistInOutput(module, "Foo.class", "Bar.class") assertFilesNotExistInOutput(module, *EXCLUDE_FILES) @@ -375,10 +375,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/dir/subdir/YetAnotherExcluded.kt"), null, NOTHING) } - public fun testExcludeFolderRecursivelyUsingCompilerSettings() { + fun testExcludeFolderRecursivelyUsingCompilerSettings() { doTest() - val module = myProject.getModules().get(0) + val module = myProject.modules.get(0) assertFilesExistInOutput(module, "Foo.class", "Bar.class") assertFilesNotExistInOutput(module, *EXCLUDE_FILES) @@ -390,10 +390,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/exclude/subdir/YetAnotherExcluded.kt"), null, NOTHING) } - public fun testManyFiles() { + fun testManyFiles() { doTest() - val module = myProject.getModules().get(0) + val module = myProject.modules.get(0) assertFilesExistInOutput(module, "foo/MainKt.class", "boo/BooKt.class", "foo/Bar.class") checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")) @@ -412,10 +412,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("src/Bar.kt"), null, arrayOf(klass("kotlinProject", "foo.Bar"))) } - public fun testManyFilesForPackage() { + fun testManyFilesForPackage() { doTest() - val module = myProject.getModules().get(0) + val module = myProject.modules.get(0) assertFilesExistInOutput(module, "foo/MainKt.class", "boo/BooKt.class", "foo/Bar.class") checkWhen(touch("src/main.kt"), null, packageClasses("kotlinProject", "src/main.kt", "foo.MainKt")) @@ -441,7 +441,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { module("kotlinProject"))) } - public fun testKotlinProjectTwoFilesInOnePackage() { + fun testKotlinProjectTwoFilesInOnePackage() { doTest() checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")) @@ -452,38 +452,38 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"), module("kotlinProject"))) - assertFilesNotExistInOutput(myProject.getModules().get(0), "_DefaultPackage.class") + assertFilesNotExistInOutput(myProject.modules.get(0), "_DefaultPackage.class") } - public fun testKotlinJavaProject() { + fun testKotlinJavaProject() { doTestWithRuntime() } - public fun testJKJProject() { + fun testJKJProject() { doTestWithRuntime() } - public fun testKJKProject() { + fun testKJKProject() { doTestWithRuntime() } - public fun testKJCircularProject() { + fun testKJCircularProject() { doTestWithRuntime() } - public fun testJKJInheritanceProject() { + fun testJKJInheritanceProject() { doTestWithRuntime() } - public fun testKJKInheritanceProject() { + fun testKJKInheritanceProject() { doTestWithRuntime() } - public fun testCircularDependenciesNoKotlinFiles() { + fun testCircularDependenciesNoKotlinFiles() { doTest() } - public fun testCircularDependenciesDifferentPackages() { + fun testCircularDependenciesDifferentPackages() { initProject() val result = makeAll() @@ -497,7 +497,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Kt")) } - public fun testCircularDependenciesSamePackage() { + fun testCircularDependenciesSamePackage() { initProject() val result = makeAll() result.assertSuccessful() @@ -512,7 +512,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) } - public fun testCircularDependenciesSamePackageWithTests() { + fun testCircularDependenciesSamePackageWithTests() { initProject() val result = makeAll() result.assertSuccessful() @@ -527,31 +527,31 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) } - public fun testInternalFromAnotherModule() { + fun testInternalFromAnotherModule() { initProject() val result = makeAll() result.assertFailed() result.checkErrors() } - public fun testCircularDependenciesInternalFromAnotherModule() { + fun testCircularDependenciesInternalFromAnotherModule() { initProject() val result = makeAll() result.assertFailed() result.checkErrors() } - public fun testCircularDependenciesWrongInternalFromTests() { + fun testCircularDependenciesWrongInternalFromTests() { initProject() val result = makeAll() result.assertFailed() result.checkErrors() } - public fun testCircularDependencyWithReferenceToOldVersionLib() { + fun testCircularDependencyWithReferenceToOldVersionLib() { initProject() - val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.getAbsolutePath() + File.separator + "oldModuleLib/src", "module-lib", false) + val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false) AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) @@ -559,10 +559,10 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.assertSuccessful() } - public fun testDependencyToOldKotlinLib() { + fun testDependencyToOldKotlinLib() { initProject() - val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.getAbsolutePath() + File.separator + "oldModuleLib/src", "module-lib", false) + val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false) AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) @@ -572,7 +572,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.assertSuccessful() } - public fun testAccessToInternalInProductionFromTests() { + fun testAccessToInternalInProductionFromTests() { initProject() val result = makeAll() @@ -608,17 +608,17 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { return result } - public fun testReexportedDependency() { + fun testReexportedDependency() { initProject() - AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, ContainerUtil.filter(myProject.getModules(), object : Condition { + AbstractKotlinJpsBuildTestCase.addKotlinRuntimeDependency(JpsJavaDependencyScope.COMPILE, ContainerUtil.filter(myProject.modules, object : Condition { override fun value(module: JpsModule): Boolean { - return module.getName() == "module2" + return module.name == "module2" } }), true) makeAll().assertSuccessful() } - public fun testCancelLongKotlinCompilation() { + fun testCancelLongKotlinCompilation() { generateLongKotlinFile("Foo.kt", "foo", "Foo") initProject() @@ -636,28 +636,28 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { buildResult.assertSuccessful() assert(interval < 8000) { "expected time for canceled compilation < 8000 ms, but $interval" } - val module = myProject.getModules().get(0) + val module = myProject.modules.get(0) assertFilesNotExistInOutput(module, "foo/Foo.class") - val expectedLog = workDir.getAbsolutePath() + File.separator + "expected.log" + val expectedLog = workDir.absolutePath + File.separator + "expected.log" checkFullLog(logger, File(expectedLog)) } - public fun testCancelKotlinCompilation() { + fun testCancelKotlinCompilation() { initProject() makeAll().assertSuccessful() - val module = myProject.getModules().get(0) + val module = myProject.modules.get(0) assertFilesExistInOutput(module, "foo/Bar.class") val buildResult = BuildResult() val canceledStatus = object: CanceledStatus { var checkFromIndex = 0; - public override fun isCanceled(): Boolean { + override fun isCanceled(): Boolean { val messages = buildResult.getMessages(BuildMessage.Kind.INFO) for (i in checkFromIndex..messages.size - 1) { - if (messages.get(i).getMessageText().startsWith("Kotlin JPS plugin version")) return true; + if (messages.get(i).messageText.startsWith("Kotlin JPS plugin version")) return true; } checkFromIndex = messages.size; @@ -672,7 +672,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFilesNotExistInOutput(module, "foo/Bar.class") } - public fun testFileDoesNotExistWarning() { + fun testFileDoesNotExistWarning() { initProject() AbstractKotlinJpsBuildTestCase.addDependency( @@ -697,7 +697,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { ) } - public fun testDoNotCreateUselessKotlinIncrementalCaches() { + fun testDoNotCreateUselessKotlinIncrementalCaches() { initProject() makeAll().assertSuccessful() @@ -706,7 +706,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) } - public fun testDoNotCreateUselessKotlinIncrementalCachesForDependentTargets() { + fun testDoNotCreateUselessKotlinIncrementalCachesForDependentTargets() { initProject() makeAll().assertSuccessful() @@ -741,16 +741,16 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } private fun checkFullLog(logger: TestProjectBuilderLogger, expectedLogFile: File) { - UsefulTestCase.assertSameLinesWithFile(expectedLogFile.getAbsolutePath(), logger.getFullLog(getOrCreateProjectDir(), myDataStorageRoot)) + UsefulTestCase.assertSameLinesWithFile(expectedLogFile.absolutePath, logger.getFullLog(orCreateProjectDir, myDataStorageRoot)) } private fun assertCanceled(buildResult: BuildResult) { val list = buildResult.getMessages(BuildMessage.Kind.INFO) - assertTrue("The build has been canceled".equals(list.last().getMessageText())) + assertTrue("The build has been canceled".equals(list.last().messageText)) } private fun generateLongKotlinFile(filePath: String, packagename: String, className: String) { - val file = File(workDir.getAbsolutePath() + File.separator + "src" + File.separator + filePath) + val file = File(workDir.absolutePath + File.separator + "src" + File.separator + filePath) FileUtilRt.createIfNotExists(file) val writer = BufferedWriter(FileWriter(file)) try { @@ -769,8 +769,8 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } private fun findModule(name: String): JpsModule { - for (module in myProject.getModules()) { - if (module.getName() == name) { + for (module in myProject.modules) { + if (module.name == name) { return module } } @@ -802,7 +802,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } private fun packagePartClass(moduleName: String, fileName: String, packageClassFqName: String): String { - val path = FileUtilRt.toSystemIndependentName(File(workDir, fileName).getAbsolutePath()) + val path = FileUtilRt.toSystemIndependentName(File(workDir, fileName).absolutePath) val fakeVirtualFile = object : LightVirtualFile(path.substringAfterLast('/')) { override fun getPath(): String { // strip extra "/" from the beginning @@ -833,7 +833,7 @@ public class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { Operation.CHANGE -> touch(file) Operation.DELETE -> - assertTrue(file.delete(), "Can not delete file \"" + file.getAbsolutePath() + "\"") + assertTrue(file.delete(), "Can not delete file \"" + file.absolutePath + "\"") else -> fail("Unknown operation") } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index fc1ab6d2052..23b1d45e2ff 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -22,13 +22,13 @@ import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File -public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { +class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { override fun setUp() { super.setUp() workDir = KotlinTestUtils.tmpDirForTest(this) } - public fun testLoadingKotlinFromDifferentModules() { + fun testLoadingKotlinFromDifferentModules() { val aFile = createFile("m1/K.kt", """ package m1; @@ -65,7 +65,7 @@ public class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } // TODO: add JS tests - public fun testDaemon() { + fun testDaemon() { System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "") System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "") // spaces in the name to test proper file name handling diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index 388db7f1c42..4fa17591046 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -57,7 +57,7 @@ fun getDirectoryString(dir: File, interestingPaths: List): String { val children = listFiles!!.sortedWith(compareBy ({ it.isDirectory }, { it.name } )) for (child in children) { - if (child.isDirectory()) { + if (child.isDirectory) { p.println(child.name) addDirContent(child) } @@ -86,7 +86,7 @@ fun getDirectoryString(dir: File, interestingPaths: List): String { fun getAllRelativePaths(dir: File): Set { val result = HashSet() FileUtil.processFilesRecursively(dir) { - if (it!!.isFile()) { + if (it!!.isFile) { result.add(FileUtil.getRelativePath(dir, it)!!) } @@ -132,7 +132,7 @@ fun classFileToString(classFile: File): String { val traceVisitor = TraceClassVisitor(PrintWriter(out)) ClassReader(classFile.readBytes()).accept(traceVisitor, 0) - val classHeader = LocalFileKotlinClass.create(classFile)?.getClassHeader() + val classHeader = LocalFileKotlinClass.create(classFile)?.classHeader val annotationDataEncoded = classHeader?.annotationData if (annotationDataEncoded != null) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 1b446159b37..664765289c9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -28,9 +28,9 @@ import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.utils.Printer import java.io.File -public abstract class AbstractProtoComparisonTest : UsefulTestCase() { +abstract class AbstractProtoComparisonTest : UsefulTestCase() { - public fun doTest(testDataPath: String) { + fun doTest(testDataPath: String) { val testDir = KotlinTestUtils.tmpDir("testDirectory") val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old") diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 3408e3537e8..40f75a9b648 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -30,22 +30,22 @@ import java.io.File * To test this, we compile a Kotlin+Java module (in two modes: CLI and module-based) where a runtime Java class was replaced * with a "newer" version in sources, and check that this class resolves to the one from sources by calling a method absent in the runtime */ -public class ClasspathOrderTest : TestCaseWithTmpdir() { +class ClasspathOrderTest : TestCaseWithTmpdir() { companion object { - val sourceDir = File(KotlinTestUtils.getTestDataPathBase() + "/classpathOrder").getAbsoluteFile() + val sourceDir = File(KotlinTestUtils.getTestDataPathBase() + "/classpathOrder").absoluteFile } - public fun testClasspathOrderForCLI() { - MockLibraryUtil.compileKotlin(sourceDir.getPath(), tmpdir) + fun testClasspathOrderForCLI() { + MockLibraryUtil.compileKotlin(sourceDir.path, tmpdir) } - public fun testClasspathOrderForModuleScriptBuild() { + fun testClasspathOrderForModuleScriptBuild() { val xmlContent = KotlinModuleXmlBuilder().addModule( "name", - File(tmpdir, "output").getAbsolutePath(), + File(tmpdir, "output").absolutePath, listOf(sourceDir), listOf(JvmSourceRoot(sourceDir)), - listOf(PathUtil.getKotlinPathsForDistDirectory().getRuntimePath()), + listOf(PathUtil.getKotlinPathsForDistDirectory().runtimePath), JavaModuleBuildTargetType.PRODUCTION, setOf(), emptyList() @@ -54,6 +54,6 @@ public class ClasspathOrderTest : TestCaseWithTmpdir() { val xml = File(tmpdir, "module.xml") xml.writeText(xmlContent) - MockLibraryUtil.compileKotlinModule(xml.getAbsolutePath()) + MockLibraryUtil.compileKotlinModule(xml.absolutePath) } } \ No newline at end of file From aaf2c5573dd0dc60c066235133f7e9b3314ce3e0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 17 Dec 2015 21:48:22 +0300 Subject: [PATCH 0727/1557] Minor: move processChanges Original commit: ab13b2ddfced9461d9a3d5031f14ba4afbb98389 --- .../kotlin/jps/build/KotlinBuilder.kt | 131 ++++++++++-------- 1 file changed, 70 insertions(+), 61 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 3bc88b3926c..61465eff7de 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -263,67 +263,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return ADDITIONAL_PASS_REQUIRED } - private fun processChanges( - compiledFiles: Set, - allCompiledFiles: MutableSet, - dataManager: BuildDataManager, - caches: List, - compilationResult: CompilationResult, - fsOperations: FSOperationsHelper - ) { - fun CompilationResult.doProcessChanges() { - LOG.debug("compilationResult = $this") - - when { - inlineAdded -> { - allCompiledFiles.clear() - fsOperations.markChunk(recursively = true, kotlinOnly = true, excludeFiles = compiledFiles) - return - } - constantsChanged -> { - fsOperations.markChunk(recursively = true, kotlinOnly = false, excludeFiles = allCompiledFiles) - return - } - protoChanged -> { - fsOperations.markChunk(recursively = false, kotlinOnly = true, excludeFiles = allCompiledFiles) - } - } - - if (inlineChanged) { - val files = caches.flatMap { it.getFilesToReinline() } - fsOperations.markFiles(files, excludeFiles = compiledFiles) - } - } - - fun CompilationResult.doProcessChangesUsingLookups() { - val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) - - LOG.debug("Start processing changes") - - // TODO group by fqName? - for (change in changes) { - LOG.debug("Process $change") - - if (change !is ChangeInfo.MembersChanged) continue - - val files = change.names.asSequence() - .flatMap { lookupStorage.get(LookupSymbol(it, change.fqName.asString())).asSequence() } - .map(::File) - - fsOperations.markFiles(files.asIterable(), excludeFiles = compiledFiles) - } - - LOG.debug("End of processing changes") - } - - if (IncrementalCompilation.isExperimental()) { - compilationResult.doProcessChangesUsingLookups() - } - else { - compilationResult.doProcessChanges() - } - } - private fun applyActionsOnCacheVersionChange( actions: Set, cacheVersionsProvider: CacheVersionProvider, @@ -744,6 +683,76 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } } +private fun processChanges( + compiledFiles: Set, + allCompiledFiles: MutableSet, + dataManager: BuildDataManager, + caches: List, + compilationResult: CompilationResult, + fsOperations: FSOperationsHelper +) { + if (IncrementalCompilation.isExperimental()) { + compilationResult.doProcessChangesUsingLookups(compiledFiles, dataManager, fsOperations) + } + else { + compilationResult.doProcessChanges(compiledFiles, allCompiledFiles, caches, fsOperations) + } +} + +private fun CompilationResult.doProcessChanges( + compiledFiles: Set, + allCompiledFiles: MutableSet, + caches: Collection, + fsOperations: FSOperationsHelper +) { + KotlinBuilder.LOG.debug("compilationResult = $this") + + when { + inlineAdded -> { + allCompiledFiles.clear() + fsOperations.markChunk(recursively = true, kotlinOnly = true, excludeFiles = compiledFiles) + return + } + constantsChanged -> { + fsOperations.markChunk(recursively = true, kotlinOnly = false, excludeFiles = allCompiledFiles) + return + } + protoChanged -> { + fsOperations.markChunk(recursively = false, kotlinOnly = true, excludeFiles = allCompiledFiles) + } + } + + if (inlineChanged) { + val files = caches.flatMap { it.getFilesToReinline() } + fsOperations.markFiles(files, excludeFiles = compiledFiles) + } +} + +private fun CompilationResult.doProcessChangesUsingLookups( + compiledFiles: Set, + dataManager: BuildDataManager, + fsOperations: FSOperationsHelper +) { + val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) + + KotlinBuilder.LOG.debug("Start processing changes") + + // TODO group by fqName? + for (change in changes) { + KotlinBuilder.LOG.debug("Process $change") + + if (change !is ChangeInfo.MembersChanged) continue + + val files = change.names.asSequence() + .flatMap { lookupStorage.get(LookupSymbol(it, change.fqName.asString())).asSequence() } + .map(::File) + + fsOperations.markFiles(files.asIterable(), excludeFiles = compiledFiles) + } + + KotlinBuilder.LOG.debug("End of processing changes") +} + private val Iterable>.moduleTargets: Iterable get() = filterIsInstance(ModuleBuildTarget::class.java) From 04e2c6c3421d3cb89e3f9933615d15ddb1fa4e2e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 17 Dec 2015 21:58:20 +0300 Subject: [PATCH 0728/1557] Process changed signatures of classes Original commit: dfc08b8f388c9ae969d16eff9658dd0f7703fb18 --- .../kotlin/jps/build/KotlinBuilder.kt | 82 ++++++++++++++----- .../jps/incremental/IncrementalCacheImpl.kt | 12 ++- 2 files changed, 73 insertions(+), 21 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 61465eff7de..52f844dfffe 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -24,8 +24,6 @@ import gnu.trove.THashSet import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.DirtyFilesHolder -import org.jetbrains.jps.builders.impl.BuildTargetRegistryImpl -import org.jetbrains.jps.builders.impl.TargetOutputIndexImpl import org.jetbrains.jps.builders.java.JavaBuilderUtil import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor import org.jetbrains.jps.incremental.* @@ -59,6 +57,7 @@ import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.TargetId +import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.utils.LibraryUtils @@ -687,12 +686,12 @@ private fun processChanges( compiledFiles: Set, allCompiledFiles: MutableSet, dataManager: BuildDataManager, - caches: List, + caches: Collection, compilationResult: CompilationResult, fsOperations: FSOperationsHelper ) { if (IncrementalCompilation.isExperimental()) { - compilationResult.doProcessChangesUsingLookups(compiledFiles, dataManager, fsOperations) + doProcessChangesUsingLookups(compilationResult.changes.asIterable(), compiledFiles, dataManager, fsOperations, caches) } else { compilationResult.doProcessChanges(compiledFiles, allCompiledFiles, caches, fsOperations) @@ -728,33 +727,72 @@ private fun CompilationResult.doProcessChanges( } } -private fun CompilationResult.doProcessChangesUsingLookups( +private fun doProcessChangesUsingLookups( + changes: Iterable, compiledFiles: Set, dataManager: BuildDataManager, - fsOperations: FSOperationsHelper + fsOperations: FSOperationsHelper, + caches: Collection ) { + val dirtyLookupSymbols = HashSet() val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) KotlinBuilder.LOG.debug("Start processing changes") - // TODO group by fqName? - for (change in changes) { - KotlinBuilder.LOG.debug("Process $change") - - if (change !is ChangeInfo.MembersChanged) continue - - val files = change.names.asSequence() - .flatMap { lookupStorage.get(LookupSymbol(it, change.fqName.asString())).asSequence() } - .map(::File) - - fsOperations.markFiles(files.asIterable(), excludeFiles = compiledFiles) + val changedSignatureFqNames = changes.filterIsInstance().map { it.fqName } + for (classFqName in getSubtypesOf(changedSignatureFqNames, caches)) { + val scope = classFqName.parent().asString() + val name = classFqName.shortName().identifier + dirtyLookupSymbols.add(LookupSymbol(name, scope)) } + for (change in changes.filterIsInstance()) { + val scopes = getSubtypesOf(listOf(change.fqName), caches).map { it.asString() } + + for (name in change.names) { + for (scope in scopes) { + dirtyLookupSymbols.add(LookupSymbol(name, scope)) + } + } + } + + val dirtyFiles = HashSet() + + for (lookup in dirtyLookupSymbols) { + val affectedFiles = lookupStorage.get(lookup).map(::File) + + KotlinBuilder.LOG.debug { "${lookup.scope}#${lookup.name} caused recompilation of: $affectedFiles" } + + dirtyFiles.addAll(affectedFiles) + } + + fsOperations.markFiles(dirtyFiles.asIterable(), excludeFiles = compiledFiles) KotlinBuilder.LOG.debug("End of processing changes") } -private val Iterable>.moduleTargets: Iterable - get() = filterIsInstance(ModuleBuildTarget::class.java) +/** + * Gets subtypes of given types inclusively + */ +private fun getSubtypesOf( + typeFqNames: Iterable, + caches: Collection +): Set { + val types = typeFqNames.toCollection(LinkedList()) + val subtypes = hashSetOf() + + while (types.isNotEmpty()) { + val unprocessedType = types.pollFirst() + + caches.asSequence() + .flatMap { it.getSubtypesOf(unprocessedType) } + .filter { it !in subtypes } + .forEach { types.addLast(it) } + + subtypes.add(unprocessedType) + } + + return subtypes +} private fun getLookupTracker(project: JpsProject): LookupTracker { var lookupTracker = LookupTracker.DO_NOTHING @@ -855,3 +893,9 @@ class GeneratedJvmClass ( "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations" } } + +private inline fun Logger.debug(message: ()->String) { + if (isDebugEnabled) { + debug(message()) + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 37ae9427f03..df11900c657 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -105,8 +105,8 @@ class IncrementalCacheImpl( private val dependents = arrayListOf() private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } - private val dependentsWithThis: Iterable - get() = dependents + this + private val dependentsWithThis: Sequence + get() = sequenceOf(this).plus(dependents.asSequence()) override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { inlinedTo.add(fromPath, jvmSignature, toPath) @@ -142,6 +142,9 @@ class IncrementalCacheImpl( return result.map { File(it) } } + fun getSubtypesOf(className: FqName): Sequence = + dependentsWithThis.flatMap { it.subtypesMap[className].asSequence() } + fun cleanDirtyInlineFunctions() { dirtyInlineFunctionsMap.clean() } @@ -600,9 +603,14 @@ class IncrementalCacheImpl( val supertypes = classData.classProto.supertypes(TypeTable(classData.classProto.typeTable)) val parents = supertypes.map { classData.nameResolver.getClassId(it.className).asSingleFqName() } .filter { it.asString() != "kotlin.Any" } + .toSet() val child = kotlinClass.classId.asSingleFqName() parents.forEach { subtypesMap.add(it, child) } + + val removedSupertypes = supertypesMap[child].filter { it !in parents } + removedSupertypes.forEach { subtypesMap.removeValues(it, setOf(child)) } + supertypesMap[child] = parents } From fb8513cc648f48c1811c5173fb3d9ccc4de3c4ea Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 17 Dec 2015 21:55:47 +0300 Subject: [PATCH 0729/1557] Get caches for targets transitively for exported dependencies Original commit: a9fb5647b82955b38a352e14df18311bd48d5164 --- .../kotlin/jps/build/KotlinBuilder.kt | 81 ++++++++++++------- 1 file changed, 51 insertions(+), 30 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 52f844dfffe..f618294e8ce 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.diagnostic.Logger import com.intellij.openapi.util.Key import com.intellij.openapi.util.io.FileUtil +import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.MultiMap import gnu.trove.THashSet import org.jetbrains.jps.ModuleChunk @@ -35,6 +36,9 @@ import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.JpsSimpleElement import org.jetbrains.jps.model.ex.JpsElementChildRoleBase +import org.jetbrains.jps.model.java.JpsJavaClasspathKind +import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.kotlin.cli.common.KotlinVersion import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation @@ -255,9 +259,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return OK } - val caches = filesToCompile.keySet().map { incrementalCaches[it]!! } - processChanges(filesToCompile.values().toSet(), allCompiledFiles, dataManager, caches, changesInfo, fsOperations) - caches.forEach { it.cleanDirtyInlineFunctions() } + processChanges(filesToCompile.values().toSet(), allCompiledFiles, dataManager, incrementalCaches.values, changesInfo, fsOperations) + incrementalCaches.values.forEach { it.cleanDirtyInlineFunctions() } return ADDITIONAL_PASS_REQUIRED } @@ -773,6 +776,9 @@ private fun doProcessChangesUsingLookups( /** * Gets subtypes of given types inclusively */ +/* TODO: in case of chunk containing more than one target, + depending targets would be asked about same subtype more than once. + Can be solved by putting all caches in set */ private fun getSubtypesOf( typeFqNames: Iterable, caches: Collection @@ -811,40 +817,55 @@ private fun getLookupTracker(project: JpsProject): LookupTracker { } private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map { + val dependentTargets = getDependentTargets(chunk, context) + val dataManager = context.projectDescriptor.dataManager - val targets = chunk.targets + val chunkCaches = chunk.targets.keysToMap { dataManager.getKotlinCache(it) } + val dependentCaches = dependentTargets.map { dataManager.getKotlinCache(it) } - val buildRegistry = BuildTargetRegistryImpl(context.projectDescriptor.model) - val outputIndex = TargetOutputIndexImpl(targets, context) - - val allTargets = buildRegistry.allTargets.moduleTargets - val allDependencies = allTargets.keysToMap { target -> - target.computeDependencies(buildRegistry, outputIndex).moduleTargets - } - - val dependents = targets.keysToMap { hashSetOf() } - val targetsWithDependents = HashSet(targets) - - for ((target, dependencies) in allDependencies) { - for (dependency in dependencies) { - if (dependency !in targets) continue - - dependents[dependency]!!.add(target) - targetsWithDependents.add(target) + for (chunkCache in chunkCaches.values) { + for (dependentCache in dependentCaches) { + chunkCache.addDependentCache(dependentCache) } } - val caches = targetsWithDependents.keysToMap { dataManager.getKotlinCache(it) } - - for ((target, cache) in caches) { - dependents[target]?.forEach { - cache.addDependentCache(caches[it]!!) - } - } - - return caches + return chunkCaches } +private fun getDependentTargets( + compilingChunk: ModuleChunk, + context: CompileContext +): Set { + val classpathKind = JpsJavaClasspathKind.compile(compilingChunk.targets.any { it.isTests }) + + fun dependsOnCompilingChunk(target: BuildTarget<*>): Boolean { + if (target !is ModuleBuildTarget) return false + + val dependencies = getDependenciesRecursively(target.module, classpathKind) + return ContainerUtil.intersects(dependencies, compilingChunk.modules) + } + + val dependentTargets = HashSet() + val sortedChunks = context.projectDescriptor.buildTargetIndex.getSortedTargetChunks(context).iterator() + + // skip chunks that are compiled before compilingChunk + while (sortedChunks.hasNext()) { + if (sortedChunks.next().targets == compilingChunk.targets) break + } + + // process chunks that compiled after compilingChunk + for (followingChunk in sortedChunks) { + if (followingChunk.targets.none(::dependsOnCompilingChunk)) continue + + dependentTargets.addAll(followingChunk.targets.filterIsInstance()) + } + + return dependentTargets +} + +private fun getDependenciesRecursively(module: JpsModule, kind: JpsJavaClasspathKind): Set = + JpsJavaExtensionService.dependencies(module).includedIn(kind).recursivelyExportedOnly().modules + // TODO: investigate thread safety private val ALL_COMPILED_FILES_KEY = Key.create>("_all_kotlin_compiled_files_") private fun getAllCompiledFilesContainer(context: CompileContext): MutableSet { From 4c7d283b8016ffe0d6e6f535e55f453ee936ec19 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 17 Dec 2015 21:51:12 +0300 Subject: [PATCH 0730/1557] Append to class map should use IOUtil.writeUTF Original commit: 2286268929b941fb50417ed7a987b395d1cdac27 --- .../kotlin/jps/incremental/storage/ClassOneToManyMap.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt index 249a96e8d02..9a840da330f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt @@ -16,6 +16,7 @@ package org.jetbrains.kotlin.jps.incremental.storage +import com.intellij.util.io.IOUtil import org.jetbrains.kotlin.jps.incremental.dumpCollection import org.jetbrains.kotlin.name.FqName import java.io.File @@ -26,7 +27,7 @@ internal open class ClassOneToManyMap( override fun dumpValue(value: Collection): String = value.dumpCollection() fun add(key: FqName, value: FqName) { - storage.append(key.asString()) { out -> out.writeUTF(value.asString()) } + storage.append(key.asString()) { out -> IOUtil.writeUTF(out, value.asString()) } } operator fun get(key: FqName): Collection = From ec8f7b70b85500468ab7cfd6808b2fc3f5486aac Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 17 Dec 2015 22:19:43 +0300 Subject: [PATCH 0731/1557] Do not write inline calls to cache when experimental incremental compilation is enabled Original commit: e2794cfa3f0a5c62f38a4ba44dfab68bb84868b8 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index df11900c657..57454482abc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -109,7 +109,9 @@ class IncrementalCacheImpl( get() = sequenceOf(this).plus(dependents.asSequence()) override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - inlinedTo.add(fromPath, jvmSignature, toPath) + if (!IncrementalCompilation.isExperimental()) { + inlinedTo.add(fromPath, jvmSignature, toPath) + } } fun addDependentCache(cache: IncrementalCacheImpl) { From ff40b098f9a5947d85c3eef7c319d946115b0471 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 17 Dec 2015 21:30:17 +0300 Subject: [PATCH 0732/1557] Add tests for class hierarchy incremental recompilation Original commit: 9190029fcc0e9cad4b9c52a73eb74449e38ed251 --- ...perimentalIncrementalJpsTestGenerated.java | 136 ++++++++++++++++++ ...experimentalIncrementalCompilationTests.kt | 1 - .../annotationListChanged/A.kt | 5 + .../annotationListChanged/A.kt.new.1 | 8 ++ .../annotationListChanged/A.kt.new.2 | 7 + .../annotationListChanged/AChild.kt | 3 + .../annotationListChanged/AGrandChild.kt | 3 + .../annotationListChanged/ATypeParameter.kt | 3 + .../annotationListChanged/build.log | 65 +++++++++ .../annotationListChanged/classLiteral.kt | 5 + .../functionParameter.kt | 5 + .../annotationListChanged/getA.kt | 3 + .../annotationListChanged/importA.kt | 3 + .../importAGrandChild.kt | 3 + .../annotationListChanged/importStar.kt | 7 + .../referencedByFqName.kt | 5 + .../annotationListChanged/returnType.kt | 3 + .../returnTypeImplicit.kt | 3 + .../bridgeGenerated/A.kt | 5 + .../bridgeGenerated/AChild.kt | 3 + .../bridgeGenerated/AChild.kt.new | 5 + .../bridgeGenerated/build.log | 13 ++ .../bridgeGenerated/useAChild.kt | 5 + .../classBecameFinal/A.kt | 5 + .../classBecameFinal/A.kt.new.1 | 5 + .../classBecameFinal/A.kt.new.2 | 5 + .../classBecameFinal/AChild.kt | 3 + .../classBecameFinal/AGrandChild.kt | 3 + .../classBecameFinal/ATypeParameter.kt | 3 + .../classBecameFinal/build.log | 55 +++++++ .../classBecameFinal/classLiteral.kt | 5 + .../classBecameFinal/functionParameter.kt | 5 + .../classBecameFinal/getA.kt | 3 + .../classBecameFinal/importA.kt | 3 + .../classBecameFinal/importAGrandChild.kt | 3 + .../classBecameFinal/importStar.kt | 7 + .../classBecameFinal/referencedByFqName.kt | 5 + .../classBecameFinal/returnType.kt | 3 + .../classBecameFinal/returnTypeImplicit.kt | 3 + .../classBecameInterface/A.kt | 5 + .../classBecameInterface/A.kt.new.1 | 5 + .../classBecameInterface/A.kt.new.2 | 5 + .../classBecameInterface/AChild.kt | 3 + .../classBecameInterface/AGrandChild.kt | 3 + .../classBecameInterface/ATypeParameter.kt | 3 + .../classBecameInterface/build.log | 60 ++++++++ .../classBecameInterface/classLiteral.kt | 5 + .../classBecameInterface/functionParameter.kt | 5 + .../classBecameInterface/getA.kt | 3 + .../classBecameInterface/importA.kt | 3 + .../classBecameInterface/importAGrandChild.kt | 3 + .../classBecameInterface/importStar.kt | 7 + .../referencedByFqName.kt | 5 + .../classBecameInterface/returnType.kt | 3 + .../returnTypeImplicit.kt | 3 + .../classBecamePrivate/A.kt | 5 + .../classBecamePrivate/A.kt.new.1 | 5 + .../classBecamePrivate/A.kt.new.2 | 5 + .../classBecamePrivate/AChild.kt | 3 + .../classBecamePrivate/AGrandChild.kt | 3 + .../classBecamePrivate/ATypeParameter.kt | 3 + .../classBecamePrivate/build.log | 67 +++++++++ .../classBecamePrivate/classLiteral.kt | 5 + .../classBecamePrivate/functionParameter.kt | 5 + .../classBecamePrivate/getA.kt | 3 + .../classBecamePrivate/importA.kt | 3 + .../classBecamePrivate/importAGrandChild.kt | 3 + .../classBecamePrivate/importStar.kt | 7 + .../classBecamePrivate/referencedByFqName.kt | 5 + .../classBecamePrivate/returnType.kt | 3 + .../classBecamePrivate/returnTypeImplicit.kt | 3 + .../constructorVisibilityChanged/A.kt | 3 + .../constructorVisibilityChanged/A.kt.new.1 | 3 + .../constructorVisibilityChanged/A.kt.new.2 | 3 + .../constructorVisibilityChanged/AChild.kt | 3 + .../constructorVisibilityChanged/build.log | 28 ++++ .../constructorVisibilityChanged/createA.kt | 5 + .../createAChild.kt | 5 + .../A.kt | 3 + .../A.kt.new.1 | 3 + .../AChild.kt | 3 + .../AParent.kt.new.1 | 3 + .../B.kt | 5 + .../B.kt.new.1 | 5 + .../build.log | 20 +++ .../importA.kt | 3 + .../importAChild.kt | 3 + .../useB.kt | 7 + .../jvmNameChanged/A.kt | 6 + .../jvmNameChanged/A.kt.new | 6 + .../jvmNameChanged/AChild.kt | 3 + .../jvmNameChanged/build.log | 15 ++ .../jvmNameChanged/useAChild.kt | 5 + .../classHierarchyAffected/methodAdded/A.kt | 3 + .../methodAdded/A.kt.new | 5 + .../methodAdded/AChild.kt | 3 + .../methodAdded/build.log | 13 ++ .../methodAdded/useAChild.kt | 5 + .../methodAdded/utils.kt | 3 + .../methodAnnotationAdded/A.kt | 5 + .../methodAnnotationAdded/A.kt.new | 8 ++ .../methodAnnotationAdded/AChild.kt | 3 + .../methodAnnotationAdded/build.log | 13 ++ .../methodAnnotationAdded/useAChild.kt | 5 + .../methodNullabilityChanged/A.kt | 5 + .../methodNullabilityChanged/A.kt.new.1 | 5 + .../methodNullabilityChanged/A.kt.new.2 | 5 + .../methodNullabilityChanged/AChild.kt | 3 + .../methodNullabilityChanged/build.log | 24 ++++ .../methodNullabilityChanged/useAChild.kt | 5 + .../methodParameterWithDefaultValueAdded/A.kt | 5 + .../A.kt.new | 5 + .../AChild.kt | 3 + .../build.log | 15 ++ .../useAChild.kt | 5 + .../classHierarchyAffected/methodRemoved/A.kt | 5 + .../methodRemoved/A.kt.new | 3 + .../methodRemoved/AChild.kt | 3 + .../methodRemoved/build.log | 16 +++ .../methodRemoved/useAChild.kt | 5 + .../methodRemoved/utils.kt.new | 3 + .../multiModuleCircular/build.log | 49 +++++++ .../multiModuleCircular/dependencies.txt | 5 + .../multiModuleCircular/module1_A.kt | 3 + .../multiModuleCircular/module1_A.kt.new.1 | 3 + .../multiModuleCircular/module1_A.kt.new.2 | 3 + .../multiModuleCircular/module1_D.kt | 3 + .../multiModuleCircular/module2_B.kt | 3 + .../multiModuleCircular/module3_C.kt | 3 + .../multiModuleCircular/module4_E.kt | 3 + .../multiModuleCircular/module5_F.kt | 3 + .../multiModuleExported/build.log | 36 +++++ .../multiModuleExported/dependencies.txt | 4 + .../multiModuleExported/module1_A.kt | 5 + .../multiModuleExported/module1_A.kt.new.1 | 5 + .../multiModuleExported/module1_A.kt.new.2 | 5 + .../multiModuleExported/module2_AChild.kt | 3 + .../module3_AGrandChild.kt | 3 + .../module3_importAGrandChild.kt | 3 + .../module4_importAGrandChild.kt | 3 + .../multiModuleSimple/build.log | 32 +++++ .../multiModuleSimple/dependencies.txt | 3 + .../multiModuleSimple/module1_A.kt | 5 + .../multiModuleSimple/module1_A.kt.new.1 | 5 + .../multiModuleSimple/module1_A.kt.new.2 | 5 + .../multiModuleSimple/module2_AChild.kt | 3 + .../multiModuleSimple/module2_importA.kt | 3 + .../multiModuleSimple/module3_importAChild.kt | 3 + .../propertyNullabilityChanged/A.kt | 5 + .../propertyNullabilityChanged/A.kt.new.1 | 5 + .../propertyNullabilityChanged/A.kt.new.2 | 5 + .../propertyNullabilityChanged/AChild.kt | 3 + .../propertyNullabilityChanged/build.log | 25 ++++ .../propertyNullabilityChanged/useAChild.kt | 5 + .../starProjectionUpperBoundChanged/A.kt | 1 + .../A.kt.new.1 | 1 + .../AStarDeclaration.kt | 3 + .../starProjectionUpperBoundChanged/B.kt | 3 + .../CallGetAStar.kt | 3 + .../starProjectionUpperBoundChanged/build.log | 17 +++ .../getAStar.kt | 1 + .../supertypesListChanged/A.kt | 5 + .../supertypesListChanged/A.kt.new.1 | 5 + .../supertypesListChanged/A.kt.new.2 | 5 + .../supertypesListChanged/AChild.kt | 3 + .../supertypesListChanged/AGrandChild.kt | 3 + .../supertypesListChanged/AParent.kt.new.1 | 3 + .../supertypesListChanged/ATypeParameter.kt | 3 + .../supertypesListChanged/build.log | 67 +++++++++ .../supertypesListChanged/classLiteral.kt | 5 + .../functionParameter.kt | 5 + .../supertypesListChanged/getA.kt | 3 + .../supertypesListChanged/importA.kt | 3 + .../importAGrandChild.kt | 3 + .../supertypesListChanged/importStar.kt | 7 + .../referencedByFqName.kt | 5 + .../supertypesListChanged/returnType.kt | 3 + .../returnTypeImplicit.kt | 3 + .../typeParameterListChanged/A.kt | 5 + .../typeParameterListChanged/A.kt.new.1 | 5 + .../typeParameterListChanged/A.kt.new.2 | 5 + .../typeParameterListChanged/AChild.kt | 3 + .../typeParameterListChanged/AGrandChild.kt | 3 + .../ATypeParameter.kt | 3 + .../typeParameterListChanged/build.log | 64 +++++++++ .../typeParameterListChanged/classLiteral.kt | 5 + .../functionParameter.kt | 5 + .../typeParameterListChanged/getA.kt | 3 + .../typeParameterListChanged/importA.kt | 3 + .../importAGrandChild.kt | 3 + .../typeParameterListChanged/importStar.kt | 7 + .../referencedByFqName.kt | 5 + .../typeParameterListChanged/returnType.kt | 3 + .../returnTypeImplicit.kt | 3 + .../varianceChanged/A.kt | 1 + .../varianceChanged/A.kt.new.1 | 1 + .../varianceChanged/B.kt | 1 + .../varianceChanged/C.kt | 1 + .../varianceChanged/D.kt | 8 ++ .../varianceChanged/build.log | 51 +++++++ .../varianceChanged/useA.kt | 5 + .../varianceChanged/useA.kt.new.2 | 5 + .../varianceChanged/useD.kt | 3 + .../varianceChanged/useD.kt.new.3 | 3 + .../experimental-expected-kotlin-caches.txt | 3 +- 205 files changed, 1601 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index ccaf4667333..53e2b965f60 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1030,4 +1030,140 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta } } + + @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ClassHierarchyAffected extends AbstractExperimentalIncrementalJpsTest { + public void testAllFilesPresentInClassHierarchyAffected() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("annotationListChanged") + public void testAnnotationListChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/"); + doTest(fileName); + } + + @TestMetadata("bridgeGenerated") + public void testBridgeGenerated() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/"); + doTest(fileName); + } + + @TestMetadata("classBecameFinal") + public void testClassBecameFinal() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/"); + doTest(fileName); + } + + @TestMetadata("classBecameInterface") + public void testClassBecameInterface() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/"); + doTest(fileName); + } + + @TestMetadata("classBecamePrivate") + public void testClassBecamePrivate() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/"); + doTest(fileName); + } + + @TestMetadata("constructorVisibilityChanged") + public void testConstructorVisibilityChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/"); + doTest(fileName); + } + + @TestMetadata("flagsAndMemberInDifferentClassesChanged") + public void testFlagsAndMemberInDifferentClassesChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/"); + doTest(fileName); + } + + @TestMetadata("jvmNameChanged") + public void testJvmNameChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/"); + doTest(fileName); + } + + @TestMetadata("methodAdded") + public void testMethodAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/"); + doTest(fileName); + } + + @TestMetadata("methodAnnotationAdded") + public void testMethodAnnotationAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/"); + doTest(fileName); + } + + @TestMetadata("methodNullabilityChanged") + public void testMethodNullabilityChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/"); + doTest(fileName); + } + + @TestMetadata("methodParameterWithDefaultValueAdded") + public void testMethodParameterWithDefaultValueAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/"); + doTest(fileName); + } + + @TestMetadata("methodRemoved") + public void testMethodRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/"); + doTest(fileName); + } + + @TestMetadata("multiModuleCircular") + public void testMultiModuleCircular() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/"); + doTest(fileName); + } + + @TestMetadata("multiModuleExported") + public void testMultiModuleExported() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/"); + doTest(fileName); + } + + @TestMetadata("multiModuleSimple") + public void testMultiModuleSimple() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/"); + doTest(fileName); + } + + @TestMetadata("propertyNullabilityChanged") + public void testPropertyNullabilityChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/"); + doTest(fileName); + } + + @TestMetadata("starProjectionUpperBoundChanged") + public void testStarProjectionUpperBoundChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/"); + doTest(fileName); + } + + @TestMetadata("supertypesListChanged") + public void testSupertypesListChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/"); + doTest(fileName); + } + + @TestMetadata("typeParameterListChanged") + public void testTypeParameterListChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/"); + doTest(fileName); + } + + @TestMetadata("varianceChanged") + public void testVarianceChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/"); + doTest(fileName); + } + + } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 7959a7025df..66ec7f7d1b2 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -17,7 +17,6 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() { diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 new file mode 100644 index 00000000000..9c7d9dc40fa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.1 @@ -0,0 +1,8 @@ +package foo + +annotation class Ann + +@Ann +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 new file mode 100644 index 00000000000..b349e8e377a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/A.kt.new.2 @@ -0,0 +1,7 @@ +package foo + +annotation class Ann + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log new file mode 100644 index 00000000000..6661481845f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log @@ -0,0 +1,65 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +out/production/module/foo/ATypeParameter.class +out/production/module/foo/ClassLiteralKt.class +out/production/module/foo/FunctionParameterKt.class +out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files + + +Cleaning output files: +out/production/module/foo/A.class +out/production/module/foo/Ann.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +out/production/module/foo/ATypeParameter.class +out/production/module/foo/ClassLiteralKt.class +out/production/module/foo/FunctionParameterKt.class +out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt new file mode 100644 index 00000000000..02bb019e8a2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f(x: T) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt new file mode 100644 index 00000000000..a466bbf9c19 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new new file mode 100644 index 00000000000..04773fe5c7a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/AChild.kt.new @@ -0,0 +1,5 @@ +package foo + +class AChild : A() { + override fun f(x: Int) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log new file mode 100644 index 00000000000..48f4127779c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/foo/AChild.class +End of files +Compiling files: +src/AChild.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt new file mode 100644 index 00000000000..32b132335bf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f(0) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 new file mode 100644 index 00000000000..49a0e61be12 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log new file mode 100644 index 00000000000..25fd00fe12e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log @@ -0,0 +1,55 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +out/production/module/foo/ATypeParameter.class +out/production/module/foo/ClassLiteralKt.class +out/production/module/foo/FunctionParameterKt.class +out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class +out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files +COMPILATION FAILED +This type is final, so it cannot be inherited from + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 new file mode 100644 index 00000000000..67301a99f6b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +interface A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log new file mode 100644 index 00000000000..7fef745d9de --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log @@ -0,0 +1,60 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +out/production/module/foo/ATypeParameter.class +out/production/module/foo/ClassLiteralKt.class +out/production/module/foo/FunctionParameterKt.class +out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class +out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files +COMPILATION FAILED +This class does not have a constructor +Unresolved reference: A +Unresolved reference: A +Unresolved reference: A +Unresolved reference: A + + +Cleaning output files: +out/production/module/foo/A$DefaultImpls.class +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 new file mode 100644 index 00000000000..dace6cffce4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +private open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log new file mode 100644 index 00000000000..0cd42f84f75 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -0,0 +1,67 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +out/production/module/foo/ATypeParameter.class +out/production/module/foo/ClassLiteralKt.class +out/production/module/foo/FunctionParameterKt.class +out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files +COMPILATION FAILED +Cannot access 'A': it is 'private' in file +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' +Generic effective visibility 'public' should be the same or less permissive than its type parameter bound effective visibility 'private' +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file +Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'private' +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file +Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file +Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 new file mode 100644 index 00000000000..bc98fc87051 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A private constructor () \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/A.kt.new.2 @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log new file mode 100644 index 00000000000..7bd1b019759 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log @@ -0,0 +1,28 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class +out/production/module/foo/CreateAKt.class +End of files +Compiling files: +src/AChild.kt +src/createA.kt +End of files +COMPILATION FAILED +Cannot access '': it is 'private' in 'A' +Cannot access '': it is 'private' in 'A' + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/createA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt new file mode 100644 index 00000000000..bb948def8b9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createA.kt @@ -0,0 +1,5 @@ +package foo + +fun createA() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt new file mode 100644 index 00000000000..8166e17bf2e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/createAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun createAChild() { + AChild() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 new file mode 100644 index 00000000000..95cd862ae9c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A : AParent() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 new file mode 100644 index 00000000000..43ad3744b5d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/AParent.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class AParent \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt new file mode 100644 index 00000000000..ae6bae15cbf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt @@ -0,0 +1,5 @@ +package foo + +class B { + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 new file mode 100644 index 00000000000..c6d25347c65 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/B.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +class B { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log new file mode 100644 index 00000000000..0fab1b73d54 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log @@ -0,0 +1,20 @@ +Cleaning output files: +out/production/module/foo/A.class +out/production/module/foo/B.class +End of files +Compiling files: +src/A.kt +src/AParent.kt +src/B.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/UseBKt.class +out/production/module/foo/AChild.class +End of files +Compiling files: +src/AChild.kt +src/importA.kt +src/importAChild.kt +src/useB.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt new file mode 100644 index 00000000000..aef89fb3058 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/importAChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt new file mode 100644 index 00000000000..e8361dacb48 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/useB.kt @@ -0,0 +1,7 @@ +package bar + +import foo.B + +fun useB() { + B().f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt new file mode 100644 index 00000000000..33a577d56a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt @@ -0,0 +1,6 @@ +package foo + +open class A { + @JvmName("g") + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new new file mode 100644 index 00000000000..5c9fa2560e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/A.kt.new @@ -0,0 +1,6 @@ +package foo + +open class A { + @JvmName("h") + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log new file mode 100644 index 00000000000..ba820f85000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/AChild.kt +src/useAChild.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new new file mode 100644 index 00000000000..6a5b7815115 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/A.kt.new @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log new file mode 100644 index 00000000000..270e4f5daa5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt new file mode 100644 index 00000000000..0905e579ffc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/utils.kt @@ -0,0 +1,3 @@ +package foo + +fun AChild.f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt new file mode 100644 index 00000000000..6a5b7815115 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new new file mode 100644 index 00000000000..7a264385242 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/A.kt.new @@ -0,0 +1,8 @@ +package foo + +annotation class Ann + +open class A { + @Ann + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log new file mode 100644 index 00000000000..270e4f5daa5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log @@ -0,0 +1,13 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt new file mode 100644 index 00000000000..8be756fcb12 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f(x: Any?) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 new file mode 100644 index 00000000000..1d9db70d68e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f(x: Any) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 new file mode 100644 index 00000000000..8be756fcb12 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f(x: Any?) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log new file mode 100644 index 00000000000..a6e893da45d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log @@ -0,0 +1,24 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files +COMPILATION FAILED +Null can not be a value of a non-null type kotlin.Any + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt new file mode 100644 index 00000000000..ae703b51dcb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f(null) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt new file mode 100644 index 00000000000..6a5b7815115 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new new file mode 100644 index 00000000000..12f731963ee --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/A.kt.new @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f(x: Int = 0) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log new file mode 100644 index 00000000000..b450c2880fc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/AChild.kt +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt new file mode 100644 index 00000000000..6a5b7815115 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/A.kt.new @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log new file mode 100644 index 00000000000..2dc893eb74c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/utils.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/AChild.kt +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt new file mode 100644 index 00000000000..147d93fcd86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new new file mode 100644 index 00000000000..0905e579ffc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/utils.kt.new @@ -0,0 +1,3 @@ +package foo + +fun AChild.f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log new file mode 100644 index 00000000000..9272eb1ea31 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -0,0 +1,49 @@ +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module1/foo/D.class +out/production/module2/foo/B.class +out/production/module3/foo/C.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files +Compiling files: +module3/src/module3_C.kt +End of files +Compiling files: +module1/src/module1_D.kt +End of files +COMPILATION FAILED +This type is final, so it cannot be inherited from + + +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module2/src/module2_B.kt +End of files +Compiling files: +module3/src/module3_C.kt +End of files +Compiling files: +module1/src/module1_A.kt +module1/src/module1_D.kt +End of files +Cleaning output files: +out/production/module4/foo/E.class +End of files +Compiling files: +module4/src/module4_E.kt +End of files +Cleaning output files: +out/production/module5/foo/F.class +End of files +Compiling files: +module5/src/module5_F.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt new file mode 100644 index 00000000000..4135ff7c289 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/dependencies.txt @@ -0,0 +1,5 @@ +module1->module3 +module2->module1[exported] +module3->module2[exported] +module4->module2 +module5->module3 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 new file mode 100644 index 00000000000..16d999e4a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 new file mode 100644 index 00000000000..6d80703e7b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_A.kt.new.2 @@ -0,0 +1,3 @@ +package foo + +open class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt new file mode 100644 index 00000000000..221afec4644 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module1_D.kt @@ -0,0 +1,3 @@ +package foo + +class D : C() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt new file mode 100644 index 00000000000..cf9f6d41c33 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module2_B.kt @@ -0,0 +1,3 @@ +package foo + +open class B : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt new file mode 100644 index 00000000000..cf93d3da790 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module3_C.kt @@ -0,0 +1,3 @@ +package foo + +open class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt new file mode 100644 index 00000000000..3e9a3199d85 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module4_E.kt @@ -0,0 +1,3 @@ +package foo + +open class E : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt new file mode 100644 index 00000000000..e32d45f0ea6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/module5_F.kt @@ -0,0 +1,3 @@ +package foo + +open class F : C() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log new file mode 100644 index 00000000000..cdaee454b33 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -0,0 +1,36 @@ +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/foo/AChild.class +End of files +Compiling files: +module2/src/module2_AChild.kt +End of files +COMPILATION FAILED +Cannot access 'A': it is 'private' in file +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' + + +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Compiling files: +module2/src/module2_AChild.kt +End of files +Cleaning output files: +out/production/module3/foo/AGrandChild.class +End of files +Compiling files: +module3/src/module3_AGrandChild.kt +module3/src/module3_importAGrandChild.kt +End of files +Compiling files: +module4/src/module4_importAGrandChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt new file mode 100644 index 00000000000..c202ba91e3f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/dependencies.txt @@ -0,0 +1,4 @@ +module1-> +module2->module1[exported] +module3->module2 +module4->module3 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 new file mode 100644 index 00000000000..dace6cffce4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +private open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module1_A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module2_AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module3_importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/module4_importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log new file mode 100644 index 00000000000..1e03d4107d3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -0,0 +1,32 @@ +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Cleaning output files: +out/production/module2/foo/AChild.class +End of files +Compiling files: +module2/src/module2_AChild.kt +module2/src/module2_importA.kt +End of files +COMPILATION FAILED +Cannot access 'A': it is 'private' in file +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' +Cannot access 'A': it is 'private' in file + + +Cleaning output files: +out/production/module1/foo/A.class +End of files +Compiling files: +module1/src/module1_A.kt +End of files +Compiling files: +module2/src/module2_AChild.kt +module2/src/module2_importA.kt +End of files +Compiling files: +module3/src/module3_importAChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt new file mode 100644 index 00000000000..07917d6cffb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/dependencies.txt @@ -0,0 +1,3 @@ +module1-> +module2->module1 +module3->module2 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 new file mode 100644 index 00000000000..dace6cffce4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +private open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module1_A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module2_importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt new file mode 100644 index 00000000000..aef89fb3058 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/module3_importAChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt new file mode 100644 index 00000000000..83aff659f75 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + val x: Any = object {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 new file mode 100644 index 00000000000..a7ed7853d1b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A { + val x: Any? = null +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 new file mode 100644 index 00000000000..83aff659f75 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + val x: Any = object {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt new file mode 100644 index 00000000000..154d37341dd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log new file mode 100644 index 00000000000..e91a715b155 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log @@ -0,0 +1,25 @@ +Cleaning output files: +out/production/module/foo/A$x$1.class +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/foo/UseAChildKt.class +End of files +Compiling files: +src/useAChild.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/useAChild.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt new file mode 100644 index 00000000000..d654c8a23a2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/useAChild.kt @@ -0,0 +1,5 @@ +package foo + +fun useAChild(a: AChild) { + val o: Any = a.x +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt new file mode 100644 index 00000000000..9470d404129 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt @@ -0,0 +1 @@ +class A(x: T) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 new file mode 100644 index 00000000000..49eef2dab8c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/A.kt.new.1 @@ -0,0 +1 @@ +class A(x: T) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt new file mode 100644 index 00000000000..5f5db292873 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/AStarDeclaration.kt @@ -0,0 +1,3 @@ +abstract class AStarDeclaration { + abstract val a: A<*> +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt new file mode 100644 index 00000000000..292ad03ac71 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/B.kt @@ -0,0 +1,3 @@ +open class B { + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt new file mode 100644 index 00000000000..258300503e1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/CallGetAStar.kt @@ -0,0 +1,3 @@ +class CallGetAStar { + val a = getAStar() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log new file mode 100644 index 00000000000..d6cbadde7c4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/AStarDeclaration.class +out/production/module/CallGetAStar.class +out/production/module/GetAStarKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/AStarDeclaration.kt +src/CallGetAStar.kt +src/getAStar.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt new file mode 100644 index 00000000000..9ad7870fce3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/getAStar.kt @@ -0,0 +1 @@ +fun getAStar(): A<*> = A(B()) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 new file mode 100644 index 00000000000..4bd0a1f0e86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A : AParent() { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 new file mode 100644 index 00000000000..43ad3744b5d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/AParent.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class AParent \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log new file mode 100644 index 00000000000..04492816e9b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log @@ -0,0 +1,67 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AParent.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +out/production/module/foo/ATypeParameter.class +out/production/module/foo/ClassLiteralKt.class +out/production/module/foo/FunctionParameterKt.class +out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +End of files + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +out/production/module/foo/ATypeParameter.class +out/production/module/foo/ClassLiteralKt.class +out/production/module/foo/FunctionParameterKt.class +out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class +out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 new file mode 100644 index 00000000000..9e6f6eb3a49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 new file mode 100644 index 00000000000..92b9a921ee9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + open fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt new file mode 100644 index 00000000000..36bab590318 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AChild : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt new file mode 100644 index 00000000000..c2b0af75dba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/AGrandChild.kt @@ -0,0 +1,3 @@ +package foo + +open class AGrandChild : AChild() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt new file mode 100644 index 00000000000..67b2be3d949 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/ATypeParameter.kt @@ -0,0 +1,3 @@ +package foo + +class ATypeParameter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log new file mode 100644 index 00000000000..8f18e60ad0a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log @@ -0,0 +1,64 @@ +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/bar/ImportStarKt.class +out/production/module/bar/ReferencedByFqNameKt.class +out/production/module/foo/AChild.class +out/production/module/foo/AGrandChild.class +out/production/module/foo/ATypeParameter.class +out/production/module/foo/ClassLiteralKt.class +out/production/module/foo/FunctionParameterKt.class +out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class +out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files +COMPILATION FAILED +Type argument expected +Type argument expected +Type argument expected +Type inference failed: Not enough information to infer parameter T in constructor A() +Please specify it explicitly. +Type inference failed: Not enough information to infer parameter T in constructor A() +Please specify it explicitly. +Type inference failed: Not enough information to infer parameter T in constructor A() +Please specify it explicitly. +Type argument expected + + +Cleaning output files: +out/production/module/foo/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/AGrandChild.kt +src/ATypeParameter.kt +src/classLiteral.kt +src/functionParameter.kt +src/getA.kt +src/importA.kt +src/importAGrandChild.kt +src/importStar.kt +src/referencedByFqName.kt +src/returnType.kt +src/returnTypeImplicit.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt new file mode 100644 index 00000000000..ec9cc9c2beb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/classLiteral.kt @@ -0,0 +1,5 @@ +package foo + +fun classLiteral() { + A::class +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt new file mode 100644 index 00000000000..ed3a67db2ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/functionParameter.kt @@ -0,0 +1,5 @@ +package foo + +fun useA(a: A) { + a.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt new file mode 100644 index 00000000000..5f14d1cf38e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/getA.kt @@ -0,0 +1,3 @@ +package foo + +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt new file mode 100644 index 00000000000..0e3a07f7226 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importA.kt @@ -0,0 +1,3 @@ +package bar + +import foo.A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt new file mode 100644 index 00000000000..4505ddef000 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importAGrandChild.kt @@ -0,0 +1,3 @@ +package bar + +import foo.AGrandChild \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt new file mode 100644 index 00000000000..4c3c8d8c6a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/importStar.kt @@ -0,0 +1,7 @@ +package bar + +import foo.* + +fun importStarUse() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt new file mode 100644 index 00000000000..3b5d22bb91f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/referencedByFqName.kt @@ -0,0 +1,5 @@ +package bar + +fun createAByFqName() { + foo.A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt new file mode 100644 index 00000000000..309f279e048 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnType.kt @@ -0,0 +1,3 @@ +package foo + +fun getAExplicit(): A = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt new file mode 100644 index 00000000000..e3265ea4a73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/returnTypeImplicit.kt @@ -0,0 +1,3 @@ +package foo + +fun getAImplicit() = getA() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt new file mode 100644 index 00000000000..d1126ea0670 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt @@ -0,0 +1 @@ +class A(x: T) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 new file mode 100644 index 00000000000..2029e4e0fca --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/A.kt.new.1 @@ -0,0 +1 @@ +class A(x: T) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt new file mode 100644 index 00000000000..1fae5b2eac0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/B.kt @@ -0,0 +1 @@ +open class B \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt new file mode 100644 index 00000000000..a87fb91287a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/C.kt @@ -0,0 +1 @@ +class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt new file mode 100644 index 00000000000..6bd33000495 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/D.kt @@ -0,0 +1,8 @@ +class D(x: T) { + companion object { + val b = D(B()) + val c = D(C()) + } + + var a = A(x) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log new file mode 100644 index 00000000000..01a4c3b1191 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log @@ -0,0 +1,51 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/D$Companion.class +out/production/module/D.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseAKt.class +End of files +Compiling files: +src/D.kt +src/useA.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is A but A was expected + + +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/D.kt +src/useA.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UseDKt.class +End of files +Compiling files: +src/useD.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is A but A was expected + + +Cleaning output files: +out/production/module/A.class +out/production/module/D$Companion.class +out/production/module/D.class +out/production/module/UseAKt.class +End of files +Compiling files: +src/A.kt +src/D.kt +src/useA.kt +src/useD.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt new file mode 100644 index 00000000000..a2c8197452b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt @@ -0,0 +1,5 @@ +fun useA() { + var b: A = A(B()) + var c: A = A(C()) + c = b +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 new file mode 100644 index 00000000000..c132cb6b9ed --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useA.kt.new.2 @@ -0,0 +1,5 @@ +fun useA() { + var b: A = A(B()) + var c: A = A(C()) + b = c +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt new file mode 100644 index 00000000000..074bef1752a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt @@ -0,0 +1,3 @@ +fun useD() { + D.c.a = D.b.a +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 new file mode 100644 index 00000000000..a95a229da86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 @@ -0,0 +1,3 @@ +fun useD() { + D.b.a = D.c.a +} diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt index 62d125bf7f4..36458852656 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt @@ -8,8 +8,7 @@ Module 'module' production experimental-format-version.txt format-version.txt inline-functions.tab - inlined-to.tab package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module' tests \ No newline at end of file From 30b161d28a3d4d8b6e60575e4fb9ffa500ca14e8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 21 Dec 2015 14:45:41 +0300 Subject: [PATCH 0733/1557] Minor: rename getSubtypeOf->withSubtypes Original commit: d36810ab4256d1520a67ab9a72b99f353c2b32ed --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index f618294e8ce..9915bc9a566 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -743,14 +743,14 @@ private fun doProcessChangesUsingLookups( KotlinBuilder.LOG.debug("Start processing changes") val changedSignatureFqNames = changes.filterIsInstance().map { it.fqName } - for (classFqName in getSubtypesOf(changedSignatureFqNames, caches)) { + for (classFqName in withSubtypes(changedSignatureFqNames, caches)) { val scope = classFqName.parent().asString() val name = classFqName.shortName().identifier dirtyLookupSymbols.add(LookupSymbol(name, scope)) } for (change in changes.filterIsInstance()) { - val scopes = getSubtypesOf(listOf(change.fqName), caches).map { it.asString() } + val scopes = withSubtypes(listOf(change.fqName), caches).map { it.asString() } for (name in change.names) { for (scope in scopes) { @@ -779,7 +779,7 @@ private fun doProcessChangesUsingLookups( /* TODO: in case of chunk containing more than one target, depending targets would be asked about same subtype more than once. Can be solved by putting all caches in set */ -private fun getSubtypesOf( +private fun withSubtypes( typeFqNames: Iterable, caches: Collection ): Set { From 58eca3b423740113d137dd16d3ec42b7f4348baf Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 21 Dec 2015 16:24:51 +0300 Subject: [PATCH 0734/1557] Use one loop for changes processing Original commit: f20b39d02ec0cad207cf5ca6c6e6b37394d00986 --- .../kotlin/jps/build/KotlinBuilder.kt | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 9915bc9a566..53d7e35b75c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -742,18 +742,18 @@ private fun doProcessChangesUsingLookups( KotlinBuilder.LOG.debug("Start processing changes") - val changedSignatureFqNames = changes.filterIsInstance().map { it.fqName } - for (classFqName in withSubtypes(changedSignatureFqNames, caches)) { - val scope = classFqName.parent().asString() - val name = classFqName.shortName().identifier - dirtyLookupSymbols.add(LookupSymbol(name, scope)) - } + for (change in changes) { + if (change is ChangeInfo.SignatureChanged) { + for (classFqName in withSubtypes(change.fqName, caches)) { + val scope = classFqName.parent().asString() + val name = classFqName.shortName().identifier + dirtyLookupSymbols.add(LookupSymbol(name, scope)) + } + } + else if (change is ChangeInfo.MembersChanged) { + val scopes = withSubtypes(change.fqName, caches).map { it.asString() } - for (change in changes.filterIsInstance()) { - val scopes = withSubtypes(listOf(change.fqName), caches).map { it.asString() } - - for (name in change.names) { - for (scope in scopes) { + change.names.forAllPairs(scopes) { name, scope -> dirtyLookupSymbols.add(LookupSymbol(name, scope)) } } @@ -774,16 +774,22 @@ private fun doProcessChangesUsingLookups( } /** - * Gets subtypes of given types inclusively + * Returns type with its subtypes transitively + * + * For example: + * open class A + * open class B : A() + * class C : B() + * withSubtypes(A) will return [A, B, C] */ /* TODO: in case of chunk containing more than one target, depending targets would be asked about same subtype more than once. Can be solved by putting all caches in set */ private fun withSubtypes( - typeFqNames: Iterable, + typeFqName: FqName, caches: Collection ): Set { - val types = typeFqNames.toCollection(LinkedList()) + val types = linkedListOf(typeFqName) val subtypes = hashSetOf() while (types.isNotEmpty()) { @@ -915,6 +921,14 @@ class GeneratedJvmClass ( } } +private inline fun Iterable.forAllPairs(other: Iterable, fn: (T, R)->Unit) { + for (t in this) { + for (r in other) { + fn(t, r) + } + } +} + private inline fun Logger.debug(message: ()->String) { if (isDebugEnabled) { debug(message()) From c64424af6b5ace13b8fbd35405643058a3e6d7fc Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 21 Dec 2015 16:29:39 +0300 Subject: [PATCH 0735/1557] Make doProcessChangesUsingLookups extension again Original commit: f137910e63c972cf3443450be0cf88ad2e41803c --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 53d7e35b75c..b9664796c11 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -694,7 +694,7 @@ private fun processChanges( fsOperations: FSOperationsHelper ) { if (IncrementalCompilation.isExperimental()) { - doProcessChangesUsingLookups(compilationResult.changes.asIterable(), compiledFiles, dataManager, fsOperations, caches) + compilationResult.doProcessChangesUsingLookups(compiledFiles, dataManager, fsOperations, caches) } else { compilationResult.doProcessChanges(compiledFiles, allCompiledFiles, caches, fsOperations) @@ -730,8 +730,7 @@ private fun CompilationResult.doProcessChanges( } } -private fun doProcessChangesUsingLookups( - changes: Iterable, +private fun CompilationResult.doProcessChangesUsingLookups( compiledFiles: Set, dataManager: BuildDataManager, fsOperations: FSOperationsHelper, From a2444395ab1386a5d5d14df6950cda31e52b61ce Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 21 Dec 2015 16:40:20 +0300 Subject: [PATCH 0736/1557] Append in a more safe way Original commit: 756c78bfcc6c06d162f3e683a9e15f8f3fecc7cc --- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 7 ++----- .../jps/incremental/storage/ClassOneToManyMap.kt | 3 +-- .../kotlin/jps/incremental/storage/LazyStorage.kt | 13 +++++++++++-- .../kotlin/jps/incremental/storage/LookupMap.kt | 2 +- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 57454482abc..c52d434dd13 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -21,7 +21,6 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName import com.intellij.util.io.BooleanDataDescriptor import com.intellij.util.io.EnumeratorStringDescriptor -import com.intellij.util.io.IOUtil import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.storage.BuildDataPaths @@ -581,7 +580,7 @@ class IncrementalCacheImpl( } fun add(sourceFile: File, className: JvmClassName) { - storage.append(sourceFile.absolutePath, { out -> IOUtil.writeUTF(out, className.internalName) }) + storage.append(sourceFile.absolutePath, className.internalName) } operator fun get(sourceFile: File): Collection = @@ -684,9 +683,7 @@ class IncrementalCacheImpl( private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val key = PathFunctionPair(sourcePath, jvmSignature) - storage.append(key) { out -> - IOUtil.writeUTF(out, targetPath) - } + storage.append(key, targetPath) } operator fun get(sourcePath: String, jvmSignature: String): Collection { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt index 9a840da330f..b04477bf682 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.jps.incremental.storage -import com.intellij.util.io.IOUtil import org.jetbrains.kotlin.jps.incremental.dumpCollection import org.jetbrains.kotlin.name.FqName import java.io.File @@ -27,7 +26,7 @@ internal open class ClassOneToManyMap( override fun dumpValue(value: Collection): String = value.dumpCollection() fun add(key: FqName, value: FqName) { - storage.append(key.asString()) { out -> IOUtil.writeUTF(out, value.asString()) } + storage.append(key.asString(), value.asString()) } operator fun get(key: FqName): Collection = diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt index 007e8d0db17..0a5690c8c41 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jps.incremental.storage import com.intellij.util.io.DataExternalizer +import com.intellij.util.io.IOUtil import com.intellij.util.io.KeyDescriptor import com.intellij.util.io.PersistentHashMap import java.io.DataOutput @@ -73,8 +74,12 @@ internal class LazyStorage( getStorageIfExists()?.remove(key) } - fun append(key: K, append: (DataOutput)->Unit) { - getStorageOrCreateNew().appendData(key, append) + fun append(key: K, value: String) { + append(key) { out -> IOUtil.writeUTF(out, value) } + } + + fun append(key: K, value: Int) { + append(key) { out -> out.writeInt(value) } } @Synchronized @@ -110,4 +115,8 @@ internal class LazyStorage( private fun createMap(): PersistentHashMap = PersistentHashMap(storageFile, keyDescriptor, valueExternalizer) + + private fun append(key: K, append: (DataOutput)->Unit) { + getStorageOrCreateNew().appendData(key, append) + } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt index 4b6ccba6d1d..70fe113bf72 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt @@ -24,7 +24,7 @@ internal class LookupMap(storage: File) : BasicMap): String = value.toString() fun add(name: String, scope: String, fileId: Int) { - storage.append(LookupSymbolKey(name, scope)) { out -> out.writeInt(fileId) } + storage.append(LookupSymbolKey(name, scope), fileId) } operator fun get(key: LookupSymbolKey): Collection? = storage[key] From 07a18f275865c38d74514477b7940e2f8e5f5dbe Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 28 Dec 2015 13:22:03 +0300 Subject: [PATCH 0737/1557] Make withSubtypesOf more efficent Original commit: d928ac744eb03ccd8281f4c8f6144b98a2acf3f8 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 9 ++++----- .../kotlin/jps/incremental/IncrementalCacheImpl.kt | 5 ++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b9664796c11..af6363c60b9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -738,19 +738,21 @@ private fun CompilationResult.doProcessChangesUsingLookups( ) { val dirtyLookupSymbols = HashSet() val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) + val allCaches = caches.toHashSet() + allCaches.addAll(caches.flatMap { it.dependentCaches }) KotlinBuilder.LOG.debug("Start processing changes") for (change in changes) { if (change is ChangeInfo.SignatureChanged) { - for (classFqName in withSubtypes(change.fqName, caches)) { + for (classFqName in withSubtypes(change.fqName, allCaches)) { val scope = classFqName.parent().asString() val name = classFqName.shortName().identifier dirtyLookupSymbols.add(LookupSymbol(name, scope)) } } else if (change is ChangeInfo.MembersChanged) { - val scopes = withSubtypes(change.fqName, caches).map { it.asString() } + val scopes = withSubtypes(change.fqName, allCaches).map { it.asString() } change.names.forAllPairs(scopes) { name, scope -> dirtyLookupSymbols.add(LookupSymbol(name, scope)) @@ -781,9 +783,6 @@ private fun CompilationResult.doProcessChangesUsingLookups( * class C : B() * withSubtypes(A) will return [A, B, C] */ -/* TODO: in case of chunk containing more than one target, - depending targets would be asked about same subtype more than once. - Can be solved by putting all caches in set */ private fun withSubtypes( typeFqName: FqName, caches: Collection diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index c52d434dd13..707b21fda68 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -107,6 +107,9 @@ class IncrementalCacheImpl( private val dependentsWithThis: Sequence get() = sequenceOf(this).plus(dependents.asSequence()) + internal val dependentCaches: Iterable + get() = dependents + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { if (!IncrementalCompilation.isExperimental()) { inlinedTo.add(fromPath, jvmSignature, toPath) @@ -144,7 +147,7 @@ class IncrementalCacheImpl( } fun getSubtypesOf(className: FqName): Sequence = - dependentsWithThis.flatMap { it.subtypesMap[className].asSequence() } + subtypesMap[className].asSequence() fun cleanDirtyInlineFunctions() { dirtyInlineFunctionsMap.clean() From 7eb8c94ca8281efc00d09d315bafa31a4e79fccf Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 23 Dec 2015 15:55:46 +0300 Subject: [PATCH 0738/1557] Recompile all class and member usages when flag and member are changed Original commit: e7f8d7103f32fba7c66e9c1d51ae916325a3c19a --- .../jps/incremental/IncrementalCacheImpl.kt | 22 +++---- .../jps/incremental/protoDifferenceUtils.kt | 63 +++++++------------ ...perimentalIncrementalJpsTestGenerated.java | 6 ++ .../AbstractProtoComparisonTest.kt | 22 ++++--- .../ProtoComparisonTestGenerated.java | 6 ++ .../classFlagsAndMembersChanged/new.kt | 5 ++ .../classFlagsAndMembersChanged/old.kt | 3 + .../classFlagsAndMembersChanged/result.out | 2 + .../result.out | 3 +- .../flagsAndMemberInSameClassChanged/A.kt | 3 + .../A.kt.new.1 | 3 + .../A.kt.new.2 | 3 + .../flagsAndMemberInSameClassChanged/B.kt | 1 + .../build.log | 56 +++++++++++++++++ .../flagsAndMemberInSameClassChanged/getA.kt | 1 + .../flagsAndMemberInSameClassChanged/getB.kt | 1 + .../flagsAndMemberInSameClassChanged/useA.kt | 3 + .../useA.kt.new.3 | 3 + .../flagsAndMemberInSameClassChanged/useB.kt | 3 + .../useB.kt.new.3 | 3 + 20 files changed, 153 insertions(+), 59 deletions(-) create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 707b21fda68..ce0c8bb626e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.incremental import com.google.protobuf.MessageLite import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName +import com.intellij.util.SmartList import com.intellij.util.io.BooleanDataDescriptor import com.intellij.util.io.EnumeratorStringDescriptor import gnu.trove.THashSet @@ -371,20 +372,19 @@ class IncrementalCacheImpl( if (oldData == null || !checkChangesIsOpenPart) return CompilationResult(protoChanged = true) - val diff = difference(oldData, data) - - if (!IncrementalCompilation.isExperimental()) return CompilationResult(protoChanged = diff != DifferenceKind.NONE) - + val difference = difference(oldData, data) val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars + val changeList = SmartList() - val changes = - when (diff) { - is DifferenceKind.NONE -> emptySequence() - is DifferenceKind.CLASS_SIGNATURE -> sequenceOf(ChangeInfo.SignatureChanged(fqName)) - is DifferenceKind.MEMBERS -> sequenceOf(ChangeInfo.MembersChanged(fqName, diff.names)) - } + if (difference.isClassSignatureChanged) { + changeList.add(ChangeInfo.SignatureChanged(fqName)) + } - return CompilationResult(protoChanged = diff != DifferenceKind.NONE, changes = changes) + if (difference.changedMembersNames.isNotEmpty()) { + changeList.add(ChangeInfo.MembersChanged(fqName, difference.changedMembersNames)) + } + + return CompilationResult(protoChanged = changeList.isNotEmpty(), changes = changeList.asSequence()) } operator fun contains(className: JvmClassName): Boolean = diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index d92a0c2bc15..b24704e1ebc 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -29,17 +29,21 @@ import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil import org.jetbrains.kotlin.utils.HashSetUtil import java.util.* -sealed class DifferenceKind() { - object NONE: DifferenceKind() - object CLASS_SIGNATURE: DifferenceKind() - class MEMBERS(val names: Collection): DifferenceKind() -} +data class Difference( + val isClassSignatureChanged: Boolean = false, + val changedMembersNames: Set = emptySet() +) -fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): DifferenceKind { - if (oldData.isPackageFacade != newData.isPackageFacade) return DifferenceKind.CLASS_SIGNATURE +fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): Difference { + if (oldData.isPackageFacade != newData.isPackageFacade) return Difference(isClassSignatureChanged = true) val differenceObject = - if (oldData.isPackageFacade) DifferenceCalculatorForPackageFacade(oldData, newData) else DifferenceCalculatorForClass(oldData, newData) + if (oldData.isPackageFacade) { + DifferenceCalculatorForPackageFacade(oldData, newData) + } + else { + DifferenceCalculatorForClass(oldData, newData) + } return differenceObject.difference() } @@ -70,9 +74,7 @@ private abstract class DifferenceCalculator() { protected val compareObject by lazy { ProtoCompareGenerated(oldNameResolver, newNameResolver) } - abstract fun difference(): DifferenceKind - - protected fun membersOrNone(names: Collection): DifferenceKind = if (names.isEmpty()) DifferenceKind.NONE else DifferenceKind.MEMBERS(names) + abstract fun difference(): Difference protected fun calcDifferenceForMembers(oldList: List, newList: List): Collection { val result = hashSetOf() @@ -172,15 +174,8 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot val diff = compareObject.difference(oldProto, newProto) - override fun difference(): DifferenceKind { - if (diff.isEmpty()) return DifferenceKind.NONE - - CLASS_SIGNATURE_ENUMS.forEach { if (it in diff) return DifferenceKind.CLASS_SIGNATURE } - - return membersOrNone(getChangedMembersNames()) - } - - private fun getChangedMembersNames(): Set { + override fun difference(): Difference { + var isClassSignatureChanged = false val names = hashSetOf() fun Int.oldToNames() = names.add(oldNameResolver.getString(this)) @@ -211,17 +206,14 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot ProtoBufClassKind.TYPE_TABLE -> { // TODO } - ProtoBufClassKind.FLAGS, - ProtoBufClassKind.FQ_NAME, - ProtoBufClassKind.TYPE_PARAMETER_LIST, - ProtoBufClassKind.SUPERTYPE_LIST, - ProtoBufClassKind.CLASS_ANNOTATION_LIST -> - throw IllegalArgumentException("Unexpected kind: $kind") - else -> - throw IllegalArgumentException("Unsupported kind: $kind") + in CLASS_SIGNATURE_ENUMS -> { + isClassSignatureChanged = true + } + else -> throw IllegalArgumentException("Unsupported kind: $kind") } } - return names + + return Difference(isClassSignatureChanged, names) } } @@ -237,13 +229,7 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa val diff = compareObject.difference(oldProto, newProto) - override fun difference(): DifferenceKind { - if (diff.isEmpty()) return DifferenceKind.NONE - - return membersOrNone(getChangedMembersNames()) - } - - private fun getChangedMembersNames(): Set { + override fun difference(): Difference { val names = hashSetOf() fun calcDifferenceForNonPrivateMembers(members: (ProtoBuf.Package) -> List): Collection { @@ -261,11 +247,10 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa ProtoBufPackageKind.TYPE_TABLE -> { // TODO } - else -> - throw IllegalArgumentException("Unsupported kind: $kind") + else -> throw IllegalArgumentException("Unsupported kind: $kind") } } - return names + return Difference(isClassSignatureChanged = false, changedMembersNames = names) } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 53e2b965f60..9015aedd392 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1081,6 +1081,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("flagsAndMemberInSameClassChanged") + public void testFlagsAndMemberInSameClassChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/"); + doTest(fileName); + } + @TestMetadata("jvmNameChanged") public void testJvmNameChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 664765289c9..f9ae0e18edc 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase +import com.intellij.util.SmartList import org.jetbrains.kotlin.jps.incremental.storage.ProtoMapValue import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind @@ -112,16 +113,21 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { } } - val changes = when (diff) { - is DifferenceKind.NONE -> - "NONE" - is DifferenceKind.CLASS_SIGNATURE -> - "CLASS_SIGNATURE" - is DifferenceKind.MEMBERS -> - "MEMBERS\n ${diff.names.sorted()}" + val changes = SmartList() + + if (diff.isClassSignatureChanged) { + changes.add("CLASS_SIGNATURE") } - println("changes in ${oldLocalFileKotlinClass.classId}: $changes") + if (diff.changedMembersNames.isNotEmpty()) { + changes.add("MEMBERS\n ${diff.changedMembersNames.sorted()}") + } + + if (changes.isEmpty()) { + changes.add("NONE") + } + + println("changes in ${oldLocalFileKotlinClass.classId}: ${changes.joinToString()}") } private fun File.createSubDirectory(relativePath: String): File { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 6a90f0cbdb7..9b74cd9d194 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -37,6 +37,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("classFlagsAndMembersChanged") + public void testClassFlagsAndMembersChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/"); + doTest(fileName); + } + @TestMetadata("classFlagsChanged") public void testClassFlagsChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/"); diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/new.kt new file mode 100644 index 00000000000..5ea958883c3 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/new.kt @@ -0,0 +1,5 @@ +package test + +open class A { + fun f() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/old.kt new file mode 100644 index 00000000000..926842376c9 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/old.kt @@ -0,0 +1,3 @@ +package test + +class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out new file mode 100644 index 00000000000..0050cf38d22 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/result.out @@ -0,0 +1,2 @@ +changes in test/A: CLASS_SIGNATURE, MEMBERS + [f] diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out index d447c5da3f9..557be9e6f1f 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out @@ -1 +1,2 @@ -changes in test/ClassWithClassAnnotationListChanged: CLASS_SIGNATURE +changes in test/ClassWithClassAnnotationListChanged: CLASS_SIGNATURE, MEMBERS + [] diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt new file mode 100644 index 00000000000..bf3e36a22e5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt @@ -0,0 +1,3 @@ +open class A { + val x: Any = "A.x" +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1 new file mode 100644 index 00000000000..ef7cdda34b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.1 @@ -0,0 +1,3 @@ +private open class A { + val x: Any? = null +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2 new file mode 100644 index 00000000000..bcd2e047b17 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/A.kt.new.2 @@ -0,0 +1,3 @@ +open class A { + val x: Any? = null +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt new file mode 100644 index 00000000000..483784a19fb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/B.kt @@ -0,0 +1 @@ +class B : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log new file mode 100644 index 00000000000..75a4ae57b32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -0,0 +1,56 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/B.class +out/production/module/GetAKt.class +out/production/module/GetBKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseAKt.class +out/production/module/UseBKt.class +End of files +Compiling files: +src/B.kt +src/getA.kt +src/getB.kt +src/useA.kt +src/useB.kt +End of files +COMPILATION FAILED +Cannot access 'A': it is 'private' in file +Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' +Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' +Cannot access 'A': it is 'private' in file +Cannot access 'A': it is 'private' in file +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Cannot access 'x': it is 'invisible_fake' in 'B' +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? + + +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/B.kt +src/getA.kt +src/getB.kt +src/useA.kt +src/useB.kt +End of files +COMPILATION FAILED +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? + + +Compiling files: +src/A.kt +src/B.kt +src/getA.kt +src/getB.kt +src/useA.kt +src/useB.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt new file mode 100644 index 00000000000..bd04874b85b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getA.kt @@ -0,0 +1 @@ +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt new file mode 100644 index 00000000000..ff08b7154a6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/getB.kt @@ -0,0 +1 @@ +fun getB() = B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt new file mode 100644 index 00000000000..efaa710f180 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt @@ -0,0 +1,3 @@ +fun useA() { + getA().x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3 new file mode 100644 index 00000000000..ee272ab8efb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useA.kt.new.3 @@ -0,0 +1,3 @@ +fun useA() { + getA().x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt new file mode 100644 index 00000000000..0ecf492e57e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt @@ -0,0 +1,3 @@ +fun useB() { + getB().x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3 new file mode 100644 index 00000000000..906fb67e71d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/useB.kt.new.3 @@ -0,0 +1,3 @@ +fun useB() { + getB().x?.hashCode() +} \ No newline at end of file From d6b568005fdbfe7dd6362f77c5b26fc38a258e16 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 23 Dec 2015 15:27:58 +0300 Subject: [PATCH 0739/1557] Recompile all enum usages when new entry is added Original commit: 0cf2928761c692597087e7a227ecbe35ac22caae --- .../jps/incremental/protoDifferenceUtils.kt | 5 ++-- ...perimentalIncrementalJpsTestGenerated.java | 12 +++++++++ .../classWitnEnumChanged/result.out | 3 +-- .../enumEntryAdded/Enum.kt | 4 +++ .../enumEntryAdded/Enum.kt.new.1 | 5 ++++ .../enumEntryAdded/build.log | 27 +++++++++++++++++++ .../enumEntryAdded/getRandomEnumEntry.kt | 6 +++++ .../enumEntryAdded/use.kt | 7 +++++ .../enumEntryAdded/use.kt.new.2 | 8 ++++++ .../enumEntryAdded/useEnumImplicitly.kt | 3 +++ .../enumMemberChanged/Enum.kt | 7 +++++ .../enumMemberChanged/Enum.kt.new.1 | 7 +++++ .../enumMemberChanged/build.log | 24 +++++++++++++++++ .../enumMemberChanged/useBecameNullable.kt | 5 ++++ .../useBecameNullable.kt.new.2 | 5 ++++ .../enumMemberChanged/useUnchanged.kt | 5 ++++ 16 files changed, 129 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index b24704e1ebc..97183178c97 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -201,8 +201,9 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList)) ProtoBufClassKind.PROPERTY_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList)) - ProtoBufClassKind.ENUM_ENTRY_LIST -> - names.addAll(calcDifferenceForNames(oldProto.enumEntryList.map { it.name }, newProto.enumEntryList.map { it.name })) + ProtoBufClassKind.ENUM_ENTRY_LIST -> { + isClassSignatureChanged = true + } ProtoBufClassKind.TYPE_TABLE -> { // TODO } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 9015aedd392..4ba99fa6da2 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1075,6 +1075,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("enumEntryAdded") + public void testEnumEntryAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/"); + doTest(fileName); + } + + @TestMetadata("enumMemberChanged") + public void testEnumMemberChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/"); + doTest(fileName); + } + @TestMetadata("flagsAndMemberInDifferentClassesChanged") public void testFlagsAndMemberInDifferentClassesChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/"); diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out index 853c9c77070..e7108629fed 100644 --- a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged/result.out @@ -1,2 +1 @@ -changes in test/EnumClassWithChanges: MEMBERS - [CONST_2, CONST_3, CONST_4] +changes in test/EnumClassWithChanges: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt new file mode 100644 index 00000000000..8e80c9708b0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt @@ -0,0 +1,4 @@ +enum class Enum { + A, + B +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1 new file mode 100644 index 00000000000..d8b67e71746 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/Enum.kt.new.1 @@ -0,0 +1,5 @@ +enum class Enum { + A, + B, + C +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log new file mode 100644 index 00000000000..834ee9a0d0e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -0,0 +1,27 @@ +Cleaning output files: +out/production/module/Enum.class +End of files +Compiling files: +src/Enum.kt +End of files +Cleaning output files: +out/production/module/GetRandomEnumEntryKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseKt.class +End of files +Compiling files: +src/getRandomEnumEntry.kt +src/use.kt +End of files +COMPILATION FAILED +'when' expression must be exhaustive or contain an 'else' branch + + +Cleaning output files: +out/production/module/Enum.class +End of files +Compiling files: +src/Enum.kt +src/getRandomEnumEntry.kt +src/use.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt new file mode 100644 index 00000000000..2845b19351c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/getRandomEnumEntry.kt @@ -0,0 +1,6 @@ +import java.util.Random + +fun getRandomEnumEntry() = + with (Enum.values()) { + get(Random().nextInt(size)) + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt new file mode 100644 index 00000000000..14d2aa5be07 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt @@ -0,0 +1,7 @@ +import Enum.* + +fun use(e: Enum): String = + when (e) { + A -> "A" + B -> "B" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2 new file mode 100644 index 00000000000..d64d3769328 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/use.kt.new.2 @@ -0,0 +1,8 @@ +import Enum.* + +fun use(e: Enum): String = + when (e) { + A -> "A" + B -> "B" + C -> "C" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt new file mode 100644 index 00000000000..d5ad0b4c83a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/useEnumImplicitly.kt @@ -0,0 +1,3 @@ +fun useImplicit() { + println(use(getRandomEnumEntry())) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt new file mode 100644 index 00000000000..d969e3f0526 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt @@ -0,0 +1,7 @@ +enum class Enum(x: String) { + A("a"), + B("b"); + + val becameNullable: Any = x + val unchanged: Any = x +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1 new file mode 100644 index 00000000000..4f2e4fa3f45 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/Enum.kt.new.1 @@ -0,0 +1,7 @@ +enum class Enum(x: String) { + A("a"), + B("b"); + + val becameNullable: Any? = x + val unchanged: Any = x +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log new file mode 100644 index 00000000000..77c41dc180d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log @@ -0,0 +1,24 @@ +Cleaning output files: +out/production/module/Enum.class +End of files +Compiling files: +src/Enum.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UseBecameNullableKt.class +End of files +Compiling files: +src/useBecameNullable.kt +End of files +COMPILATION FAILED +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? + + +Cleaning output files: +out/production/module/Enum.class +End of files +Compiling files: +src/Enum.kt +src/useBecameNullable.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt new file mode 100644 index 00000000000..6e26c3c9fef --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt @@ -0,0 +1,5 @@ +import Enum.* + +fun useBecameNullable(e: Enum) { + println(e.becameNullable.hashCode()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2 new file mode 100644 index 00000000000..3c4016a1df3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useBecameNullable.kt.new.2 @@ -0,0 +1,5 @@ +import Enum.* + +fun useBecameNullable(e: Enum) { + println(e.becameNullable?.hashCode()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt new file mode 100644 index 00000000000..fa6298a5064 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/useUnchanged.kt @@ -0,0 +1,5 @@ +import Enum.* + +fun useUnchanged(e: Enum) { + println(e.unchanged.hashCode()) +} \ No newline at end of file From 9fb496af8c0689f31e8f5b9ebe3d5e22cb39ce17 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 28 Dec 2015 14:02:07 +0300 Subject: [PATCH 0740/1557] Recompile all sealed class usages when new derived class is added Original commit: 94cea25e2e5c2b0b8d0b141abb19611d66304d2c --- .../jps/incremental/protoDifferenceUtils.kt | 13 ++++++++- ...perimentalIncrementalJpsTestGenerated.java | 6 ++++ .../ProtoComparisonTestGenerated.java | 6 ++++ .../sealedClassImplAdded/new.kt | 7 +++++ .../sealedClassImplAdded/old.kt | 6 ++++ .../sealedClassImplAdded/result.out | 5 ++++ .../sealedClassImplAdded/Base.kt | 4 +++ .../sealedClassImplAdded/Base.kt.new.1 | 5 ++++ .../sealedClassImplAdded/build.log | 29 +++++++++++++++++++ .../sealedClassImplAdded/use.kt | 7 +++++ .../sealedClassImplAdded/use.kt.new.2 | 8 +++++ 11 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 97183178c97..386acf3ad3b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -177,6 +177,7 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot override fun difference(): Difference { var isClassSignatureChanged = false val names = hashSetOf() + val classIsSealed = newProto.isSealed && oldProto.isSealed fun Int.oldToNames() = names.add(oldNameResolver.getString(this)) fun Int.newToNames() = names.add(newNameResolver.getString(this)) @@ -193,8 +194,15 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot if (oldProto.hasCompanionObjectName()) oldProto.companionObjectName.oldToNames() if (newProto.hasCompanionObjectName()) newProto.companionObjectName.newToNames() } - ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> + ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> { + if (classIsSealed) { + // when class is sealed, adding an implementation can break exhaustive when expressions + // the workaround is to recompile all class usages + isClassSignatureChanged = true + } + names.addAll(calcDifferenceForNames(oldProto.nestedClassNameList, newProto.nestedClassNameList)) + } ProtoBufClassKind.CONSTRUCTOR_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getConstructorList)) ProtoBufClassKind.FUNCTION_LIST -> @@ -255,3 +263,6 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa return Difference(isClassSignatureChanged = false, changedMembersNames = names) } } + +private val ProtoBuf.Class.isSealed: Boolean + get() = ProtoBuf.Modality.SEALED == Flags.MODALITY.get(flags) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 4ba99fa6da2..7981276a283 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1159,6 +1159,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("sealedClassImplAdded") + public void testSealedClassImplAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/"); + doTest(fileName); + } + @TestMetadata("starProjectionUpperBoundChanged") public void testStarProjectionUpperBoundChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 9b74cd9d194..896815ab04f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -159,6 +159,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } + @TestMetadata("sealedClassImplAdded") + public void testSealedClassImplAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/"); + doTest(fileName); + } + } @TestMetadata("jps-plugin/testData/comparison/packageMembers") diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/new.kt new file mode 100644 index 00000000000..7971271f92c --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/new.kt @@ -0,0 +1,7 @@ +package test + +sealed class Base { + class A : Base() + class B : Base() + class C : Base() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/old.kt new file mode 100644 index 00000000000..c5cd9afb81d --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/old.kt @@ -0,0 +1,6 @@ +package test + +sealed class Base { + class A : Base() + class B : Base() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out new file mode 100644 index 00000000000..016a54cb9a8 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/result.out @@ -0,0 +1,5 @@ +ADDED: class Base$C.class +changes in test/Base.A: NONE +changes in test/Base.B: NONE +changes in test/Base: CLASS_SIGNATURE, MEMBERS + [C] diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt new file mode 100644 index 00000000000..c09db0c3c10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt @@ -0,0 +1,4 @@ +sealed class Base { + class A : Base() + class B : Base() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1 new file mode 100644 index 00000000000..bda48c9d044 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/Base.kt.new.1 @@ -0,0 +1,5 @@ +sealed class Base { + class A : Base() + class B : Base() + class C : Base() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log new file mode 100644 index 00000000000..e55c691c0e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log @@ -0,0 +1,29 @@ +Cleaning output files: +out/production/module/Base$A.class +out/production/module/Base$B.class +out/production/module/Base.class +End of files +Compiling files: +src/Base.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UseKt.class +End of files +Compiling files: +src/use.kt +End of files +COMPILATION FAILED +'when' expression must be exhaustive or contain an 'else' branch + + +Cleaning output files: +out/production/module/Base$A.class +out/production/module/Base$B.class +out/production/module/Base$C.class +out/production/module/Base.class +End of files +Compiling files: +src/Base.kt +src/use.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt new file mode 100644 index 00000000000..dbf02b5d2a4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt @@ -0,0 +1,7 @@ +import Base.* + +fun use(x: Base): String = + when (x) { + is A -> "A" + is B -> "B" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2 new file mode 100644 index 00000000000..3034c5921b3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/use.kt.new.2 @@ -0,0 +1,8 @@ +import Base.* + +fun use(x: Base): String = + when (x) { + is A -> "A" + is B -> "B" + is C -> "C" + } \ No newline at end of file From 81c4a434e3dc09f954312f5045bbf982754977c8 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 13 Jan 2016 18:46:25 +0300 Subject: [PATCH 0741/1557] Minor: fix test data as exhaustive when error message was changed Original commit: 328169cd2e7e847bcb939f318da2071aba29838c --- .../incremental/classHierarchyAffected/enumEntryAdded/build.log | 2 +- .../classHierarchyAffected/sealedClassImplAdded/build.log | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log index 834ee9a0d0e..ee16e42ee70 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -14,7 +14,7 @@ src/getRandomEnumEntry.kt src/use.kt End of files COMPILATION FAILED -'when' expression must be exhaustive or contain an 'else' branch +when expression must be exhaustive, add necessary 'C' branch or 'else' branch instead Cleaning output files: diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log index e55c691c0e4..8048633bbe9 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log @@ -14,7 +14,7 @@ Compiling files: src/use.kt End of files COMPILATION FAILED -'when' expression must be exhaustive or contain an 'else' branch +when expression must be exhaustive, add necessary 'is C' branch or 'else' branch instead Cleaning output files: From b87baebf1f04ff28c9cce4e6ce0bc2add62cdbf2 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 12 Jan 2016 23:32:19 +0300 Subject: [PATCH 0742/1557] Report error when output directory not specified for build target #KT-10505 Fixed Original commit: 3df091e7cf7909a4b24bba75f2fdcc63c736e274 --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 6 ++++++ .../kotlin/jps/build/KotlinJpsBuildTest.kt | 11 +++++++++++ .../errors.txt | 1 + .../kotlinProject.iml | 14 ++++++++++++++ .../kotlinProject.ipr | 14 ++++++++++++++ .../src/foo.kt | 3 +++ .../test/test.kt | 3 +++ .../kotlinProject.iml | 14 ++++++++++++++ .../kotlinProject.ipr | 14 ++++++++++++++ .../KotlinProjectWithEmptyTestOutputDir/src/foo.kt | 3 +++ .../test/test.kt | 3 +++ 11 files changed, 86 insertions(+) create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/errors.txt create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/src/foo.kt create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/test/test.kt create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/src/foo.kt create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/test/test.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index af6363c60b9..71ca6e225b9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -188,6 +188,12 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION) + val targetsWithoutOutputDir = targets.filter { it.outputDir == null } + if (targetsWithoutOutputDir.isNotEmpty()) { + messageCollector.report(ERROR, "Output directory not specified for " + targetsWithoutOutputDir.joinToString(), CompilerMessageLocation.NO_LOCATION) + return ABORT + } + val project = projectDescriptor.project val lookupTracker = getLookupTracker(project) val incrementalCaches = getIncrementalCaches(chunk, context) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index bd6d2403e3b..491b2ab40a6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -717,6 +717,17 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertFalse(File(storageRoot, "targets/java-production/module2/kotlin").exists()) } + fun testKotlinProjectWithEmptyProductionOutputDir() { + initProject() + val result = makeAll() + result.assertFailed() + result.checkErrors() + } + + fun testKotlinProjectWithEmptyTestOutputDir() { + doTest() + } + private fun BuildResult.checkErrors() { val actualErrors = getMessages(BuildMessage.Kind.ERROR) .map { it as CompilerMessage } diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/errors.txt b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/errors.txt new file mode 100644 index 00000000000..2c6966278ba --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/errors.txt @@ -0,0 +1 @@ +Output directory not specified for Module 'kotlinProject' production at line -1, column -1 diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.iml new file mode 100644 index 00000000000..43ffa57d1e2 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/src/foo.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/src/foo.kt new file mode 100644 index 00000000000..a2c4e958bb5 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/src/foo.kt @@ -0,0 +1,3 @@ +fun foo() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/test/test.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/test/test.kt new file mode 100644 index 00000000000..839220d1002 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDir/test/test.kt @@ -0,0 +1,3 @@ +fun test() { + +} diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.iml new file mode 100644 index 00000000000..3e989c372d4 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/src/foo.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/src/foo.kt new file mode 100644 index 00000000000..a2c4e958bb5 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/src/foo.kt @@ -0,0 +1,3 @@ +fun foo() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/test/test.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/test/test.kt new file mode 100644 index 00000000000..839220d1002 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyTestOutputDir/test/test.kt @@ -0,0 +1,3 @@ +fun test() { + +} From b7971cf9ae6bc3c329cff301134ff01696c10c48 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 12 Jan 2016 23:32:46 +0300 Subject: [PATCH 0743/1557] Don't fail when output directory not specified for "friend" build target #KT-10505 Fixed Original commit: d9af9472f0284e3549e5877f125f30d3818c2132 --- .../build/KotlinBuilderModuleScriptGenerator.java | 4 ++-- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 4 ++++ .../kotlinProject.iml | 14 ++++++++++++++ .../kotlinProject.ipr | 14 ++++++++++++++ .../test/test.kt | 3 +++ 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/test/test.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index 13c4b4f7cfe..af6e1488181 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -115,12 +115,12 @@ public class KotlinBuilderModuleScriptGenerator { } @Nullable - public static File getFriendDirSafe(@NotNull ModuleBuildTarget target) throws ProjectBuildException { + private static File getFriendDirSafe(@NotNull ModuleBuildTarget target) throws ProjectBuildException { if (!target.isTests()) return null; File outputDirForProduction = JpsJavaExtensionService.getInstance().getOutputDirectory(target.getModule(), false); if (outputDirForProduction == null) { - throw new ProjectBuildException("No output production directory found for " + target); + return null; } return outputDirForProduction; } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 491b2ab40a6..545ab9e091c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -728,6 +728,10 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { doTest() } + fun testKotlinProjectWithEmptyProductionOutputDirWithoutSrcDir() { + doTest() + } + private fun BuildResult.checkErrors() { val actualErrors = getMessages(BuildMessage.Kind.ERROR) .map { it as CompilerMessage } diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.iml new file mode 100644 index 00000000000..43ffa57d1e2 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/test/test.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/test/test.kt new file mode 100644 index 00000000000..839220d1002 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyProductionOutputDirWithoutSrcDir/test/test.kt @@ -0,0 +1,3 @@ +fun test() { + +} From da42c05672681091843c80d7134f48e645d47394 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 13 Jan 2016 14:25:23 +0300 Subject: [PATCH 0744/1557] Don't fail when create IncrementalCacheImpl for target without output directory, and fail when try to use this info instead. #KT-10505 Fixed Original commit: c1dbfee2a95b7dd32e284193689bc29354c15952 --- .../jps/incremental/IncrementalCacheImpl.kt | 2 +- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 4 ++++ .../kotlinProject.ipr | 15 +++++++++++++++ .../produciton_module/produciton_module.iml | 14 ++++++++++++++ .../produciton_module/src/foo.kt | 3 +++ .../test_module/test/test.kt | 3 +++ .../test_module/test_module.iml | 15 +++++++++++++++ 7 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/produciton_module.iml create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/src/foo.kt create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test/test.kt create mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test_module.iml diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index ce0c8bb626e..5a7efdc5d5b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -103,7 +103,7 @@ class IncrementalCacheImpl( private val supertypesMap = registerExperimentalMap(SupertypesMap(SUPERTYPES.storageFile)) private val dependents = arrayListOf() - private val outputDir = requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } + private val outputDir by lazy(LazyThreadSafetyMode.NONE) { requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } } private val dependentsWithThis: Sequence get() = sequenceOf(this).plus(dependents.asSequence()) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 545ab9e091c..04964f65aad 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -732,6 +732,10 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { doTest() } + fun testKotlinProjectWithEmptyOutputDirInSomeModules() { + doTest() + } + private fun BuildResult.checkErrors() { val actualErrors = getMessages(BuildMessage.Kind.ERROR) .map { it as CompilerMessage } diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/kotlinProject.ipr new file mode 100644 index 00000000000..7dc391eaceb --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/kotlinProject.ipr @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/produciton_module.iml b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/produciton_module.iml new file mode 100644 index 00000000000..786d75db373 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/produciton_module.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/src/foo.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/src/foo.kt new file mode 100644 index 00000000000..f3b2ebc5254 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/produciton_module/src/foo.kt @@ -0,0 +1,3 @@ +fun foo() { + +} diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test/test.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test/test.kt new file mode 100644 index 00000000000..798f616299e --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test/test.kt @@ -0,0 +1,3 @@ +fun test() { + foo() +} diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test_module.iml b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test_module.iml new file mode 100644 index 00000000000..62cd41c3ccb --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinProjectWithEmptyOutputDirInSomeModules/test_module/test_module.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From a907aeec4d5169620b74f48262d285e79859b7aa Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Wed, 13 Jan 2016 16:34:16 +0300 Subject: [PATCH 0745/1557] Change resolution priority about implicit receivers and synthesized member-like descriptors. Change resolution to consider extensions to implicit receiver before members of another implicit receiver. Make synthesized member-like extensions resolve right after the members. #KT-10510 Fixed #KT-10219 Fixed Original commit: 3a9ecf0bce5a82ad974efd33f4a6ca0a43dba3af --- .../incremental/lookupTracker/classifierMembers/foo.kt | 10 +++++----- .../lookupTracker/localDeclarations/locals.kt | 2 +- .../lookupTracker/packageDeclarations/foo1.kt | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index d724928ceb2..19799784f85 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() this./*c:foo.A*/a this./*c:foo.A*/foo() - /*c:foo.A c:foo.A.Companion*/baz() - /*c:foo.A*/Companion./*c:foo.A.Companion*/a - /*c:foo.A*/O./*c:foo.A.O*/v = "OK" + /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/O./*c:foo.A.O*/v = "OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = 1 fun foo() { /*c:foo.E*/a - /*c:foo.E*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index f139ae7a727..8ae9ed1928f 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -31,7 +31,7 @@ import bar.* } localFun() - 1.localExtFun() + 1./*c:kotlin.Int(getLocalExtFun) c:kotlin.Int(getLOCALExtFun)*/localExtFun() val c = LocalC() c.a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index e212405db19..3b7575c7e00 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /*c:foo.MyClass c:foo.MyClass(getB) p:foo*/b - return /*c:foo.MyClass p:foo*/MyClass() + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/b + return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/MyClass() } From 91b1f5015055a5503915c66fb76a93b5a593e35c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 25 Dec 2015 22:11:55 +0300 Subject: [PATCH 0746/1557] Extract JS-related LibraryUtils utilities to JsLibraryUtils Original commit: d1f2255d388a532eaccdafefc9f8b682ee45b500 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 71ca6e225b9..1fefd3dacc2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -64,7 +64,7 @@ import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.utils.LibraryUtils +import org.jetbrains.kotlin.utils.JsLibraryUtils import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.kotlin.utils.sure @@ -592,7 +592,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val outputLibraryRuntimeDirectory = File(outputDir, compilerSettings.outputDirectoryForJsLibraryFiles).absolutePath val libraryFilesToCopy = arrayListOf() JpsJsModuleUtils.getLibraryFiles(representativeTarget, libraryFilesToCopy) - LibraryUtils.copyJsFilesFromLibraries(libraryFilesToCopy, outputLibraryRuntimeDirectory) + JsLibraryUtils.copyJsFilesFromLibraries(libraryFilesToCopy, outputLibraryRuntimeDirectory) } } From e28f1888e86ef6831cc27892c7ee9f02cdd08110 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 18 Jan 2016 18:49:33 +0300 Subject: [PATCH 0747/1557] Minor: extract most of JPS (old IC) specific part from IncrementalCacheImpl Original commit: 5889ba42933ebf32da9585b0b33900fd943694aa --- .../kotlin/jps/build/KotlinBuilder.kt | 6 +- .../jps/incremental/IncrementalCacheImpl.kt | 222 +++--------------- .../incremental/JpsIncrementalCacheImpl.kt | 216 +++++++++++++++++ 3 files changed, 250 insertions(+), 194 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1fefd3dacc2..9b41fbbfa66 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -695,7 +695,7 @@ private fun processChanges( compiledFiles: Set, allCompiledFiles: MutableSet, dataManager: BuildDataManager, - caches: Collection, + caches: Collection, compilationResult: CompilationResult, fsOperations: FSOperationsHelper ) { @@ -710,7 +710,7 @@ private fun processChanges( private fun CompilationResult.doProcessChanges( compiledFiles: Set, allCompiledFiles: MutableSet, - caches: Collection, + caches: Collection, fsOperations: FSOperationsHelper ) { KotlinBuilder.LOG.debug("compilationResult = $this") @@ -826,7 +826,7 @@ private fun getLookupTracker(project: JpsProject): LookupTracker { return lookupTracker } -private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map { +private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map { val dependentTargets = getDependentTargets(chunk, context) val dataManager = context.projectDescriptor.dataManager diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 5a7efdc5d5b..21537fd9d34 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -17,20 +17,15 @@ package org.jetbrains.kotlin.jps.incremental import com.google.protobuf.MessageLite -import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName import com.intellij.util.SmartList import com.intellij.util.io.BooleanDataDescriptor import com.intellij.util.io.EnumeratorStringDescriptor -import gnu.trove.THashSet import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.builders.storage.BuildDataPaths -import org.jetbrains.jps.builders.storage.StorageProvider import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.PathStringDescriptor import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.* @@ -49,30 +44,30 @@ import org.jetbrains.kotlin.serialization.deserialization.TypeTable import org.jetbrains.kotlin.serialization.deserialization.supertypes import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil -import org.jetbrains.org.objectweb.asm.* +import org.jetbrains.org.objectweb.asm.ClassReader +import org.jetbrains.org.objectweb.asm.ClassVisitor +import org.jetbrains.org.objectweb.asm.FieldVisitor +import org.jetbrains.org.objectweb.asm.Opcodes import java.io.File import java.security.MessageDigest import java.util.* val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin" -class IncrementalCacheImpl( +open class IncrementalCacheImpl( private val target: ModuleBuildTarget, paths: BuildDataPaths ) : BasicMapsOwner(), IncrementalCache { companion object { - val PROTO_MAP = "proto" - val CONSTANTS_MAP = "constants" - val INLINE_FUNCTIONS = "inline-functions" - val PACKAGE_PARTS = "package-parts" - val MULTIFILE_CLASS_FACADES = "multifile-class-facades" - val MULTIFILE_CLASS_PARTS = "multifile-class-parts" - val SOURCE_TO_CLASSES = "source-to-classes" - val DIRTY_OUTPUT_CLASSES = "dirty-output-classes" - val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions" - val INLINED_TO = "inlined-to" - val SUBTYPES = "subtypes" - val SUPERTYPES = "supertypes" + private val PROTO_MAP = "proto" + private val CONSTANTS_MAP = "constants" + private val PACKAGE_PARTS = "package-parts" + private val MULTIFILE_CLASS_FACADES = "multifile-class-facades" + private val MULTIFILE_CLASS_PARTS = "multifile-class-parts" + private val SOURCE_TO_CLASSES = "source-to-classes" + private val DIRTY_OUTPUT_CLASSES = "dirty-output-classes" + private val SUBTYPES = "subtypes" + private val SUPERTYPES = "supertypes" private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT } @@ -86,35 +81,29 @@ class IncrementalCacheImpl( return registerMap(map) } - private val String.storageFile: File + protected val String.storageFile: File get() = File(baseDir, this + "." + CACHE_EXTENSION) private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) - private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile)) private val multifileClassFacadeMap = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile)) private val multifileClassPartMap = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile)) private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile)) private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile)) - private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) - private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) private val subtypesMap = registerExperimentalMap(SubtypesMap(SUBTYPES.storageFile)) private val supertypesMap = registerExperimentalMap(SupertypesMap(SUPERTYPES.storageFile)) private val dependents = arrayListOf() private val outputDir by lazy(LazyThreadSafetyMode.NONE) { requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } } - private val dependentsWithThis: Sequence - get() = sequenceOf(this).plus(dependents.asSequence()) + protected val dependentsWithThis: Sequence + get() = sequenceOf(this).plus(dependents.asSequence()) internal val dependentCaches: Iterable - get() = dependents + get() = dependents override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - if (!IncrementalCompilation.isExperimental()) { - inlinedTo.add(fromPath, jvmSignature, toPath) - } } fun addDependentCache(cache: IncrementalCacheImpl) { @@ -132,28 +121,9 @@ class IncrementalCacheImpl( } } - fun getFilesToReinline(): Collection { - val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) - - for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { - val classFilePath = getClassFilePath(className.internalName) - - for (cache in dependentsWithThis) { - val targetFiles = functions.flatMap { cache.inlinedTo[classFilePath, it] } - result.addAll(targetFiles) - } - } - - return result.map { File(it) } - } - fun getSubtypesOf(className: FqName): Sequence = subtypesMap[className].asSequence() - fun cleanDirtyInlineFunctions() { - dirtyInlineFunctionsMap.clean() - } - override fun getClassFilePath(internalClassName: String): String { return toSystemIndependentName(File(outputDir, "$internalClassName.class").canonicalPath) } @@ -184,7 +154,7 @@ class IncrementalCacheImpl( protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass, isPackage = true) + additionalProcessChangedClass(kotlinClass, isPackage = true) } header.isCompatibleMultifileClassKind() -> { val partNames = kotlinClass.classHeader.filePartClassNames?.toList() @@ -193,7 +163,7 @@ class IncrementalCacheImpl( // TODO NO_CHANGES? (delegates only) constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass, isPackage = true) + additionalProcessChangedClass(kotlinClass, isPackage = true) } header.isCompatibleMultifileClassPartKind() -> { assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" } @@ -202,14 +172,14 @@ class IncrementalCacheImpl( protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass, isPackage = true) + additionalProcessChangedClass(kotlinClass, isPackage = true) } header.isCompatibleClassKind() && !header.isLocalClass -> { addToClassStorage(kotlinClass) protoMap.process(kotlinClass, isPackage = false) + constantsMap.process(kotlinClass) + - inlineFunctionsMap.process(kotlinClass, isPackage = false) + additionalProcessChangedClass(kotlinClass, isPackage = false) } else -> CompilationResult.NO_CHANGES } @@ -218,6 +188,8 @@ class IncrementalCacheImpl( return changesInfo } + protected open fun additionalProcessChangedClass(kotlinClass: LocalFileKotlinClass, isPackage: Boolean) = CompilationResult.NO_CHANGES + private fun CompilationResult.logIfSomethingChanged(className: JvmClassName) { if (this == CompilationResult.NO_CHANGES) return @@ -287,15 +259,19 @@ class IncrementalCacheImpl( multifileClassFacadeMap.remove(it) multifileClassPartMap.remove(it) constantsMap.remove(it) - inlineFunctionsMap.remove(it) } + additionalProcessRemovedClasses(dirtyClasses) + removeAllFromClassStorage(dirtyClasses) dirtyOutputClassesMap.clean() return changesInfo } + protected open fun additionalProcessRemovedClasses(dirtyClasses: List) { + } + override fun getObsoletePackageParts(): Collection { val obsoletePackageParts = dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } @@ -450,88 +426,6 @@ class IncrementalCacheImpl( value.dumpMap(Any::toString) } - private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringToLongMapExternalizer) { - private fun getInlineFunctionsMap(bytes: ByteArray): Map { - val result = HashMap() - - val inlineFunctions = inlineFunctionsJvmNames(bytes) - if (inlineFunctions.isEmpty()) return emptyMap() - - ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { - override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { - val dummyClassWriter = ClassWriter(Opcodes.ASM5) - - return object : MethodVisitor(Opcodes.ASM5, dummyClassWriter.visitMethod(0, name, desc, null, exceptions)) { - override fun visitEnd() { - val jvmName = name + desc - if (jvmName !in inlineFunctions) return - - val dummyBytes = dummyClassWriter.toByteArray()!! - val hash = dummyBytes.md5() - result[jvmName] = hash - } - } - } - - }, 0) - - return result - } - - fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { - return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents), isPackage) - } - - private fun put(className: JvmClassName, newMap: Map, isPackage: Boolean): CompilationResult { - val internalName = className.internalName - val oldMap = storage[internalName] ?: emptyMap() - - val added = hashSetOf() - val changed = hashSetOf() - val allFunctions = oldMap.keys + newMap.keys - - for (fn in allFunctions) { - val oldHash = oldMap[fn] - val newHash = newMap[fn] - - when { - oldHash == null -> added.add(fn) - oldHash != newHash -> changed.add(fn) - } - } - - when { - newMap.isNotEmpty() -> storage[internalName] = newMap - else -> storage.remove(internalName) - } - - if (changed.isNotEmpty()) { - dirtyInlineFunctionsMap.put(className, changed.toList()) - } - - val changes = - if (IncrementalCompilation.isExperimental()) { - val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars - // TODO get name in better way instead of using substringBefore - (added.asSequence() + changed.asSequence()).map { ChangeInfo.MembersChanged(fqName, listOf(it.substringBefore("("))) } - } - else { - emptySequence() - } - - return CompilationResult(inlineChanged = changed.isNotEmpty(), - inlineAdded = added.isNotEmpty(), - changes = changes) - } - - fun remove(className: JvmClassName) { - storage.remove(className.internalName) - } - - override fun dumpValue(value: Map): String = - value.dumpMap { java.lang.Long.toHexString(it) } - } - private inner class PackagePartMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { fun addPackagePart(className: JvmClassName) { storage[className.internalName] = true @@ -662,44 +556,6 @@ class IncrementalCacheImpl( override fun dumpValue(value: Boolean) = "" } - - private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { - fun getEntries(): Map> = - storage.keys.toMapBy(JvmClassName::byInternalName) { storage[it]!! } - - fun put(className: JvmClassName, changedFunctions: List) { - storage[className.internalName] = changedFunctions - } - - override fun dumpValue(value: Collection) = value.dumpCollection() - } - - - /** - * Mapping: (sourceFile+inlineFunction)->(targetFiles) - * - * Where: - * * sourceFile - path to some kotlin source - * * inlineFunction - jvmSignature of some inline function in source file - * * target files - collection of files inlineFunction has been inlined to - */ - private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { - fun add(sourcePath: String, jvmSignature: String, targetPath: String) { - val key = PathFunctionPair(sourcePath, jvmSignature) - storage.append(key, targetPath) - } - - operator fun get(sourcePath: String, jvmSignature: String): Collection { - val key = PathFunctionPair(sourcePath, jvmSignature) - return storage[key] ?: emptySet() - } - - override fun dumpKey(key: PathFunctionPair): String = - "(${key.path}, ${key.function})" - - override fun dumpValue(value: Collection) = - value.dumpCollection() - } } sealed class ChangeInfo(val fqName: FqName) { @@ -738,23 +594,7 @@ data class CompilationResult( changes + other.changes) } -private class KotlinIncrementalStorageProvider( - private val target: ModuleBuildTarget, - private val paths: BuildDataPaths -) : StorageProvider() { - - override fun equals(other: Any?) = other is KotlinIncrementalStorageProvider && target == other.target - - override fun hashCode() = target.hashCode() - - override fun createStorage(targetDataDir: File): IncrementalCacheImpl = - IncrementalCacheImpl(target, paths) -} - -fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): IncrementalCacheImpl = - getStorage(target, KotlinIncrementalStorageProvider(target, dataPaths)) - -private fun ByteArray.md5(): Long { +fun ByteArray.md5(): Long { val d = MessageDigest.getInstance("MD5").digest(this)!! return ((d[0].toLong() and 0xFFL) or ((d[1].toLong() and 0xFFL) shl 8) @@ -768,7 +608,7 @@ private fun ByteArray.md5(): Long { } @TestOnly -private fun , V> Map.dumpMap(dumpValue: (V)->String): String = +fun , V> Map.dumpMap(dumpValue: (V)->String): String = buildString { append("{") for (key in keys.sorted()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt new file mode 100644 index 00000000000..601e45a2f62 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt @@ -0,0 +1,216 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.incremental + +import com.intellij.openapi.util.io.FileUtil +import gnu.trove.THashSet +import org.jetbrains.jps.builders.storage.BuildDataPaths +import org.jetbrains.jps.builders.storage.StorageProvider +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.jps.incremental.storage.BuildDataManager +import org.jetbrains.jps.incremental.storage.StorageOwner +import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames +import org.jetbrains.kotlin.jps.incremental.storage.* +import org.jetbrains.kotlin.resolve.jvm.JvmClassName +import org.jetbrains.org.objectweb.asm.* +import java.io.File +import java.util.* + +class JpsIncrementalCacheImpl( + target: ModuleBuildTarget, + paths: BuildDataPaths +) : IncrementalCacheImpl(target, paths), StorageOwner { + + private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) + private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) + private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) + + override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { + if (!IncrementalCompilation.isExperimental()) { + inlinedTo.add(fromPath, jvmSignature, toPath) + } + } + + override fun additionalProcessChangedClass(kotlinClass: LocalFileKotlinClass, isPackage: Boolean) = + inlineFunctionsMap.process(kotlinClass, isPackage) + + override fun additionalProcessRemovedClasses(dirtyClasses: List) { + dirtyClasses.forEach { inlineFunctionsMap.remove(it) } + } + + fun getFilesToReinline(): Collection { + val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) + + for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { + val classFilePath = getClassFilePath(className.internalName) + + for (cache in dependentsWithThis) { + val targetFiles = functions.flatMap { (cache as JpsIncrementalCacheImpl).inlinedTo[classFilePath, it] } + result.addAll(targetFiles) + } + } + + return result.map { File(it) } + } + + fun cleanDirtyInlineFunctions() { + dirtyInlineFunctionsMap.clean() + } + + private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringToLongMapExternalizer) { + private fun getInlineFunctionsMap(bytes: ByteArray): Map { + val result = HashMap() + + val inlineFunctions = inlineFunctionsJvmNames(bytes) + if (inlineFunctions.isEmpty()) return emptyMap() + + ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { + override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { + val dummyClassWriter = ClassWriter(Opcodes.ASM5) + + return object : MethodVisitor(Opcodes.ASM5, dummyClassWriter.visitMethod(0, name, desc, null, exceptions)) { + override fun visitEnd() { + val jvmName = name + desc + if (jvmName !in inlineFunctions) return + + val dummyBytes = dummyClassWriter.toByteArray()!! + val hash = dummyBytes.md5() + result[jvmName] = hash + } + } + } + + }, 0) + + return result + } + + fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { + return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents), isPackage) + } + + private fun put(className: JvmClassName, newMap: Map, isPackage: Boolean): CompilationResult { + val internalName = className.internalName + val oldMap = storage[internalName] ?: emptyMap() + + val added = hashSetOf() + val changed = hashSetOf() + val allFunctions = oldMap.keys + newMap.keys + + for (fn in allFunctions) { + val oldHash = oldMap[fn] + val newHash = newMap[fn] + + when { + oldHash == null -> added.add(fn) + oldHash != newHash -> changed.add(fn) + } + } + + when { + newMap.isNotEmpty() -> storage[internalName] = newMap + else -> storage.remove(internalName) + } + + if (changed.isNotEmpty()) { + dirtyInlineFunctionsMap.put(className, changed.toList()) + } + + val changes = + if (IncrementalCompilation.isExperimental()) { + val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars + // TODO get name in better way instead of using substringBefore + (added.asSequence() + changed.asSequence()).map { ChangeInfo.MembersChanged(fqName, listOf(it.substringBefore("("))) } + } + else { + emptySequence() + } + + return CompilationResult(inlineChanged = changed.isNotEmpty(), + inlineAdded = added.isNotEmpty(), + changes = changes) + } + + fun remove(className: JvmClassName) { + storage.remove(className.internalName) + } + + override fun dumpValue(value: Map): String = + value.dumpMap { java.lang.Long.toHexString(it) } + } + + private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { + fun getEntries(): Map> = + storage.keys.toMapBy(JvmClassName::byInternalName) { storage[it]!! } + + fun put(className: JvmClassName, changedFunctions: List) { + storage[className.internalName] = changedFunctions + } + + override fun dumpValue(value: Collection) = value.dumpCollection() + } + + /** + * Mapping: (sourceFile+inlineFunction)->(targetFiles) + * + * Where: + * * sourceFile - path to some kotlin source + * * inlineFunction - jvmSignature of some inline function in source file + * * target files - collection of files inlineFunction has been inlined to + */ + private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { + fun add(sourcePath: String, jvmSignature: String, targetPath: String) { + val key = PathFunctionPair(sourcePath, jvmSignature) + storage.append(key, targetPath) + } + + operator fun get(sourcePath: String, jvmSignature: String): Collection { + val key = PathFunctionPair(sourcePath, jvmSignature) + return storage[key] ?: emptySet() + } + + override fun dumpKey(key: PathFunctionPair): String = + "(${key.path}, ${key.function})" + + override fun dumpValue(value: Collection) = + value.dumpCollection() + } + + companion object { + private val INLINE_FUNCTIONS = "inline-functions" + private val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions" + private val INLINED_TO = "inlined-to" + } +} + +private class KotlinIncrementalStorageProvider( + private val target: ModuleBuildTarget, + private val paths: BuildDataPaths +) : StorageProvider() { + + override fun equals(other: Any?) = other is KotlinIncrementalStorageProvider && target == other.target + + override fun hashCode() = target.hashCode() + + override fun createStorage(targetDataDir: File): JpsIncrementalCacheImpl = + JpsIncrementalCacheImpl(target, paths) +} + +fun BuildDataManager.getKotlinCache(target: ModuleBuildTarget): JpsIncrementalCacheImpl = + getStorage(target, KotlinIncrementalStorageProvider(target, dataPaths)) + From 7998e7884c9c56eeaa38db5e43ee9b91a2054585 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 14 Jan 2016 14:30:23 +0100 Subject: [PATCH 0748/1557] add test to check that "Only the Kotlin standard library is allowed to use the 'kotlin' package" is reported in JPS builds Original commit: 39c6e3712bd8e8f8592c80ea0e885ba29fefe08e --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 10 ++++++++++ .../general/CodeInKotlinPackage/kotlinProject.iml | 12 ++++++++++++ .../general/CodeInKotlinPackage/kotlinProject.ipr | 14 ++++++++++++++ .../general/CodeInKotlinPackage/src/test1.kt | 5 +++++ 4 files changed, 41 insertions(+) create mode 100644 jps/jps-plugin/testData/general/CodeInKotlinPackage/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/CodeInKotlinPackage/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/CodeInKotlinPackage/src/test1.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 04964f65aad..7d95fafcdb5 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -697,6 +697,16 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { ) } + fun testCodeInKotlinPackage() { + initProject() + + val result = makeAll() + result.assertFailed() + val errors = result.getMessages(BuildMessage.Kind.ERROR) + + Assert.assertEquals("Only the Kotlin standard library is allowed to use the 'kotlin' package", errors.single().messageText) + } + fun testDoNotCreateUselessKotlinIncrementalCaches() { initProject() makeAll().assertSuccessful() diff --git a/jps/jps-plugin/testData/general/CodeInKotlinPackage/kotlinProject.iml b/jps/jps-plugin/testData/general/CodeInKotlinPackage/kotlinProject.iml new file mode 100644 index 00000000000..a0cbe548242 --- /dev/null +++ b/jps/jps-plugin/testData/general/CodeInKotlinPackage/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/CodeInKotlinPackage/kotlinProject.ipr b/jps/jps-plugin/testData/general/CodeInKotlinPackage/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/CodeInKotlinPackage/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/CodeInKotlinPackage/src/test1.kt b/jps/jps-plugin/testData/general/CodeInKotlinPackage/src/test1.kt new file mode 100644 index 00000000000..d68bb3a92ee --- /dev/null +++ b/jps/jps-plugin/testData/general/CodeInKotlinPackage/src/test1.kt @@ -0,0 +1,5 @@ +package kotlin.forever + +fun foo() { + +} From 4e8365084fd68e0c4394ca23866e501b7e17e53b Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 14 Jan 2016 18:45:09 +0100 Subject: [PATCH 0749/1557] tests fixed Original commit: b60621c42806d812ec0cc6b43868a32e64a0f124 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 4 ++-- .../testData/general/JKJProject/src/java/JFirst.java | 2 +- .../testData/general/JKJProject/src/kotlin/KFirst.kt | 2 +- .../testData/general/KJCircularProject/src/java/JFirst.java | 4 ++-- .../testData/general/KJCircularProject/src/kotlin/KFirst.kt | 2 +- .../testData/general/KJKProject/src/java/JFirst.java | 2 +- .../testData/general/KJKProject/src/kotlin/KFirst.kt | 2 +- .../testData/general/KJKProject/src/kotlin/KSecond.kt | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 7d95fafcdb5..ad8ca19e874 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -551,7 +551,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCircularDependencyWithReferenceToOldVersionLib() { initProject() - val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false) + val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false) AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) @@ -562,7 +562,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testDependencyToOldKotlinLib() { initProject() - val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false) + val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false) AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) diff --git a/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java index efaf2188e4d..bcdc7cbd4f7 100644 --- a/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java +++ b/jps/jps-plugin/testData/general/JKJProject/src/java/JFirst.java @@ -2,6 +2,6 @@ package java; public class JFirst { public void foo() { - new kotlin.KFirst().foo(); + new myproject.kotlin.KFirst().foo(); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt index 110919f715d..d3f96de0f7f 100644 --- a/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt +++ b/jps/jps-plugin/testData/general/JKJProject/src/kotlin/KFirst.kt @@ -1,4 +1,4 @@ -package kotlin +package myproject.kotlin class KFirst() { fun foo() { diff --git a/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java index 686f3641b6c..5f400f48562 100644 --- a/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java +++ b/jps/jps-plugin/testData/general/KJCircularProject/src/java/JFirst.java @@ -2,10 +2,10 @@ package java; public class JFirst { public void foo() { - new kotlin.KFirst().foo(); + new myproject.kotlin.KFirst().foo(); } public void bar() { - new kotlin.KFirst().bar(); + new myproject.kotlin.KFirst().bar(); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt index 38a327f0713..0641836f93f 100644 --- a/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt +++ b/jps/jps-plugin/testData/general/KJCircularProject/src/kotlin/KFirst.kt @@ -1,4 +1,4 @@ -package kotlin +package myproject.kotlin class KFirst() { fun foo() { diff --git a/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java b/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java index 5423b46e09b..1f4b4e26910 100644 --- a/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java +++ b/jps/jps-plugin/testData/general/KJKProject/src/java/JFirst.java @@ -2,6 +2,6 @@ package java; public class JFirst { public void foo() { - new kotlin.KSecond().foo(); + new myproject.kotlin.KSecond().foo(); } } \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt index 29600c79f20..536328b73dc 100644 --- a/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt +++ b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KFirst.kt @@ -1,4 +1,4 @@ -package kotlin +package myproject.kotlin class KFirst() { fun foo() { diff --git a/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt index 56d654aed84..af0f67ec98f 100644 --- a/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt +++ b/jps/jps-plugin/testData/general/KJKProject/src/kotlin/KSecond.kt @@ -1,4 +1,4 @@ -package kotlin +package myproject.kotlin class KSecond() { fun foo() { From f7934e89433f2f0f206aca945d7a243a17028d52 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 19 Jan 2016 16:23:03 +0300 Subject: [PATCH 0750/1557] Restore logging changes when process them using lookups and add assert to avoid getting parent from root FqName Original commit: bd9b2f9f06f87b3f5d78971ae4ebd8f25af6afd3 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 9b41fbbfa66..13db9d22d31 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -750,8 +750,13 @@ private fun CompilationResult.doProcessChangesUsingLookups( KotlinBuilder.LOG.debug("Start processing changes") for (change in changes) { + KotlinBuilder.LOG.debug("Process $change") + if (change is ChangeInfo.SignatureChanged) { for (classFqName in withSubtypes(change.fqName, allCaches)) { + + assert(!classFqName.isRoot) { "classFqName is root when processing $change" } + val scope = classFqName.parent().asString() val name = classFqName.shortName().identifier dirtyLookupSymbols.add(LookupSymbol(name, scope)) From 00075fc8378705eb67f234a404e6911e6152fb76 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 28 Dec 2015 16:23:14 +0300 Subject: [PATCH 0751/1557] Move version constants to corresponding BinaryVersion subclasses Original commit: 04d335db15a20eb69800f6f8260ec01f1491254c --- .../src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt index 493a6e59875..cad343f160a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -22,7 +22,7 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.incremental.CacheVersion.Action -import org.jetbrains.kotlin.load.java.JvmAbi +import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion import java.io.File private val NORMAL_VERSION = 8 @@ -47,7 +47,7 @@ class CacheVersion( get() = versionFile.readText().toInt() private val expectedVersion: Int - get() = ownVersion * 1000000 + JvmAbi.VERSION.major * 1000 + JvmAbi.VERSION.minor + get() = ownVersion * 1000000 + JvmBytecodeBinaryVersion.INSTANCE.major * 1000 + JvmBytecodeBinaryVersion.INSTANCE.minor fun checkVersion(): Action = when (versionFile.exists() to isEnabled) { From a230c85fe2d751d1f0fda6566318db0c083c07c4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 28 Dec 2015 20:01:00 +0300 Subject: [PATCH 0752/1557] Split JVM binary version into two: metadata and bytecode interface Currently all code only uses the first one (JvmMetadataVersion), later the bytecode interface version (JvmBytecodeBinaryVersion) will be used only in codegen and reflection to avoid compiling against or calling methods with unsupported conventions like default method naming and signature, getters/setters naming etc. Original commit: bd47e9d47b5f6aa33d5af4c1ab18996ee8572a38 --- .../jps/incremental/IncrementalCacheImpl.kt | 19 +++++++++-------- .../classFilesComparison.kt | 21 ++++++++++--------- .../AbstractProtoComparisonTest.kt | 19 +++++++++-------- 3 files changed, 31 insertions(+), 28 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 21537fd9d34..afb9f5032c7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -30,10 +30,7 @@ import org.jetbrains.kotlin.jps.build.GeneratedJvmClass import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storage.* import org.jetbrains.kotlin.load.kotlin.ModuleMapping -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassPartKind +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto import org.jetbrains.kotlin.name.FqName @@ -147,8 +144,12 @@ open class IncrementalCacheImpl( } val header = kotlinClass.classHeader - val changesInfo = when { - header.isCompatibleFileFacadeKind() -> { + if (header.isLocalClass) { + return CompilationResult.NO_CHANGES + } + + val changesInfo = when (header.kind) { + KotlinClassHeader.Kind.FILE_FACADE -> { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) @@ -156,7 +157,7 @@ open class IncrementalCacheImpl( constantsMap.process(kotlinClass) + additionalProcessChangedClass(kotlinClass, isPackage = true) } - header.isCompatibleMultifileClassKind() -> { + KotlinClassHeader.Kind.MULTIFILE_CLASS -> { val partNames = kotlinClass.classHeader.filePartClassNames?.toList() ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}") multifileClassFacadeMap.add(className, partNames) @@ -165,7 +166,7 @@ open class IncrementalCacheImpl( constantsMap.process(kotlinClass) + additionalProcessChangedClass(kotlinClass, isPackage = true) } - header.isCompatibleMultifileClassPartKind() -> { + KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> { assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) multifileClassPartMap.add(className.internalName, header.multifileClassName!!) @@ -174,7 +175,7 @@ open class IncrementalCacheImpl( constantsMap.process(kotlinClass) + additionalProcessChangedClass(kotlinClass, isPackage = true) } - header.isCompatibleClassKind() && !header.isLocalClass -> { + KotlinClassHeader.Kind.CLASS -> { addToClassStorage(kotlinClass) protoMap.process(kotlinClass, isPackage = false) + diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index 4fa17591046..a9e51f5b98d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -22,9 +22,7 @@ import com.google.common.io.Files import com.google.protobuf.ExtensionRegistry import com.intellij.openapi.util.io.FileUtil import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassPartKind +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.serialization.DebugProtoBuf import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf @@ -141,14 +139,17 @@ fun classFileToString(classFile: File): String { out.write("\n------ string table types proto -----\n${DebugJvmProtoBuf.StringTableTypes.parseDelimitedFrom(input)}") - when { - classHeader!!.isCompatibleFileFacadeKind() -> - out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") - classHeader.isCompatibleClassKind() -> - out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") - classHeader.isCompatibleMultifileClassPartKind() -> - out.write("\n------ multi-file part proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") + if (!classHeader!!.metadataVersion.isCompatible()) { + error("Incompatible class ($classHeader): $classFile") + } + when (classHeader.kind) { + KotlinClassHeader.Kind.FILE_FACADE -> + out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") + KotlinClassHeader.Kind.CLASS -> + out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") + KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> + out.write("\n------ multi-file part proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") else -> throw IllegalStateException() } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index f9ae0e18edc..77fdb5fc752 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -20,9 +20,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase import com.intellij.util.SmartList import org.jetbrains.kotlin.jps.incremental.storage.ProtoMapValue -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleClassKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleFileFacadeKind -import org.jetbrains.kotlin.load.kotlin.header.isCompatibleMultifileClassPartKind +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil @@ -93,19 +91,22 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { val oldProtoBytes = BitEncoding.decodeBytes(oldClassHeader.annotationData!!) val newProtoBytes = BitEncoding.decodeBytes(newClassHeader.annotationData!!) + assert(oldClassHeader.metadataVersion.isCompatible()) { "Incompatible class ($oldClassHeader): $oldClassFile" } + assert(newClassHeader.metadataVersion.isCompatible()) { "Incompatible class ($newClassHeader): $newClassFile" } + val oldProto = ProtoMapValue( - oldClassHeader.isCompatibleFileFacadeKind() || oldClassHeader.isCompatibleMultifileClassPartKind(), + oldClassHeader.kind == KotlinClassHeader.Kind.FILE_FACADE || + oldClassHeader.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART, oldProtoBytes, oldClassHeader.strings!! ) val newProto = ProtoMapValue( - newClassHeader.isCompatibleFileFacadeKind() || newClassHeader.isCompatibleMultifileClassPartKind(), + newClassHeader.kind == KotlinClassHeader.Kind.FILE_FACADE || + newClassHeader.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART, newProtoBytes, newClassHeader.strings!! ) - val diff = when { - newClassHeader.isCompatibleClassKind() || - newClassHeader.isCompatibleFileFacadeKind() || - newClassHeader.isCompatibleMultifileClassPartKind() -> + val diff = when (newClassHeader.kind) { + KotlinClassHeader.Kind.CLASS, KotlinClassHeader.Kind.FILE_FACADE, KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> difference(oldProto, newProto) else -> { println("ignore ${oldLocalFileKotlinClass.classId}") From 494ceae69061becfd298f514596e66e9a84fa25d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 13 Jan 2016 21:24:20 +0300 Subject: [PATCH 0753/1557] Use JvmMetadataVersion where appropriate instead of bytecode version Original commit: b587d3a78d040e3f49a367bbfb7c996f3efdfa4f --- .../org/jetbrains/kotlin/jps/incremental/CacheVersion.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt index cad343f160a..a2abb79eceb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt @@ -23,6 +23,7 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.incremental.CacheVersion.Action import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion import java.io.File private val NORMAL_VERSION = 8 @@ -47,7 +48,13 @@ class CacheVersion( get() = versionFile.readText().toInt() private val expectedVersion: Int - get() = ownVersion * 1000000 + JvmBytecodeBinaryVersion.INSTANCE.major * 1000 + JvmBytecodeBinaryVersion.INSTANCE.minor + get() { + val metadata = JvmMetadataVersion.INSTANCE + val bytecode = JvmBytecodeBinaryVersion.INSTANCE + return ownVersion * 1000000 + + bytecode.major * 10000 + bytecode.minor * 100 + + metadata.major * 1000 + metadata.minor + } fun checkVersion(): Action = when (versionFile.exists() to isEnabled) { From acc9c80ea9b5252ab78195aa7a594e4b80d28e91 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 30 Dec 2015 17:02:55 +0300 Subject: [PATCH 0754/1557] Drop KotlinClassHeader#filePartClassNames, use 'data' instead Original commit: 661af854fa148ba92f62970afc4eda3dbfb56fa8 --- .../jps/incremental/IncrementalCacheImpl.kt | 6 +- .../classFilesComparison.kt | 2 +- .../AbstractProtoComparisonTest.kt | 60 ++++++++----------- 3 files changed, 28 insertions(+), 40 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index afb9f5032c7..57192fdf139 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -158,7 +158,7 @@ open class IncrementalCacheImpl( additionalProcessChangedClass(kotlinClass, isPackage = true) } KotlinClassHeader.Kind.MULTIFILE_CLASS -> { - val partNames = kotlinClass.classHeader.filePartClassNames?.toList() + val partNames = kotlinClass.classHeader.data?.toList() ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}") multifileClassFacadeMap.add(className, partNames) @@ -324,7 +324,7 @@ open class IncrementalCacheImpl( fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { val header = kotlinClass.classHeader - val bytes = BitEncoding.decodeBytes(header.annotationData!!) + val bytes = BitEncoding.decodeBytes(header.data!!) return put(kotlinClass.className, bytes, header.strings!!, isPackage, checkChangesIsOpenPart = true) } @@ -498,7 +498,7 @@ open class IncrementalCacheImpl( private fun addToClassStorage(kotlinClass: LocalFileKotlinClass) { if (!IncrementalCompilation.isExperimental()) return - val classData = JvmProtoBufUtil.readClassDataFrom(kotlinClass.classHeader.annotationData!!, kotlinClass.classHeader.strings!!) + val classData = JvmProtoBufUtil.readClassDataFrom(kotlinClass.classHeader.data!!, kotlinClass.classHeader.strings!!) val supertypes = classData.classProto.supertypes(TypeTable(classData.classProto.typeTable)) val parents = supertypes.map { classData.nameResolver.getClassId(it.className).asSingleFqName() } .filter { it.asString() != "kotlin.Any" } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index a9e51f5b98d..ff1accafe69 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -132,7 +132,7 @@ fun classFileToString(classFile: File): String { val classHeader = LocalFileKotlinClass.create(classFile)?.classHeader - val annotationDataEncoded = classHeader?.annotationData + val annotationDataEncoded = classHeader?.data if (annotationDataEncoded != null) { ByteArrayInputStream(BitEncoding.decodeBytes(annotationDataEncoded)).use { input -> diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 77fdb5fc752..6193643825c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -20,6 +20,7 @@ import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase import com.intellij.util.SmartList import org.jetbrains.kotlin.jps.incremental.storage.ProtoMapValue +import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.serialization.jvm.BitEncoding import org.jetbrains.kotlin.test.KotlinTestUtils @@ -28,7 +29,6 @@ import org.jetbrains.kotlin.utils.Printer import java.io.File abstract class AbstractProtoComparisonTest : UsefulTestCase() { - fun doTest(testDataPath: String) { val testDir = KotlinTestUtils.tmpDir("testDirectory") @@ -77,43 +77,31 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { } private fun Printer.printDifference(oldClassFile: File, newClassFile: File) { - val oldLocalFileKotlinClass = LocalFileKotlinClass.create(oldClassFile)!! - val newLocalFileKotlinClass = LocalFileKotlinClass.create(newClassFile)!! - - val oldClassHeader = oldLocalFileKotlinClass.classHeader - val newClassHeader = newLocalFileKotlinClass.classHeader - - if (oldClassHeader.annotationData == null || newClassHeader.annotationData == null) { - println("skip ${oldLocalFileKotlinClass.classId}") - return - } - - val oldProtoBytes = BitEncoding.decodeBytes(oldClassHeader.annotationData!!) - val newProtoBytes = BitEncoding.decodeBytes(newClassHeader.annotationData!!) - - assert(oldClassHeader.metadataVersion.isCompatible()) { "Incompatible class ($oldClassHeader): $oldClassFile" } - assert(newClassHeader.metadataVersion.isCompatible()) { "Incompatible class ($newClassHeader): $newClassFile" } - - val oldProto = ProtoMapValue( - oldClassHeader.kind == KotlinClassHeader.Kind.FILE_FACADE || - oldClassHeader.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART, - oldProtoBytes, oldClassHeader.strings!! - ) - val newProto = ProtoMapValue( - newClassHeader.kind == KotlinClassHeader.Kind.FILE_FACADE || - newClassHeader.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART, - newProtoBytes, newClassHeader.strings!! - ) - - val diff = when (newClassHeader.kind) { - KotlinClassHeader.Kind.CLASS, KotlinClassHeader.Kind.FILE_FACADE, KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> - difference(oldProto, newProto) - else -> { - println("ignore ${oldLocalFileKotlinClass.classId}") - return + fun KotlinJvmBinaryClass.readProto(): ProtoMapValue? { + assert(classHeader.metadataVersion.isCompatible()) { "Incompatible class ($classHeader): $location" } + return when (classHeader.kind) { + KotlinClassHeader.Kind.CLASS, KotlinClassHeader.Kind.FILE_FACADE, KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> { + ProtoMapValue( + classHeader.kind != KotlinClassHeader.Kind.CLASS, + BitEncoding.decodeBytes(classHeader.data!!), + classHeader.strings!! + ) + } + else -> { + println("skip $classId") + return null + } } } + val oldClass = LocalFileKotlinClass.create(oldClassFile)!! + val newClass = LocalFileKotlinClass.create(newClassFile)!! + + val diff = difference( + oldClass.readProto() ?: return, + newClass.readProto() ?: return + ) + val changes = SmartList() if (diff.isClassSignatureChanged) { @@ -128,7 +116,7 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { changes.add("NONE") } - println("changes in ${oldLocalFileKotlinClass.classId}: ${changes.joinToString()}") + println("changes in ${oldClass.classId}: ${changes.joinToString()}") } private fun File.createSubDirectory(relativePath: String): File { From f06a9c7d205445a1c88429de1b1b175518cdbf13 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 30 Dec 2015 19:17:02 +0300 Subject: [PATCH 0755/1557] Write module name as proto extension instead of another annotation argument Original commit: a4daa08e5cbb82ecd862f46c918adaaa784b1cfa --- .../jps/incremental/ProtoCompareGenerated.kt | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index ad8bf822ae9..1768649095e 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -44,12 +44,18 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (!checkEquals(old.typeTable, new.typeTable)) return false } + if (old.hasExtension(JvmProtoBuf.packageModuleName) != new.hasExtension(JvmProtoBuf.packageModuleName)) return false + if (old.hasExtension(JvmProtoBuf.packageModuleName)) { + if (!checkStringEquals(old.getExtension(JvmProtoBuf.packageModuleName), new.getExtension(JvmProtoBuf.packageModuleName))) return false + } + return true } enum class ProtoBufPackageKind { FUNCTION_LIST, PROPERTY_LIST, - TYPE_TABLE + TYPE_TABLE, + PACKAGE_MODULE_NAME } fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { @@ -64,6 +70,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufPackageKind.TYPE_TABLE) } + if (old.hasExtension(JvmProtoBuf.packageModuleName) != new.hasExtension(JvmProtoBuf.packageModuleName)) result.add(ProtoBufPackageKind.PACKAGE_MODULE_NAME) + if (old.hasExtension(JvmProtoBuf.packageModuleName)) { + if (!checkStringEquals(old.getExtension(JvmProtoBuf.packageModuleName), new.getExtension(JvmProtoBuf.packageModuleName))) result.add(ProtoBufPackageKind.PACKAGE_MODULE_NAME) + } + return result } @@ -107,6 +118,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) return false } + if (old.hasExtension(JvmProtoBuf.classModuleName) != new.hasExtension(JvmProtoBuf.classModuleName)) return false + if (old.hasExtension(JvmProtoBuf.classModuleName)) { + if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) return false + } + return true } enum class ProtoBufClassKind { @@ -122,7 +138,8 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR PROPERTY_LIST, ENUM_ENTRY_LIST, TYPE_TABLE, - CLASS_ANNOTATION_LIST + CLASS_ANNOTATION_LIST, + CLASS_MODULE_NAME } fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet { @@ -167,6 +184,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST) } + if (old.hasExtension(JvmProtoBuf.classModuleName) != new.hasExtension(JvmProtoBuf.classModuleName)) result.add(ProtoBufClassKind.CLASS_MODULE_NAME) + if (old.hasExtension(JvmProtoBuf.classModuleName)) { + if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) result.add(ProtoBufClassKind.CLASS_MODULE_NAME) + } + return result } @@ -804,6 +826,10 @@ fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes) } + if (hasExtension(JvmProtoBuf.packageModuleName)) { + hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.packageModuleName)) + } + return hashCode } @@ -860,6 +886,10 @@ fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes) } + if (hasExtension(JvmProtoBuf.classModuleName)) { + hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.classModuleName)) + } + return hashCode } From 77c646adfb0b41aa0c6c4f0316f9c2a7edd846c0 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 11 Jan 2016 22:11:14 +0300 Subject: [PATCH 0756/1557] Write new flags to proto messages for callables This is needed to get rid of two unused bits: Flags.RESERVED_1 and Flags.RESERVED_2. The old flags are still there temporarily because of the bootstrap dependency on built-ins. Soon the old flags will be dropped and the current flags will be transformed to the new format Original commit: 693a9c945300a2bf93c0b9cdb26af796e59d04e8 --- .../jps/incremental/ProtoCompareGenerated.kt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 1768649095e..4a3907764d2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -198,6 +198,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (old.flags != new.flags) return false } + if (old.hasNewFlags() != new.hasNewFlags()) return false + if (old.hasNewFlags()) { + if (old.newFlags != new.newFlags) return false + } + if (!checkStringEquals(old.name, new.name)) return false if (old.hasReturnType() != new.hasReturnType()) return false @@ -243,6 +248,11 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (old.flags != new.flags) return false } + if (old.hasNewFlags() != new.hasNewFlags()) return false + if (old.hasNewFlags()) { + if (old.newFlags != new.newFlags) return false + } + if (!checkStringEquals(old.name, new.name)) return false if (old.hasReturnType() != new.hasReturnType()) return false @@ -900,6 +910,10 @@ fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) hashCode = 31 * hashCode + flags } + if (hasNewFlags()) { + hashCode = 31 * hashCode + newFlags + } + hashCode = 31 * hashCode + stringIndexes(name) if (hasReturnType()) { @@ -944,6 +958,10 @@ fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) hashCode = 31 * hashCode + flags } + if (hasNewFlags()) { + hashCode = 31 * hashCode + newFlags + } + hashCode = 31 * hashCode + stringIndexes(name) if (hasReturnType()) { From 66855d876dfc70846cc574cb5d92357f9a4e9627 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 12 Jan 2016 20:35:50 +0300 Subject: [PATCH 0757/1557] Delete obsolete and unused class_annotation JVM proto extension Original commit: 625c46d5681bb59dbad5624bc835f0ccc775fa8b --- .../jps/incremental/ProtoCompareGenerated.kt | 93 ++++++++----------- .../jps/incremental/protoDifferenceUtils.kt | 3 +- 2 files changed, 39 insertions(+), 57 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt index 4a3907764d2..e09d74d90ab 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt @@ -112,12 +112,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (!checkEquals(old.typeTable, new.typeTable)) return false } - if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) return false - - for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { - if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) return false - } - if (old.hasExtension(JvmProtoBuf.classModuleName) != new.hasExtension(JvmProtoBuf.classModuleName)) return false if (old.hasExtension(JvmProtoBuf.classModuleName)) { if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) return false @@ -138,7 +132,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR PROPERTY_LIST, ENUM_ENTRY_LIST, TYPE_TABLE, - CLASS_ANNOTATION_LIST, CLASS_MODULE_NAME } @@ -178,12 +171,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufClassKind.TYPE_TABLE) } - if (old.getExtensionCount(JvmProtoBuf.classAnnotation) != new.getExtensionCount(JvmProtoBuf.classAnnotation)) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST) - - for(i in 0..old.getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { - if (!checkEquals(old.getExtension(JvmProtoBuf.classAnnotation, i), new.getExtension(JvmProtoBuf.classAnnotation, i))) result.add(ProtoBufClassKind.CLASS_ANNOTATION_LIST) - } - if (old.hasExtension(JvmProtoBuf.classModuleName) != new.hasExtension(JvmProtoBuf.classModuleName)) result.add(ProtoBufClassKind.CLASS_MODULE_NAME) if (old.hasExtension(JvmProtoBuf.classModuleName)) { if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) result.add(ProtoBufClassKind.CLASS_MODULE_NAME) @@ -426,14 +413,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR return true } - open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { - if (!checkClassIdEquals(old.id, new.id)) return false - - if (!checkEqualsAnnotationArgument(old, new)) return false - - return true - } - open fun checkEquals(old: ProtoBuf.ValueParameter, new: ProtoBuf.ValueParameter): Boolean { if (old.hasFlags() != new.hasFlags()) return false if (old.hasFlags()) { @@ -503,6 +482,14 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR return true } + open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { + if (!checkClassIdEquals(old.id, new.id)) return false + + if (!checkEqualsAnnotationArgument(old, new)) return false + + return true + } + open fun checkEquals(old: ProtoBuf.Type.Argument, new: ProtoBuf.Type.Argument): Boolean { if (old.hasProjection() != new.hasProjection()) return false if (old.hasProjection()) { @@ -522,14 +509,6 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR return true } - open fun checkEquals(old: ProtoBuf.Annotation.Argument, new: ProtoBuf.Annotation.Argument): Boolean { - if (!checkStringEquals(old.nameId, new.nameId)) return false - - if (!checkEquals(old.value, new.value)) return false - - return true - } - open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { if (old.hasName() != new.hasName()) return false if (old.hasName()) { @@ -544,6 +523,14 @@ open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameR return true } + open fun checkEquals(old: ProtoBuf.Annotation.Argument, new: ProtoBuf.Annotation.Argument): Boolean { + if (!checkStringEquals(old.nameId, new.nameId)) return false + + if (!checkEquals(old.value, new.value)) return false + + return true + } + open fun checkEquals(old: ProtoBuf.Annotation.Argument.Value, new: ProtoBuf.Annotation.Argument.Value): Boolean { if (old.hasType() != new.hasType()) return false if (old.hasType()) { @@ -892,10 +879,6 @@ fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes) } - for(i in 0..getExtensionCount(JvmProtoBuf.classAnnotation) - 1) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.classAnnotation, i).hashCode(stringIndexes, fqNameIndexes) - } - if (hasExtension(JvmProtoBuf.classModuleName)) { hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.classModuleName)) } @@ -1129,18 +1112,6 @@ fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int return hashCode } -fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - hashCode = 31 * hashCode + fqNameIndexes(id) - - for(i in 0..argumentCount - 1) { - hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} - fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 @@ -1205,6 +1176,18 @@ fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int, fqNam return hashCode } +fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { + var hashCode = 1 + + hashCode = 31 * hashCode + fqNameIndexes(id) + + for(i in 0..argumentCount - 1) { + hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes) + } + + return hashCode +} + fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 @@ -1223,16 +1206,6 @@ fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: return hashCode } -fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - hashCode = 31 * hashCode + stringIndexes(nameId) - - hashCode = 31 * hashCode + value.hashCode(stringIndexes, fqNameIndexes) - - return hashCode -} - fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 @@ -1247,6 +1220,16 @@ fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIn return hashCode } +fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { + var hashCode = 1 + + hashCode = 31 * hashCode + stringIndexes(nameId) + + hashCode = 31 * hashCode + value.hashCode(stringIndexes, fqNameIndexes) + + return hashCode +} + fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { var hashCode = 1 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index 386acf3ad3b..b2d0d43f7a6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -158,8 +158,7 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot ProtoBufClassKind.FLAGS, ProtoBufClassKind.FQ_NAME, ProtoBufClassKind.TYPE_PARAMETER_LIST, - ProtoBufClassKind.SUPERTYPE_LIST, - ProtoBufClassKind.CLASS_ANNOTATION_LIST + ProtoBufClassKind.SUPERTYPE_LIST ) } From ad3e9ac65cd95deb235519faf1bab16ed403762d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 18 Jan 2016 02:23:53 +0300 Subject: [PATCH 0758/1557] Drop isLocalClass, do not write KotlinLocalClass Original commit: aef6d49b482105310f6af518f21855a5ab7049a0 --- .../jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 57192fdf139..6e1aa6b5f28 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -143,11 +143,11 @@ open class IncrementalCacheImpl( sourceToClassesMap.add(it, className) } - val header = kotlinClass.classHeader - if (header.isLocalClass) { + if (kotlinClass.classId.isLocal) { return CompilationResult.NO_CHANGES } + val header = kotlinClass.classHeader val changesInfo = when (header.kind) { KotlinClassHeader.Kind.FILE_FACADE -> { assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } From cfec0481b4e9fcdb151250032d741328cc46d52b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Dec 2015 14:35:18 +0300 Subject: [PATCH 0759/1557] Recompile all class usages when constructor is changed Original commit: 94d4dae1fe7e1f600419cae9e465e01585b88de0 --- .../kotlin/jps/build/KotlinBuilder.kt | 3 +- .../jps/incremental/IncrementalCacheImpl.kt | 6 +-- .../jps/incremental/protoDifferenceUtils.kt | 30 ++++++++++----- ...perimentalIncrementalJpsTestGenerated.java | 6 +++ .../AbstractProtoComparisonTest.kt | 2 +- .../classWithConstructorChanged/result.out | 15 +++----- .../result.out | 3 +- .../secondaryConstructorAdded/A.kt | 1 + .../secondaryConstructorAdded/A.kt.new.1 | 3 ++ .../secondaryConstructorAdded/AChild.kt | 1 + .../AConstructorFunction.kt | 1 + .../AConstructorFunction.kt.delete.2 | 0 .../secondaryConstructorAdded/build.log | 37 +++++++++++++++++++ .../createAFromInt.kt | 1 + .../createAFromString.kt | 1 + .../secondaryConstructorAdded/useA.kt | 1 + .../secondaryConstructorAdded/useAChild.kt | 1 + 17 files changed, 85 insertions(+), 27 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 13db9d22d31..edcfde1f205 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -753,8 +753,9 @@ private fun CompilationResult.doProcessChangesUsingLookups( KotlinBuilder.LOG.debug("Process $change") if (change is ChangeInfo.SignatureChanged) { - for (classFqName in withSubtypes(change.fqName, allCaches)) { + val fqNames = if (!change.areSubclassesAffected) listOf(change.fqName) else withSubtypes(change.fqName, allCaches) + for (classFqName in fqNames) { assert(!classFqName.isRoot) { "classFqName is root when processing $change" } val scope = classFqName.parent().asString() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 6e1aa6b5f28..9d02b54054a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -353,8 +353,8 @@ open class IncrementalCacheImpl( val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars val changeList = SmartList() - if (difference.isClassSignatureChanged) { - changeList.add(ChangeInfo.SignatureChanged(fqName)) + if (difference.isClassAffected) { + changeList.add(ChangeInfo.SignatureChanged(fqName, difference.areSubclassesAffected)) } if (difference.changedMembersNames.isNotEmpty()) { @@ -566,7 +566,7 @@ sealed class ChangeInfo(val fqName: FqName) { class Removed(fqName: FqName, names: Collection) : MembersChanged(fqName, names) - class SignatureChanged(fqName: FqName) : ChangeInfo(fqName) + class SignatureChanged(fqName: FqName, val areSubclassesAffected: Boolean) : ChangeInfo(fqName) protected open fun toStringProperties(): String = "fqName = $fqName" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt index b2d0d43f7a6..3f7971857ad 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt @@ -30,12 +30,15 @@ import org.jetbrains.kotlin.utils.HashSetUtil import java.util.* data class Difference( - val isClassSignatureChanged: Boolean = false, + val isClassAffected: Boolean = false, + val areSubclassesAffected: Boolean = false, val changedMembersNames: Set = emptySet() ) fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): Difference { - if (oldData.isPackageFacade != newData.isPackageFacade) return Difference(isClassSignatureChanged = true) + if (!oldData.isPackageFacade && newData.isPackageFacade) return Difference(isClassAffected = true, areSubclassesAffected = true) + + if (oldData.isPackageFacade && !newData.isPackageFacade) return Difference(isClassAffected = true) val differenceObject = if (oldData.isPackageFacade) { @@ -174,7 +177,8 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot val diff = compareObject.difference(oldProto, newProto) override fun difference(): Difference { - var isClassSignatureChanged = false + var isClassAffected = false + var areSubclassesAffected = false val names = hashSetOf() val classIsSealed = newProto.isSealed && oldProto.isSealed @@ -197,31 +201,37 @@ private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: Prot if (classIsSealed) { // when class is sealed, adding an implementation can break exhaustive when expressions // the workaround is to recompile all class usages - isClassSignatureChanged = true + isClassAffected = true } names.addAll(calcDifferenceForNames(oldProto.nestedClassNameList, newProto.nestedClassNameList)) } - ProtoBufClassKind.CONSTRUCTOR_LIST -> - names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getConstructorList)) + ProtoBufClassKind.CONSTRUCTOR_LIST -> { + val differentNonPrivateConstructors = calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getConstructorList) + + if (differentNonPrivateConstructors.isNotEmpty()) { + isClassAffected = true + } + } ProtoBufClassKind.FUNCTION_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList)) ProtoBufClassKind.PROPERTY_LIST -> names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList)) ProtoBufClassKind.ENUM_ENTRY_LIST -> { - isClassSignatureChanged = true + isClassAffected = true } ProtoBufClassKind.TYPE_TABLE -> { // TODO } in CLASS_SIGNATURE_ENUMS -> { - isClassSignatureChanged = true + isClassAffected = true + areSubclassesAffected = true } else -> throw IllegalArgumentException("Unsupported kind: $kind") } } - return Difference(isClassSignatureChanged, names) + return Difference(isClassAffected, areSubclassesAffected, names) } } @@ -259,7 +269,7 @@ private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newDa } } - return Difference(isClassSignatureChanged = false, changedMembersNames = names) + return Difference(changedMembersNames = names) } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 7981276a283..f40231060b8 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1165,6 +1165,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("secondaryConstructorAdded") + public void testSecondaryConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/"); + doTest(fileName); + } + @TestMetadata("starProjectionUpperBoundChanged") public void testStarProjectionUpperBoundChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 6193643825c..b5664c77f93 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -104,7 +104,7 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { val changes = SmartList() - if (diff.isClassSignatureChanged) { + if (diff.isClassAffected) { changes.add("CLASS_SIGNATURE") } diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out index db18d890625..08fa3f65113 100644 --- a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged/result.out @@ -1,10 +1,5 @@ -changes in test/ClassWithPrimaryConstructorChanged: MEMBERS - [] -changes in test/ClassWithPrimaryConstructorVisibilityChanged: MEMBERS - [] -changes in test/ClassWithSecondaryConstructorVisibilityChanged: MEMBERS - [] -changes in test/ClassWithSecondaryConstructorsAdded: MEMBERS - [] -changes in test/ClassWithSecondaryConstructorsRemoved: MEMBERS - [] +changes in test/ClassWithPrimaryConstructorChanged: CLASS_SIGNATURE +changes in test/ClassWithPrimaryConstructorVisibilityChanged: CLASS_SIGNATURE +changes in test/ClassWithSecondaryConstructorVisibilityChanged: CLASS_SIGNATURE +changes in test/ClassWithSecondaryConstructorsAdded: CLASS_SIGNATURE +changes in test/ClassWithSecondaryConstructorsRemoved: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out index 557be9e6f1f..d447c5da3f9 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out @@ -1,2 +1 @@ -changes in test/ClassWithClassAnnotationListChanged: CLASS_SIGNATURE, MEMBERS - [] +changes in test/ClassWithClassAnnotationListChanged: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt new file mode 100644 index 00000000000..ec5e9d1cc8f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt @@ -0,0 +1 @@ +open class A(val x: Int) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1 new file mode 100644 index 00000000000..9da909efd27 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/A.kt.new.1 @@ -0,0 +1,3 @@ +open class A(val x: Int) { + constructor(x: String) : this(x.toInt()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt new file mode 100644 index 00000000000..8efe9a14b55 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AChild.kt @@ -0,0 +1 @@ +class AChild(x: Int) : A(x) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt new file mode 100644 index 00000000000..2cffa7e5c2e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt @@ -0,0 +1 @@ +fun A(x: String) = A(x.toInt()) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/AConstructorFunction.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log new file mode 100644 index 00000000000..f9971a4960e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -0,0 +1,37 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/AChild.class +out/production/module/AConstructorFunctionKt.class +out/production/module/CreateAFromIntKt.class +out/production/module/CreateAFromStringKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseAKt.class +End of files +Compiling files: +src/AChild.kt +src/AConstructorFunction.kt +src/createAFromInt.kt +src/createAFromString.kt +src/useA.kt +End of files +COMPILATION FAILED +Overload resolution ambiguity: +public constructor A(x: kotlin.String) defined in A +public fun A(x: kotlin.String): A defined in root package + + +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/AChild.kt +src/createAFromInt.kt +src/createAFromString.kt +src/useA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt new file mode 100644 index 00000000000..e38e845051b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromInt.kt @@ -0,0 +1 @@ +fun createAFromInt() = A(5) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt new file mode 100644 index 00000000000..bb9d0e7339f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/createAFromString.kt @@ -0,0 +1 @@ +fun createAFromString() = A("5") \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt new file mode 100644 index 00000000000..900c1a151f3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useA.kt @@ -0,0 +1 @@ +fun useA(a: A) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt new file mode 100644 index 00000000000..6cd856e3233 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/useAChild.kt @@ -0,0 +1 @@ +fun useAChild(a: AChild) {} \ No newline at end of file From a2d58cca63b76ba13cdb0d6c5997a867e0d58f76 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 14 Jan 2016 15:58:58 +0300 Subject: [PATCH 0760/1557] Test incremental facade to class conversion and vice versa Original commit: 9bb876e6da87ef7b3c60d031b7da8a41cd0e2ca7 --- .../jps/incremental/IncrementalCacheImpl.kt | 51 +++++++++++++----- ...perimentalIncrementalJpsTestGenerated.java | 12 +++++ .../classToPackageFacade/A.kt | 11 ++++ .../classToPackageFacade/A.kt.delete.1 | 0 .../classToPackageFacade/AChild.kt | 3 ++ .../classToPackageFacade/AChild.kt.new.2 | 3 ++ .../classToPackageFacade/APartF.kt.new.1 | 4 ++ .../classToPackageFacade/APartG.kt.new.1 | 4 ++ .../classToPackageFacade/build.log | 53 +++++++++++++++++++ .../classToPackageFacade/getA.kt | 1 + .../classToPackageFacade/getA.kt.delete.2 | 0 .../classToPackageFacade/getAChild.kt | 1 + .../classToPackageFacade/useF.kt | 3 ++ .../classToPackageFacade/useF.kt.new.2 | 3 ++ .../classToPackageFacade/useG.kt | 3 ++ .../classToPackageFacade/useG.kt.new.2 | 3 ++ .../classToPackageFacade/useH.kt | 3 ++ .../classToPackageFacade/useH.kt.delete.2 | 0 .../classToPackageFacade/useJ.kt | 3 ++ .../packageFacadeToClass/A.kt.new.1 | 9 ++++ .../packageFacadeToClass/AA.kt | 5 ++ .../packageFacadeToClass/APartF.kt | 4 ++ .../packageFacadeToClass/APartF.kt.delete.1 | 0 .../packageFacadeToClass/APartG.kt | 4 ++ .../packageFacadeToClass/APartG.kt.delete.1 | 9 ++++ .../packageFacadeToClass/UseFJava.java | 5 ++ .../packageFacadeToClass/build.log | 40 ++++++++++++++ .../packageFacadeToClass/useAA.kt | 3 ++ .../packageFacadeToClass/useF.kt | 3 ++ .../packageFacadeToClass/useF.kt.new.2 | 3 ++ .../packageFacadeToClass/useG.kt | 3 ++ .../packageFacadeToClass/useG.kt.new.2 | 3 ++ 32 files changed, 239 insertions(+), 13 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartF.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartG.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getAChild.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useJ.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/AA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/UseFJava.java create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useAA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt.new.2 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt index 9d02b54054a..5b4157eab37 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt @@ -84,8 +84,8 @@ open class IncrementalCacheImpl( private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile)) - private val multifileClassFacadeMap = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile)) - private val multifileClassPartMap = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile)) + private val multifileFacadeToParts = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile)) + private val partToMultifileFacade = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile)) private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile)) private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile)) private val subtypesMap = registerExperimentalMap(SubtypesMap(SUBTYPES.storageFile)) @@ -160,7 +160,12 @@ open class IncrementalCacheImpl( KotlinClassHeader.Kind.MULTIFILE_CLASS -> { val partNames = kotlinClass.classHeader.data?.toList() ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}") - multifileClassFacadeMap.add(className, partNames) + multifileFacadeToParts[className] = partNames + // When a class is replaced with a facade with the same name, + // the class' proto wouldn't ever be deleted, + // because we don't write proto for multifile facades. + // As a workaround we can remove proto values for multifile facades. + protoMap.remove(className) // TODO NO_CHANGES? (delegates only) constantsMap.process(kotlinClass) + @@ -169,7 +174,7 @@ open class IncrementalCacheImpl( KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> { assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" } packagePartMap.addPackagePart(className) - multifileClassPartMap.add(className.internalName, header.multifileClassName!!) + partToMultifileFacade.set(className.internalName, header.multifileClassName!!) protoMap.process(kotlinClass, isPackage = true) + constantsMap.process(kotlinClass) + @@ -254,11 +259,31 @@ open class IncrementalCacheImpl( info + newInfo } + val facadesWithRemovedParts = hashMapOf>() + for (dirtyClass in dirtyClasses) { + val facade = partToMultifileFacade.get(dirtyClass.internalName) ?: continue + val facadeClassName = JvmClassName.byInternalName(facade) + val removedParts = facadesWithRemovedParts.getOrPut(facadeClassName) { hashSetOf() } + removedParts.add(dirtyClass.internalName) + } + + for ((facade, removedParts) in facadesWithRemovedParts.entries) { + val allParts = multifileFacadeToParts[facade.internalName] ?: continue + val notRemovedParts = allParts.filter { it !in removedParts } + + if (notRemovedParts.isEmpty()) { + multifileFacadeToParts.remove(facade) + } + else { + multifileFacadeToParts[facade] = notRemovedParts + } + } + dirtyClasses.forEach { protoMap.remove(it) packagePartMap.remove(it) - multifileClassFacadeMap.remove(it) - multifileClassPartMap.remove(it) + multifileFacadeToParts.remove(it) + partToMultifileFacade.remove(it) constantsMap.remove(it) } @@ -289,7 +314,7 @@ open class IncrementalCacheImpl( override fun getObsoleteMultifileClasses(): Collection { val obsoleteMultifileClasses = linkedSetOf() for (dirtyClass in dirtyOutputClassesMap.getDirtyOutputClasses()) { - val dirtyFacade = multifileClassPartMap.getFacadeName(dirtyClass) ?: continue + val dirtyFacade = partToMultifileFacade.get(dirtyClass) ?: continue obsoleteMultifileClasses.add(dirtyFacade) } KotlinBuilder.LOG.debug("Obsolete multifile class facades: $obsoleteMultifileClasses") @@ -297,12 +322,12 @@ open class IncrementalCacheImpl( } override fun getStableMultifileFacadeParts(facadeInternalName: String): Collection? { - val partNames = multifileClassFacadeMap.getMultifileClassParts(facadeInternalName) ?: return null + val partNames = multifileFacadeToParts.get(facadeInternalName) ?: return null return partNames.filter { !dirtyOutputClassesMap.isDirty(it) } } override fun getMultifileFacade(partInternalName: String): String? { - return multifileClassPartMap.getFacadeName(partInternalName) + return partToMultifileFacade.get(partInternalName) } override fun getModuleMappingData(): ByteArray? { @@ -443,11 +468,11 @@ open class IncrementalCacheImpl( } private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { - fun add(facadeName: JvmClassName, partNames: Collection) { + operator fun set(facadeName: JvmClassName, partNames: Collection) { storage[facadeName.internalName] = partNames } - fun getMultifileClassParts(facadeName: String): Collection? = storage[facadeName] + operator fun get(facadeName: String): Collection? = storage[facadeName] fun remove(className: JvmClassName) { storage.remove(className.internalName) @@ -457,11 +482,11 @@ open class IncrementalCacheImpl( } private inner class MultifileClassPartMap(storageFile: File) : BasicStringMap(storageFile, EnumeratorStringDescriptor.INSTANCE) { - fun add(partName: String, facadeName: String) { + fun set(partName: String, facadeName: String) { storage[partName] = facadeName } - fun getFacadeName(partName: String): String? { + fun get(partName: String): String? { return storage.get(partName) } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index f40231060b8..67fde1a276f 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1069,6 +1069,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("classToPackageFacade") + public void testClassToPackageFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/"); + doTest(fileName); + } + @TestMetadata("constructorVisibilityChanged") public void testConstructorVisibilityChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/"); @@ -1153,6 +1159,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("packageFacadeToClass") + public void testPackageFacadeToClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/"); + doTest(fileName); + } + @TestMetadata("propertyNullabilityChanged") public void testPropertyNullabilityChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/"); diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt new file mode 100644 index 00000000000..0d0cb607aa5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt @@ -0,0 +1,11 @@ +open class A { + companion object { + @JvmStatic + fun f() {} + + @JvmStatic + fun g() {} + } + + fun h() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/A.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt new file mode 100644 index 00000000000..84330c7a659 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt @@ -0,0 +1,3 @@ +class AChild : A() { + fun j() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt.new.2 new file mode 100644 index 00000000000..418b0d7b34e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/AChild.kt.new.2 @@ -0,0 +1,3 @@ +class AChild { + fun j() {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartF.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartF.kt.new.1 new file mode 100644 index 00000000000..239196110cc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartF.kt.new.1 @@ -0,0 +1,4 @@ +@file:JvmName("A") +@file:JvmMultifileClass + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartG.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartG.kt.new.1 new file mode 100644 index 00000000000..12630fa19af --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/APartG.kt.new.1 @@ -0,0 +1,4 @@ +@file:JvmName("A") +@file:JvmMultifileClass + +fun g() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log new file mode 100644 index 00000000000..11859745d3f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log @@ -0,0 +1,53 @@ +Cleaning output files: +out/production/module/A$Companion.class +out/production/module/A.class +End of files +Compiling files: +src/APartF.kt +src/APartG.kt +End of files +Cleaning output files: +out/production/module/AChild.class +out/production/module/GetAKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseFKt.class +out/production/module/UseGKt.class +out/production/module/UseHKt.class +End of files +Compiling files: +src/AChild.kt +src/getA.kt +src/useF.kt +src/useG.kt +src/useH.kt +End of files +COMPILATION FAILED +Unresolved reference: A +Unresolved reference: A +Unresolved reference: A +Unresolved reference: A + + +Cleaning output files: +out/production/module/A.class +End of files +Cleaning output files: +out/production/module/A__APartFKt.class +out/production/module/A__APartGKt.class +End of files +Compiling files: +src/AChild.kt +src/APartF.kt +src/APartG.kt +src/useF.kt +src/useG.kt +End of files +Cleaning output files: +out/production/module/GetAChildKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseJKt.class +End of files +Compiling files: +src/getAChild.kt +src/useJ.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt new file mode 100644 index 00000000000..bd04874b85b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt @@ -0,0 +1 @@ +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt.delete.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getA.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getAChild.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getAChild.kt new file mode 100644 index 00000000000..ed38025e9ef --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/getAChild.kt @@ -0,0 +1 @@ +fun getAChild() = AChild() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt new file mode 100644 index 00000000000..9bd8424ac7c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt @@ -0,0 +1,3 @@ +fun useF() { + A.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt.new.2 new file mode 100644 index 00000000000..595d5dea9ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useF.kt.new.2 @@ -0,0 +1,3 @@ +fun useF() { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt new file mode 100644 index 00000000000..4582166085a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt @@ -0,0 +1,3 @@ +fun useG() { + A.g() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt.new.2 new file mode 100644 index 00000000000..a27d417106a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useG.kt.new.2 @@ -0,0 +1,3 @@ +fun useG() { + g() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt new file mode 100644 index 00000000000..73891bcb3d8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt @@ -0,0 +1,3 @@ +fun useH() { + getA().h() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt.delete.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useH.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useJ.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useJ.kt new file mode 100644 index 00000000000..9a8084e94cf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/useJ.kt @@ -0,0 +1,3 @@ +fun useJ() { + getAChild().j() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/A.kt.new.1 new file mode 100644 index 00000000000..7d3c7f52835 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/A.kt.new.1 @@ -0,0 +1,9 @@ +class A { + companion object { + @JvmStatic + fun f() {} + + @JvmStatic + fun g() {} + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/AA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/AA.kt new file mode 100644 index 00000000000..9ef19a4fd8e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/AA.kt @@ -0,0 +1,5 @@ +class AA { + companion object { + fun f() {} + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt new file mode 100644 index 00000000000..239196110cc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt @@ -0,0 +1,4 @@ +@file:JvmName("A") +@file:JvmMultifileClass + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt.delete.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartF.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt new file mode 100644 index 00000000000..12630fa19af --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt @@ -0,0 +1,4 @@ +@file:JvmName("A") +@file:JvmMultifileClass + +fun g() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt.delete.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt.delete.1 new file mode 100644 index 00000000000..7d3c7f52835 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/APartG.kt.delete.1 @@ -0,0 +1,9 @@ +class A { + companion object { + @JvmStatic + fun f() {} + + @JvmStatic + fun g() {} + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/UseFJava.java b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/UseFJava.java new file mode 100644 index 00000000000..df661a79b09 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/UseFJava.java @@ -0,0 +1,5 @@ +class UseFJava { + void doUse() { + A.f(); + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log new file mode 100644 index 00000000000..3b8d85ae468 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log @@ -0,0 +1,40 @@ +Cleaning output files: +out/production/module/A.class +out/production/module/A__APartFKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Cleaning output files: +out/production/module/A__APartGKt.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UseFJava.class +out/production/module/UseFKt.class +out/production/module/UseGKt.class +End of files +Compiling files: +src/useF.kt +src/useG.kt +End of files +COMPILATION FAILED +Unresolved reference: f +Unresolved reference: g + + +Cleaning output files: +out/production/module/A.class +End of files +Cleaning output files: +out/production/module/A$Companion.class +End of files +Compiling files: +src/A.kt +src/useF.kt +src/useG.kt +End of files +Compiling files: +src/UseFJava.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useAA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useAA.kt new file mode 100644 index 00000000000..8a4d0ff3e5a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useAA.kt @@ -0,0 +1,3 @@ +fun useAA() { + AA.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt new file mode 100644 index 00000000000..595d5dea9ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt @@ -0,0 +1,3 @@ +fun useF() { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt.new.2 new file mode 100644 index 00000000000..9bd8424ac7c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useF.kt.new.2 @@ -0,0 +1,3 @@ +fun useF() { + A.f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt new file mode 100644 index 00000000000..a27d417106a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt @@ -0,0 +1,3 @@ +fun useG() { + g() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt.new.2 new file mode 100644 index 00000000000..4582166085a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/useG.kt.new.2 @@ -0,0 +1,3 @@ +fun useG() { + A.g() +} \ No newline at end of file From 693be92b925efd347e9e55b19cda371c6b3b9659 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 15 Jan 2016 15:42:23 +0300 Subject: [PATCH 0761/1557] Creating shared module "build", copying lookup storage, tracker and incremental cache related files into it from jps plugin Original commit: 5ead2edaa0691fe79d271f0875c8bf808068de26 --- jps/jps-plugin/jps-plugin.iml | 1 + .../kotlin/jps/build/KotlinBuilder.kt | 69 +- .../jetbrains/kotlin/jps/build/MarkerFile.kt | 2 +- .../kotlin/jps/incremental/CacheVersion.kt | 135 -- .../jps/incremental/CacheVersionProvider.kt | 37 + .../jps/incremental/IncrementalCacheImpl.kt | 652 --------- .../IncrementalCompilationComponentsImpl.kt | 35 - .../incremental/JpsIncrementalCacheImpl.kt | 12 +- .../FileToIdMap.kt => JpsLookupStorage.kt} | 26 +- .../jps/incremental/LocalFileKotlinClass.kt | 52 - .../kotlin/jps/incremental/LookupStorage.kt | 194 --- .../jps/incremental/ProtoCompareGenerated.kt | 1273 ----------------- .../jps/incremental/protoDifferenceUtils.kt | 277 ---- .../jps/incremental/storage/BasicMap.kt | 81 -- .../jps/incremental/storage/BasicMapsOwner.kt | 47 - .../incremental/storage/ClassOneToManyMap.kt | 55 - .../jps/incremental/storage/IdToFileMap.kt | 38 - .../jps/incremental/storage/LazyStorage.kt | 122 -- .../jps/incremental/storage/LookupMap.kt | 42 - .../jps/incremental/storage/externalizers.kt | 233 --- .../kotlin/jps/incremental/storage/values.kt | 56 - .../jps/build/AbstractIncrementalJpsTest.kt | 6 +- .../AbstractIncrementalLazyCachesTest.kt | 8 +- .../classFilesComparison.kt | 2 +- .../AbstractProtoComparisonTest.kt | 6 +- 25 files changed, 94 insertions(+), 3367 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/{storage/FileToIdMap.kt => JpsLookupStorage.kt} (50%) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 69920e17ed0..09a0ac0fec2 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -10,6 +10,7 @@ + diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index edcfde1f205..a0c2c725afa 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -39,6 +39,9 @@ import org.jetbrains.jps.model.ex.JpsElementChildRoleBase import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.kotlin.build.GeneratedFile +import org.jetbrains.kotlin.build.GeneratedJvmClass +import org.jetbrains.kotlin.build.isModuleMappingFile import org.jetbrains.kotlin.cli.common.KotlinVersion import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation @@ -54,10 +57,10 @@ import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.daemon.common.isDaemonEnabled +import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* -import org.jetbrains.kotlin.load.kotlin.ModuleMapping import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.TargetId @@ -67,7 +70,6 @@ import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.utils.JsLibraryUtils import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.keysToMap -import org.jetbrains.kotlin.utils.sure import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.util.* @@ -249,7 +251,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return OK } - val generatedClasses = generatedFiles.filterIsInstance() + val generatedClasses = generatedFiles.filterIsInstance>() updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) if (!IncrementalCompilation.isEnabled()) { @@ -301,7 +303,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { rebuildAfterCacheVersionChanged[target] = true } - dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider).clean() + dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider).clean() return } CacheVersion.Action.REBUILD_CHUNK -> { @@ -333,7 +335,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } CacheVersion.Action.CLEAN_DATA_CONTAINER -> { LOG.info("Clearing lookup cache") - dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider).clean() + dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider).clean() cacheVersionsProvider.dataContainerVersion().clean() } else -> { @@ -353,7 +355,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun doCompileModuleChunk( allCompiledFiles: MutableSet, chunk: ModuleChunk, commonArguments: CommonCompilerArguments, context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, environment: CompilerEnvironment, - filesToCompile: MultiMap, incrementalCaches: Map, + filesToCompile: MultiMap, incrementalCaches: Map>, messageCollector: MessageCollectorAdapter, project: JpsProject ): OutputItemsCollectorImpl? { @@ -398,7 +400,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { context: CompileContext ): CompilerEnvironment { val compilerServices = Services.Builder() - .register(IncrementalCompilationComponents::class.java, IncrementalCompilationComponentsImpl(incrementalCaches, lookupTracker)) + .register(IncrementalCompilationComponents::class.java, + IncrementalCompilationComponentsImpl(incrementalCaches.mapKeys { TargetId(it.key) }, lookupTracker)) .register(CompilationCanceledStatus::class.java, object : CompilationCanceledStatus { override fun checkCanceled() { if (context.cancelStatus.isCanceled) throw CompilationCanceledException() @@ -424,7 +427,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun getGeneratedFiles( chunk: ModuleChunk, outputItemCollector: OutputItemsCollectorImpl - ): List { + ): List> { // If there's only one target, this map is empty: get() always returns null, and the representativeTarget will be used below val sourceToTarget = HashMap() if (chunk.targets.size > 1) { @@ -435,7 +438,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } } - val result = ArrayList() + val result = ArrayList>() val representativeTarget = chunk.representativeTarget() for (outputItem in outputItemCollector.outputs) { @@ -450,7 +453,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { result.add(GeneratedJvmClass(target, sourceFiles, outputFile)) } else { - result.add(GeneratedFile(target, sourceFiles, outputFile)) + result.add(GeneratedFile(target, sourceFiles, outputFile)) } } return result @@ -462,7 +465,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, filesToCompile: MultiMap, - generatedClasses: List + generatedClasses: List> ) { val previousMappings = context.projectDescriptor.dataManager.mappings val delta = previousMappings.createDelta() @@ -481,7 +484,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound) } - private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, generatedFiles: List) { + private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, generatedFiles: List>) { for (generatedFile in generatedFiles) { outputConsumer.registerOutputFile(generatedFile.target, generatedFile.outputFile, generatedFile.sourceFiles.map { it.path }) } @@ -489,8 +492,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun updateKotlinIncrementalCache( compilationErrors: Boolean, - incrementalCaches: Map, - generatedFiles: List + incrementalCaches: Map, + generatedFiles: List> ): CompilationResult { assert(IncrementalCompilation.isEnabled()) { "updateKotlinIncrementalCache should not be called when incremental compilation disabled" } @@ -499,7 +502,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { for (generatedFile in generatedFiles) { val ic = incrementalCaches[generatedFile.target]!! val newChangesInfo = - if (generatedFile is GeneratedJvmClass) { + if (generatedFile is GeneratedJvmClass) { ic.saveFileToCache(generatedFile) } else if (generatedFile.outputFile.isModuleMappingFile()) { @@ -533,7 +536,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker.javaClass}") - val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) + val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) filesToCompile.values().forEach { lookupStorage.removeLookupsFrom(it) } val removedFiles = chunk.targets.flatMap { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it) } @@ -542,8 +545,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { lookupTracker.lookups.entrySet().forEach { lookupStorage.add(it.key, it.value) } } - private fun File.isModuleMappingFile() = extension == ModuleMapping.MAPPING_FILE_EXT && parentFile.name == "META-INF" - // if null is returned, nothing was done private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, @@ -740,12 +741,11 @@ private fun CompilationResult.doProcessChangesUsingLookups( compiledFiles: Set, dataManager: BuildDataManager, fsOperations: FSOperationsHelper, - caches: Collection + caches: Collection> ) { val dirtyLookupSymbols = HashSet() - val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) - val allCaches = caches.toHashSet() - allCaches.addAll(caches.flatMap { it.dependentCaches }) + val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) + val allCaches: Sequence> = caches.asSequence().flatMap { it.dependentsWithThis } KotlinBuilder.LOG.debug("Start processing changes") @@ -797,7 +797,7 @@ private fun CompilationResult.doProcessChangesUsingLookups( */ private fun withSubtypes( typeFqName: FqName, - caches: Collection + caches: Sequence> ): Set { val types = linkedListOf(typeFqName) val subtypes = hashSetOf() @@ -805,10 +805,9 @@ private fun withSubtypes( while (types.isNotEmpty()) { val unprocessedType = types.pollFirst() - caches.asSequence() - .flatMap { it.getSubtypesOf(unprocessedType) } - .filter { it !in subtypes } - .forEach { types.addLast(it) } + caches.flatMap { it.getSubtypesOf(unprocessedType) } + .filter { it !in subtypes } + .forEach { types.addLast(it) } subtypes.add(unprocessedType) } @@ -915,22 +914,6 @@ private fun hasKotlinDirtyOrRemovedFiles( return chunk.targets.any { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isNotEmpty() } } -open class GeneratedFile internal constructor( - val target: ModuleBuildTarget, - val sourceFiles: Collection, - val outputFile: File -) - -class GeneratedJvmClass ( - target: ModuleBuildTarget, - sourceFiles: Collection, - outputFile: File -) : GeneratedFile(target, sourceFiles, outputFile) { - val outputClass = LocalFileKotlinClass.create(outputFile).sure { - "Couldn't load KotlinClass from $outputFile; it may happen because class doesn't have valid Kotlin annotations" - } -} - private inline fun Iterable.forAllPairs(other: Iterable, fn: (T, R)->Unit) { for (t in this) { for (r in other) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt index 649bbe39177..7f0e8231008 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MarkerFile.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager -import org.jetbrains.kotlin.jps.incremental.KOTLIN_CACHE_DIRECTORY_NAME +import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME import java.io.File private val HAS_KOTLIN_MARKER_FILE_NAME = "has-kotlin-marker.txt" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt deleted file mode 100644 index a2abb79eceb..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersion.kt +++ /dev/null @@ -1,135 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental - -import org.jetbrains.annotations.TestOnly -import org.jetbrains.jps.builders.BuildTarget -import org.jetbrains.jps.builders.storage.BuildDataPaths -import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.jps.incremental.CacheVersion.Action -import org.jetbrains.kotlin.load.java.JvmBytecodeBinaryVersion -import org.jetbrains.kotlin.load.kotlin.JvmMetadataVersion -import java.io.File - -private val NORMAL_VERSION = 8 -private val EXPERIMENTAL_VERSION = 2 -private val DATA_CONTAINER_VERSION = 1 - -private val NORMAL_VERSION_FILE_NAME = "format-version.txt" -private val EXPERIMENTAL_VERSION_FILE_NAME = "experimental-format-version.txt" -private val DATA_CONTAINER_VERSION_FILE_NAME = "data-container-format-version.txt" - -class CacheVersion( - private val ownVersion: Int, - private val versionFile: File, - private val whenVersionChanged: CacheVersion.Action, - private val whenTurnedOn: CacheVersion.Action, - private val whenTurnedOff: CacheVersion.Action, - isEnabled: ()->Boolean -) { - private val isEnabled by lazy(isEnabled) - - private val actualVersion: Int - get() = versionFile.readText().toInt() - - private val expectedVersion: Int - get() { - val metadata = JvmMetadataVersion.INSTANCE - val bytecode = JvmBytecodeBinaryVersion.INSTANCE - return ownVersion * 1000000 + - bytecode.major * 10000 + bytecode.minor * 100 + - metadata.major * 1000 + metadata.minor - } - - fun checkVersion(): Action = - when (versionFile.exists() to isEnabled) { - true to true -> if (actualVersion != expectedVersion) whenVersionChanged else Action.DO_NOTHING - false to true -> whenTurnedOn - true to false -> whenTurnedOff - else -> Action.DO_NOTHING - } - - fun saveIfNeeded() { - if (!isEnabled) return - - if (!versionFile.parentFile.exists()) { - versionFile.parentFile.mkdirs() - } - - versionFile.writeText(expectedVersion.toString()) - } - - fun clean() { - versionFile.delete() - } - - @get:TestOnly - val formatVersionFile: File - get() = versionFile - - // Order of entries is important, because actions are sorted in KotlinBuilder::checkVersions - enum class Action { - REBUILD_ALL_KOTLIN, - REBUILD_CHUNK, - CLEAN_NORMAL_CACHES, - CLEAN_EXPERIMENTAL_CACHES, - CLEAN_DATA_CONTAINER, - DO_NOTHING - } -} - -class CacheVersionProvider(private val paths: BuildDataPaths) { - private val BuildTarget<*>.dataRoot: File - get() = paths.getTargetDataRoot(this) - - fun normalVersion(target: ModuleBuildTarget): CacheVersion = - CacheVersion(ownVersion = NORMAL_VERSION, - versionFile = File(target.dataRoot, NORMAL_VERSION_FILE_NAME), - whenVersionChanged = Action.REBUILD_CHUNK, - whenTurnedOn = Action.REBUILD_CHUNK, - whenTurnedOff = Action.CLEAN_NORMAL_CACHES, - isEnabled = { IncrementalCompilation.isEnabled() }) - - fun experimentalVersion(target: ModuleBuildTarget): CacheVersion = - CacheVersion(ownVersion = EXPERIMENTAL_VERSION, - versionFile = File(target.dataRoot, EXPERIMENTAL_VERSION_FILE_NAME), - whenVersionChanged = Action.REBUILD_CHUNK, - whenTurnedOn = Action.REBUILD_CHUNK, - whenTurnedOff = Action.CLEAN_EXPERIMENTAL_CACHES, - isEnabled = { IncrementalCompilation.isExperimental() }) - - fun dataContainerVersion(): CacheVersion = - CacheVersion(ownVersion = DATA_CONTAINER_VERSION, - versionFile = File(KotlinDataContainerTarget.dataRoot, DATA_CONTAINER_VERSION_FILE_NAME), - whenVersionChanged = Action.REBUILD_ALL_KOTLIN, - whenTurnedOn = Action.REBUILD_ALL_KOTLIN, - whenTurnedOff = Action.CLEAN_DATA_CONTAINER, - isEnabled = { IncrementalCompilation.isExperimental() }) - - fun allVersions(targets: Iterable): Iterable { - val versions = arrayListOf() - versions.add(dataContainerVersion()) - - for (target in targets) { - versions.add(normalVersion(target)) - versions.add(experimentalVersion(target)) - } - - return versions - } -} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt new file mode 100644 index 00000000000..81652efe9aa --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2015 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.kotlin.jps.incremental + +import org.jetbrains.jps.builders.BuildTarget +import org.jetbrains.jps.builders.storage.BuildDataPaths +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.kotlin.incremental.* +import java.io.File + + +class CacheVersionProvider(private val paths: BuildDataPaths) { + private val BuildTarget<*>.dataRoot: File + get() = paths.getTargetDataRoot(this) + + fun normalVersion(target: ModuleBuildTarget): CacheVersion = normalCacheVersion(target.dataRoot) + + fun experimentalVersion(target: ModuleBuildTarget): CacheVersion = experimentalCacheVersion(target.dataRoot) + + fun dataContainerVersion(): CacheVersion = dataContainerCacheVersion(KotlinDataContainerTarget.dataRoot) + + fun allVersions(targets: Iterable): Iterable = allCachesVersions(KotlinDataContainerTarget.dataRoot, targets.map { it.dataRoot } ) +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt deleted file mode 100644 index 5b4157eab37..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCacheImpl.kt +++ /dev/null @@ -1,652 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental - -import com.google.protobuf.MessageLite -import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName -import com.intellij.util.SmartList -import com.intellij.util.io.BooleanDataDescriptor -import com.intellij.util.io.EnumeratorStringDescriptor -import org.jetbrains.annotations.TestOnly -import org.jetbrains.jps.builders.storage.BuildDataPaths -import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.jps.incremental.storage.PathStringDescriptor -import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.jps.build.GeneratedJvmClass -import org.jetbrains.kotlin.jps.build.KotlinBuilder -import org.jetbrains.kotlin.jps.incremental.storage.* -import org.jetbrains.kotlin.load.kotlin.ModuleMapping -import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.components.JvmPackagePartProto -import org.jetbrains.kotlin.name.FqName -import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.kotlin.serialization.deserialization.TypeTable -import org.jetbrains.kotlin.serialization.deserialization.supertypes -import org.jetbrains.kotlin.serialization.jvm.BitEncoding -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil -import org.jetbrains.org.objectweb.asm.ClassReader -import org.jetbrains.org.objectweb.asm.ClassVisitor -import org.jetbrains.org.objectweb.asm.FieldVisitor -import org.jetbrains.org.objectweb.asm.Opcodes -import java.io.File -import java.security.MessageDigest -import java.util.* - -val KOTLIN_CACHE_DIRECTORY_NAME = "kotlin" - -open class IncrementalCacheImpl( - private val target: ModuleBuildTarget, - paths: BuildDataPaths -) : BasicMapsOwner(), IncrementalCache { - companion object { - private val PROTO_MAP = "proto" - private val CONSTANTS_MAP = "constants" - private val PACKAGE_PARTS = "package-parts" - private val MULTIFILE_CLASS_FACADES = "multifile-class-facades" - private val MULTIFILE_CLASS_PARTS = "multifile-class-parts" - private val SOURCE_TO_CLASSES = "source-to-classes" - private val DIRTY_OUTPUT_CLASSES = "dirty-output-classes" - private val SUBTYPES = "subtypes" - private val SUPERTYPES = "supertypes" - - private val MODULE_MAPPING_FILE_NAME = "." + ModuleMapping.MAPPING_FILE_EXT - } - - private val baseDir = File(paths.getTargetDataRoot(target), KOTLIN_CACHE_DIRECTORY_NAME) - private val cacheVersionProvider = CacheVersionProvider(paths) - private val experimentalMaps = arrayListOf>() - - private fun > registerExperimentalMap(map: M): M { - experimentalMaps.add(map) - return registerMap(map) - } - - protected val String.storageFile: File - get() = File(baseDir, this + "." + CACHE_EXTENSION) - - private val protoMap = registerMap(ProtoMap(PROTO_MAP.storageFile)) - private val constantsMap = registerMap(ConstantsMap(CONSTANTS_MAP.storageFile)) - private val packagePartMap = registerMap(PackagePartMap(PACKAGE_PARTS.storageFile)) - private val multifileFacadeToParts = registerMap(MultifileClassFacadeMap(MULTIFILE_CLASS_FACADES.storageFile)) - private val partToMultifileFacade = registerMap(MultifileClassPartMap(MULTIFILE_CLASS_PARTS.storageFile)) - private val sourceToClassesMap = registerMap(SourceToClassesMap(SOURCE_TO_CLASSES.storageFile)) - private val dirtyOutputClassesMap = registerMap(DirtyOutputClassesMap(DIRTY_OUTPUT_CLASSES.storageFile)) - private val subtypesMap = registerExperimentalMap(SubtypesMap(SUBTYPES.storageFile)) - private val supertypesMap = registerExperimentalMap(SupertypesMap(SUPERTYPES.storageFile)) - - private val dependents = arrayListOf() - private val outputDir by lazy(LazyThreadSafetyMode.NONE) { requireNotNull(target.outputDir) { "Target is expected to have output directory: $target" } } - - protected val dependentsWithThis: Sequence - get() = sequenceOf(this).plus(dependents.asSequence()) - - internal val dependentCaches: Iterable - get() = dependents - - override fun registerInline(fromPath: String, jvmSignature: String, toPath: String) { - } - - fun addDependentCache(cache: IncrementalCacheImpl) { - dependents.add(cache) - } - - fun markOutputClassesDirty(removedAndCompiledSources: List) { - for (sourceFile in removedAndCompiledSources) { - val classes = sourceToClassesMap[sourceFile] - classes.forEach { - dirtyOutputClassesMap.markDirty(it.internalName) - } - - sourceToClassesMap.clearOutputsForSource(sourceFile) - } - } - - fun getSubtypesOf(className: FqName): Sequence = - subtypesMap[className].asSequence() - - override fun getClassFilePath(internalClassName: String): String { - return toSystemIndependentName(File(outputDir, "$internalClassName.class").canonicalPath) - } - - fun saveModuleMappingToCache(sourceFiles: Collection, file: File): CompilationResult { - val jvmClassName = JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME) - protoMap.process(jvmClassName, file.readBytes(), emptyArray(), isPackage = false, checkChangesIsOpenPart = false) - dirtyOutputClassesMap.notDirty(MODULE_MAPPING_FILE_NAME) - sourceFiles.forEach { sourceToClassesMap.add(it, jvmClassName) } - return CompilationResult.NO_CHANGES - } - - fun saveFileToCache(generatedClass: GeneratedJvmClass): CompilationResult { - val sourceFiles: Collection = generatedClass.sourceFiles - val kotlinClass: LocalFileKotlinClass = generatedClass.outputClass - val className = kotlinClass.className - - dirtyOutputClassesMap.notDirty(className.internalName) - sourceFiles.forEach { - sourceToClassesMap.add(it, className) - } - - if (kotlinClass.classId.isLocal) { - return CompilationResult.NO_CHANGES - } - - val header = kotlinClass.classHeader - val changesInfo = when (header.kind) { - KotlinClassHeader.Kind.FILE_FACADE -> { - assert(sourceFiles.size == 1) { "Package part from several source files: $sourceFiles" } - packagePartMap.addPackagePart(className) - - protoMap.process(kotlinClass, isPackage = true) + - constantsMap.process(kotlinClass) + - additionalProcessChangedClass(kotlinClass, isPackage = true) - } - KotlinClassHeader.Kind.MULTIFILE_CLASS -> { - val partNames = kotlinClass.classHeader.data?.toList() - ?: throw AssertionError("Multifile class has no parts: ${kotlinClass.className}") - multifileFacadeToParts[className] = partNames - // When a class is replaced with a facade with the same name, - // the class' proto wouldn't ever be deleted, - // because we don't write proto for multifile facades. - // As a workaround we can remove proto values for multifile facades. - protoMap.remove(className) - - // TODO NO_CHANGES? (delegates only) - constantsMap.process(kotlinClass) + - additionalProcessChangedClass(kotlinClass, isPackage = true) - } - KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> { - assert(sourceFiles.size == 1) { "Multifile class part from several source files: $sourceFiles" } - packagePartMap.addPackagePart(className) - partToMultifileFacade.set(className.internalName, header.multifileClassName!!) - - protoMap.process(kotlinClass, isPackage = true) + - constantsMap.process(kotlinClass) + - additionalProcessChangedClass(kotlinClass, isPackage = true) - } - KotlinClassHeader.Kind.CLASS -> { - addToClassStorage(kotlinClass) - - protoMap.process(kotlinClass, isPackage = false) + - constantsMap.process(kotlinClass) + - additionalProcessChangedClass(kotlinClass, isPackage = false) - } - else -> CompilationResult.NO_CHANGES - } - - changesInfo.logIfSomethingChanged(className) - return changesInfo - } - - protected open fun additionalProcessChangedClass(kotlinClass: LocalFileKotlinClass, isPackage: Boolean) = CompilationResult.NO_CHANGES - - private fun CompilationResult.logIfSomethingChanged(className: JvmClassName) { - if (this == CompilationResult.NO_CHANGES) return - - KotlinBuilder.LOG.debug("$className is changed: $this") - } - - fun clearCacheForRemovedClasses(): CompilationResult { - - fun T.getNonPrivateNames(nameResolver: NameResolver, vararg members: T.() -> List): Set = - members.flatMap { this.it().filterNot { it.isPrivate }.names(nameResolver) }.toSet() - - fun createChangeInfo(className: JvmClassName): ChangeInfo? { - if (className.internalName == MODULE_MAPPING_FILE_NAME) return null - - val mapValue = protoMap.get(className) ?: return null - - return when { - mapValue.isPackageFacade -> { - val packageData = JvmProtoBufUtil.readPackageDataFrom(mapValue.bytes, mapValue.strings) - - val memberNames = - packageData.packageProto.getNonPrivateNames( - packageData.nameResolver, - ProtoBuf.Package::getFunctionList, - ProtoBuf.Package::getPropertyList - ) - - ChangeInfo.Removed(className.packageFqName, memberNames) - } - else -> { - val classData = JvmProtoBufUtil.readClassDataFrom(mapValue.bytes, mapValue.strings) - - val memberNames = - classData.classProto.getNonPrivateNames( - classData.nameResolver, - ProtoBuf.Class::getConstructorList, - ProtoBuf.Class::getFunctionList, - ProtoBuf.Class::getPropertyList - ) + classData.classProto.enumEntryList.map { classData.nameResolver.getString(it.name) } - - ChangeInfo.Removed(className.fqNameForClassNameWithoutDollars, memberNames) - } - } - } - - val dirtyClasses = dirtyOutputClassesMap - .getDirtyOutputClasses() - .map(JvmClassName::byInternalName) - .toList() - - val changes = - if (IncrementalCompilation.isExperimental()) - dirtyClasses.mapNotNull { createChangeInfo(it) }.asSequence() - else - emptySequence() - - val changesInfo = dirtyClasses.fold(CompilationResult(changes = changes)) { info, className -> - val newInfo = CompilationResult(protoChanged = className in protoMap, - constantsChanged = className in constantsMap) - newInfo.logIfSomethingChanged(className) - info + newInfo - } - - val facadesWithRemovedParts = hashMapOf>() - for (dirtyClass in dirtyClasses) { - val facade = partToMultifileFacade.get(dirtyClass.internalName) ?: continue - val facadeClassName = JvmClassName.byInternalName(facade) - val removedParts = facadesWithRemovedParts.getOrPut(facadeClassName) { hashSetOf() } - removedParts.add(dirtyClass.internalName) - } - - for ((facade, removedParts) in facadesWithRemovedParts.entries) { - val allParts = multifileFacadeToParts[facade.internalName] ?: continue - val notRemovedParts = allParts.filter { it !in removedParts } - - if (notRemovedParts.isEmpty()) { - multifileFacadeToParts.remove(facade) - } - else { - multifileFacadeToParts[facade] = notRemovedParts - } - } - - dirtyClasses.forEach { - protoMap.remove(it) - packagePartMap.remove(it) - multifileFacadeToParts.remove(it) - partToMultifileFacade.remove(it) - constantsMap.remove(it) - } - - additionalProcessRemovedClasses(dirtyClasses) - - removeAllFromClassStorage(dirtyClasses) - - dirtyOutputClassesMap.clean() - return changesInfo - } - - protected open fun additionalProcessRemovedClasses(dirtyClasses: List) { - } - - override fun getObsoletePackageParts(): Collection { - val obsoletePackageParts = - dirtyOutputClassesMap.getDirtyOutputClasses().filter { packagePartMap.isPackagePart(JvmClassName.byInternalName(it)) } - KotlinBuilder.LOG.debug("Obsolete package parts: ${obsoletePackageParts}") - return obsoletePackageParts - } - - override fun getPackagePartData(partInternalName: String): JvmPackagePartProto? { - return protoMap[JvmClassName.byInternalName(partInternalName)]?.let { value -> - JvmPackagePartProto(value.bytes, value.strings) - } - } - - override fun getObsoleteMultifileClasses(): Collection { - val obsoleteMultifileClasses = linkedSetOf() - for (dirtyClass in dirtyOutputClassesMap.getDirtyOutputClasses()) { - val dirtyFacade = partToMultifileFacade.get(dirtyClass) ?: continue - obsoleteMultifileClasses.add(dirtyFacade) - } - KotlinBuilder.LOG.debug("Obsolete multifile class facades: $obsoleteMultifileClasses") - return obsoleteMultifileClasses - } - - override fun getStableMultifileFacadeParts(facadeInternalName: String): Collection? { - val partNames = multifileFacadeToParts.get(facadeInternalName) ?: return null - return partNames.filter { !dirtyOutputClassesMap.isDirty(it) } - } - - override fun getMultifileFacade(partInternalName: String): String? { - return partToMultifileFacade.get(partInternalName) - } - - override fun getModuleMappingData(): ByteArray? { - return protoMap[JvmClassName.byInternalName(MODULE_MAPPING_FILE_NAME)]?.bytes - } - - override fun clean() { - super.clean() - cacheVersionProvider.normalVersion(target).clean() - cacheVersionProvider.experimentalVersion(target).clean() - } - - fun cleanExperimental() { - cacheVersionProvider.experimentalVersion(target).clean() - experimentalMaps.forEach { it.clean() } - } - - private inner class ProtoMap(storageFile: File) : BasicStringMap(storageFile, ProtoMapValueExternalizer) { - - fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { - val header = kotlinClass.classHeader - val bytes = BitEncoding.decodeBytes(header.data!!) - return put(kotlinClass.className, bytes, header.strings!!, isPackage, checkChangesIsOpenPart = true) - } - - fun process(className: JvmClassName, data: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean): CompilationResult { - return put(className, data, strings, isPackage, checkChangesIsOpenPart) - } - - private fun put( - className: JvmClassName, bytes: ByteArray, strings: Array, isPackage: Boolean, checkChangesIsOpenPart: Boolean - ): CompilationResult { - val key = className.internalName - val oldData = storage[key] - val data = ProtoMapValue(isPackage, bytes, strings) - - if (oldData == null || - !Arrays.equals(bytes, oldData.bytes) || - !Arrays.equals(strings, oldData.strings) || - isPackage != oldData.isPackageFacade - ) { - storage[key] = data - } - - if (oldData == null || !checkChangesIsOpenPart) return CompilationResult(protoChanged = true) - - val difference = difference(oldData, data) - val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars - val changeList = SmartList() - - if (difference.isClassAffected) { - changeList.add(ChangeInfo.SignatureChanged(fqName, difference.areSubclassesAffected)) - } - - if (difference.changedMembersNames.isNotEmpty()) { - changeList.add(ChangeInfo.MembersChanged(fqName, difference.changedMembersNames)) - } - - return CompilationResult(protoChanged = changeList.isNotEmpty(), changes = changeList.asSequence()) - } - - operator fun contains(className: JvmClassName): Boolean = - className.internalName in storage - - operator fun get(className: JvmClassName): ProtoMapValue? = - storage[className.internalName] - - fun remove(className: JvmClassName) { - storage.remove(className.internalName) - } - - override fun dumpValue(value: ProtoMapValue): String { - return (if (value.isPackageFacade) "1" else "0") + java.lang.Long.toHexString(value.bytes.md5()) - } - } - - private inner class ConstantsMap(storageFile: File) : BasicStringMap>(storageFile, ConstantsMapExternalizer) { - private fun getConstantsMap(bytes: ByteArray): Map? { - val result = HashMap() - - ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { - override fun visitField(access: Int, name: String, desc: String, signature: String?, value: Any?): FieldVisitor? { - val staticFinal = Opcodes.ACC_STATIC or Opcodes.ACC_FINAL or Opcodes.ACC_PRIVATE - if (value != null && access and staticFinal == Opcodes.ACC_STATIC or Opcodes.ACC_FINAL) { - result[name] = value - } - return null - } - }, ClassReader.SKIP_CODE or ClassReader.SKIP_DEBUG or ClassReader.SKIP_FRAMES) - - return if (result.isEmpty()) null else result - } - - operator fun contains(className: JvmClassName): Boolean = - className.internalName in storage - - fun process(kotlinClass: LocalFileKotlinClass): CompilationResult { - return put(kotlinClass.className, getConstantsMap(kotlinClass.fileContents)) - } - - private fun put(className: JvmClassName, constantsMap: Map?): CompilationResult { - val key = className.internalName - - val oldMap = storage[key] - if (oldMap == constantsMap) return CompilationResult.NO_CHANGES - - if (constantsMap != null) { - storage[key] = constantsMap - } - else { - storage.remove(key) - } - - return CompilationResult(constantsChanged = true) - } - - fun remove(className: JvmClassName) { - put(className, null) - } - - override fun dumpValue(value: Map): String = - value.dumpMap(Any::toString) - } - - private inner class PackagePartMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { - fun addPackagePart(className: JvmClassName) { - storage[className.internalName] = true - } - - fun remove(className: JvmClassName) { - storage.remove(className.internalName) - } - - fun isPackagePart(className: JvmClassName): Boolean = - className.internalName in storage - - override fun dumpValue(value: Boolean) = "" - } - - private inner class MultifileClassFacadeMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { - operator fun set(facadeName: JvmClassName, partNames: Collection) { - storage[facadeName.internalName] = partNames - } - - operator fun get(facadeName: String): Collection? = storage[facadeName] - - fun remove(className: JvmClassName) { - storage.remove(className.internalName) - } - - override fun dumpValue(value: Collection): String = value.dumpCollection() - } - - private inner class MultifileClassPartMap(storageFile: File) : BasicStringMap(storageFile, EnumeratorStringDescriptor.INSTANCE) { - fun set(partName: String, facadeName: String) { - storage[partName] = facadeName - } - - fun get(partName: String): String? { - return storage.get(partName) - } - - fun remove(className: JvmClassName) { - storage.remove(className.internalName) - } - - override fun dumpValue(value: String): String = value - } - - private inner class SourceToClassesMap(storageFile: File) : BasicStringMap>(storageFile, PathStringDescriptor.INSTANCE, StringCollectionExternalizer) { - fun clearOutputsForSource(sourceFile: File) { - remove(sourceFile.absolutePath) - } - - fun add(sourceFile: File, className: JvmClassName) { - storage.append(sourceFile.absolutePath, className.internalName) - } - - operator fun get(sourceFile: File): Collection = - storage[sourceFile.absolutePath].orEmpty().map { JvmClassName.byInternalName(it) } - - override fun dumpValue(value: Collection) = value.dumpCollection() - - override fun clean() { - storage.keys.forEach { remove(it) } - } - - private fun remove(path: String) { - storage.remove(path) - } - } - - private fun addToClassStorage(kotlinClass: LocalFileKotlinClass) { - if (!IncrementalCompilation.isExperimental()) return - - val classData = JvmProtoBufUtil.readClassDataFrom(kotlinClass.classHeader.data!!, kotlinClass.classHeader.strings!!) - val supertypes = classData.classProto.supertypes(TypeTable(classData.classProto.typeTable)) - val parents = supertypes.map { classData.nameResolver.getClassId(it.className).asSingleFqName() } - .filter { it.asString() != "kotlin.Any" } - .toSet() - val child = kotlinClass.classId.asSingleFqName() - - parents.forEach { subtypesMap.add(it, child) } - - val removedSupertypes = supertypesMap[child].filter { it !in parents } - removedSupertypes.forEach { subtypesMap.removeValues(it, setOf(child)) } - - supertypesMap[child] = parents - } - - private fun removeAllFromClassStorage(removedClasses: Collection) { - if (!IncrementalCompilation.isExperimental() || removedClasses.isEmpty()) return - - val removedFqNames = removedClasses.map { it.fqNameForClassNameWithoutDollars }.toSet() - - for (cache in dependentsWithThis) { - val parentsFqNames = hashSetOf() - val childrenFqNames = hashSetOf() - - for (removedFqName in removedFqNames) { - parentsFqNames.addAll(cache.supertypesMap[removedFqName]) - childrenFqNames.addAll(cache.subtypesMap[removedFqName]) - - cache.supertypesMap.remove(removedFqName) - cache.subtypesMap.remove(removedFqName) - } - - for (child in childrenFqNames) { - cache.supertypesMap.removeValues(child, removedFqNames) - } - - for (parent in parentsFqNames) { - cache.subtypesMap.removeValues(parent, removedFqNames) - } - } - } - - private inner class DirtyOutputClassesMap(storageFile: File) : BasicStringMap(storageFile, BooleanDataDescriptor.INSTANCE) { - fun markDirty(className: String) { - storage[className] = true - } - - fun notDirty(className: String) { - storage.remove(className) - } - - fun getDirtyOutputClasses(): Collection = - storage.keys - - fun isDirty(className: String): Boolean = - storage.contains(className) - - override fun dumpValue(value: Boolean) = "" - } -} - -sealed class ChangeInfo(val fqName: FqName) { - open class MembersChanged(fqName: FqName, val names: Collection) : ChangeInfo(fqName) { - override fun toStringProperties(): String = super.toStringProperties() + ", names = $names" - } - - class Removed(fqName: FqName, names: Collection) : MembersChanged(fqName, names) - - class SignatureChanged(fqName: FqName, val areSubclassesAffected: Boolean) : ChangeInfo(fqName) - - - protected open fun toStringProperties(): String = "fqName = $fqName" - - override fun toString(): String { - return this.javaClass.simpleName + "(${toStringProperties()})" - } -} - -data class CompilationResult( - val protoChanged: Boolean = false, - val constantsChanged: Boolean = false, - val inlineChanged: Boolean = false, - val inlineAdded: Boolean = false, - val changes: Sequence = emptySequence() -) { - companion object { - val NO_CHANGES: CompilationResult = CompilationResult() - } - - operator fun plus(other: CompilationResult): CompilationResult = - CompilationResult(protoChanged || other.protoChanged, - constantsChanged || other.constantsChanged, - inlineChanged || other.inlineChanged, - inlineAdded || other.inlineAdded, - changes + other.changes) -} - -fun ByteArray.md5(): Long { - val d = MessageDigest.getInstance("MD5").digest(this)!! - return ((d[0].toLong() and 0xFFL) - or ((d[1].toLong() and 0xFFL) shl 8) - or ((d[2].toLong() and 0xFFL) shl 16) - or ((d[3].toLong() and 0xFFL) shl 24) - or ((d[4].toLong() and 0xFFL) shl 32) - or ((d[5].toLong() and 0xFFL) shl 40) - or ((d[6].toLong() and 0xFFL) shl 48) - or ((d[7].toLong() and 0xFFL) shl 56) - ) -} - -@TestOnly -fun , V> Map.dumpMap(dumpValue: (V)->String): String = - buildString { - append("{") - for (key in keys.sorted()) { - if (length != 1) { - append(", ") - } - - val value = get(key)?.let(dumpValue) ?: "null" - append("$key -> $value") - } - append("}") - } - -@TestOnly fun > Collection.dumpCollection(): String = - "[${sorted().joinToString(", ", transform = Any::toString)}]" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt deleted file mode 100644 index 7214001281f..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/IncrementalCompilationComponentsImpl.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental - -import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -import org.jetbrains.kotlin.modules.TargetId - -class IncrementalCompilationComponentsImpl( - caches: Map, - private val lookupTracker: LookupTracker -): IncrementalCompilationComponents { - private val caches = caches.mapKeys { TargetId(it.key) } - - override fun getIncrementalCache(target: TargetId): IncrementalCache = - caches[target]!! - - override fun getLookupTracker(): LookupTracker = lookupTracker -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt index 601e45a2f62..6653b066084 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt @@ -24,8 +24,10 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.incremental.* +import org.jetbrains.kotlin.incremental.storage.* import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames -import org.jetbrains.kotlin.jps.incremental.storage.* +import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.org.objectweb.asm.* import java.io.File @@ -34,7 +36,7 @@ import java.util.* class JpsIncrementalCacheImpl( target: ModuleBuildTarget, paths: BuildDataPaths -) : IncrementalCacheImpl(target, paths), StorageOwner { +) : IncrementalCacheImpl(paths.getTargetDataRoot(target), target.outputDir, target), StorageOwner { private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) @@ -46,6 +48,10 @@ class JpsIncrementalCacheImpl( } } + override fun debugLog(message: String) { + KotlinBuilder.LOG.debug(message) + } + override fun additionalProcessChangedClass(kotlinClass: LocalFileKotlinClass, isPackage: Boolean) = inlineFunctionsMap.process(kotlinClass, isPackage) @@ -173,7 +179,7 @@ class JpsIncrementalCacheImpl( * * inlineFunction - jvmSignature of some inline function in source file * * target files - collection of files inlineFunction has been inlined to */ - private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { + private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathStringCollectionExternalizer) { fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val key = PathFunctionPair(sourcePath, jvmSignature) storage.append(key, targetPath) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsLookupStorage.kt similarity index 50% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsLookupStorage.kt index fdae86816b5..3268002254b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/FileToIdMap.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsLookupStorage.kt @@ -14,25 +14,15 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.incremental.storage +package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.kotlin.utils.keysToMap +import org.jetbrains.jps.builders.storage.StorageProvider +import org.jetbrains.jps.incremental.storage.StorageOwner +import org.jetbrains.kotlin.incremental.LookupStorage import java.io.File -internal class FileToIdMap(file: File) : BasicMap(file, FileKeyDescriptor, IntExternalizer) { - override fun dumpKey(key: File): String = key.toString() - - override fun dumpValue(value: Int): String = value.toString() - - operator fun get(file: File): Int? = storage[file] - - operator fun set(file: File, id: Int) { - storage[file] = id - } - - fun remove(file: File) { - storage.remove(file) - } - - fun toMap(): Map = storage.keys.keysToMap { storage[it]!! } +object JpsLookupStorageProvider : StorageProvider() { + override fun createStorage(targetDataDir: File): JpsLookupStorage = JpsLookupStorage(targetDataDir) } + +class JpsLookupStorage(targetDataDir: File) : StorageOwner, LookupStorage(targetDataDir) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt deleted file mode 100644 index 356b58443eb..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LocalFileKotlinClass.kt +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental - -import org.jetbrains.kotlin.load.kotlin.FileBasedKotlinClass -import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader -import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import java.io.File - -class LocalFileKotlinClass private constructor( - private val file: File, - private val fileContents: ByteArray, - className: ClassId, - classHeader: KotlinClassHeader, - innerClasses: FileBasedKotlinClass.InnerClassesInfo -) : FileBasedKotlinClass(className, classHeader, innerClasses) { - - companion object { - fun create(file: File): LocalFileKotlinClass? { - val fileContents = file.readBytes() - return FileBasedKotlinClass.create(fileContents) { - className, classHeader, innerClasses -> - LocalFileKotlinClass(file, fileContents, className, classHeader, innerClasses) - } - } - } - - val className: JvmClassName by lazy { JvmClassName.byClassId(classId) } - - override fun getLocation(): String = file.absolutePath - - public override fun getFileContents(): ByteArray = fileContents - - override fun hashCode(): Int = file.hashCode() - override fun equals(other: Any?): Boolean = other is LocalFileKotlinClass && file == other.file - override fun toString(): String = "$javaClass: $file" -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt deleted file mode 100644 index 27110d361d1..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/LookupStorage.kt +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental - -import com.intellij.util.containers.MultiMap -import org.jetbrains.annotations.TestOnly -import org.jetbrains.jps.builders.storage.StorageProvider -import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.incremental.components.Position -import org.jetbrains.kotlin.incremental.components.ScopeKind -import org.jetbrains.kotlin.jps.incremental.storage.* -import org.jetbrains.kotlin.utils.Printer -import java.io.File -import java.util.* - -object LookupStorageProvider : StorageProvider() { - override fun createStorage(targetDataDir: File): LookupStorage = LookupStorage(targetDataDir) -} - -class LookupStorage(private val targetDataDir: File) : BasicMapsOwner() { - companion object { - private val DELETED_TO_SIZE_TRESHOLD = 0.5 - private val MINIMUM_GARBAGE_COLLECTIBLE_SIZE = 10000 - } - - private val String.storageFile: File - get() = File(targetDataDir, this + "." + CACHE_EXTENSION) - - private val countersFile = "counters".storageFile - private val idToFile = registerMap(IdToFileMap("id-to-file".storageFile)) - private val fileToId = registerMap(FileToIdMap("file-to-id".storageFile)) - private val lookupMap = registerMap(LookupMap("lookups".storageFile)) - private var size: Int = 0 - private var deletedCount: Int = 0 - - init { - if (countersFile.exists()) { - val lines = countersFile.readLines() - size = lines[0].toInt() - deletedCount = lines[1].toInt() - } - } - - fun get(lookupSymbol: LookupSymbol): Collection { - val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope) - val fileIds = lookupMap[key] ?: return emptySet() - - return fileIds.mapNotNull { - // null means it's outdated - idToFile[it]?.path - } - } - - fun add(lookupSymbol: LookupSymbol, containingPaths: Collection) { - val key = LookupSymbolKey(lookupSymbol.name, lookupSymbol.scope) - val fileIds = containingPaths.map { addFileIfNeeded(File(it)) }.toHashSet() - fileIds.addAll(lookupMap[key] ?: emptySet()) - lookupMap[key] = fileIds - } - - fun removeLookupsFrom(file: File) { - val id = fileToId[file] ?: return - idToFile.remove(id) - fileToId.remove(file) - deletedCount++ - } - - override fun clean() { - if (countersFile.exists()) { - countersFile.delete() - } - - size = 0 - deletedCount = 0 - - super.clean() - } - - override fun flush(memoryCachesOnly: Boolean) { - try { - removeGarbageIfNeeded() - - if (size > 0) { - if (!countersFile.exists()) { - countersFile.parentFile.mkdirs() - countersFile.createNewFile() - } - - countersFile.writeText("$size\n$deletedCount") - } - } - finally { - super.flush(memoryCachesOnly) - } - } - - private fun addFileIfNeeded(file: File): Int { - val existing = fileToId[file] - if (existing != null) return existing - - val id = size++ - fileToId[file] = id - idToFile[id] = file - return id - } - - private fun removeGarbageIfNeeded(force: Boolean = false) { - if (!force && size <= MINIMUM_GARBAGE_COLLECTIBLE_SIZE && deletedCount.toDouble() / size <= DELETED_TO_SIZE_TRESHOLD) return - - for (hash in lookupMap.keys) { - lookupMap[hash] = lookupMap[hash]!!.filter { it in idToFile }.toSet() - } - - val oldFileToId = fileToId.toMap() - val oldIdToNewId = HashMap(oldFileToId.size) - idToFile.clean() - fileToId.clean() - size = 0 - deletedCount = 0 - - for ((file, oldId) in oldFileToId.entries) { - val newId = addFileIfNeeded(file) - oldIdToNewId[oldId] = newId - } - - for (lookup in lookupMap.keys) { - val fileIds = lookupMap[lookup]!!.mapNotNull { oldIdToNewId[it] }.toSet() - - if (fileIds.isEmpty()) { - lookupMap.remove(lookup) - } - else { - lookupMap[lookup] = fileIds - } - } - } - - @TestOnly fun forceGC() { - removeGarbageIfNeeded(force = true) - flush(false) - } - - @TestOnly fun dump(lookupSymbols: Set): String { - flush(false) - - val sb = StringBuilder() - val p = Printer(sb) - val lookupsStrings = lookupSymbols.groupBy { LookupSymbolKey(it.name, it.scope) } - - for (lookup in lookupMap.keys.sorted()) { - val fileIds = lookupMap[lookup]!! - - val key = if (lookup in lookupsStrings) { - lookupsStrings[lookup]!!.map { "${it.scope}#${it.name}" }.sorted().joinToString(", ") - } - else { - lookup.toString() - } - - val value = fileIds.map { idToFile[it]?.absolutePath ?: it.toString() }.sorted().joinToString(", ") - p.println("$key -> $value") - } - - return sb.toString() - } -} - -class LookupTrackerImpl(private val delegate: LookupTracker) : LookupTracker { - val lookups = MultiMap() - - override val requiresPosition: Boolean - get() = delegate.requiresPosition - - override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) { - lookups.putValue(LookupSymbol(name, scopeFqName), filePath) - delegate.record(filePath, position, scopeFqName, scopeKind, name) - } -} - -data class LookupSymbol(val name: String, val scope: String) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt deleted file mode 100644 index e09d74d90ab..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/ProtoCompareGenerated.kt +++ /dev/null @@ -1,1273 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental - -import org.jetbrains.kotlin.name.ClassId -import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBuf -import org.jetbrains.kotlin.utils.Interner -import java.util.* - -/** This file is generated by org.jetbrains.kotlin.generators.protobuf.GenerateProtoBufCompare. DO NOT MODIFY MANUALLY */ - -open class ProtoCompareGenerated(val oldNameResolver: NameResolver, val newNameResolver: NameResolver) { - private val strings = Interner() - val oldStringIndexesMap: MutableMap = hashMapOf() - val newStringIndexesMap: MutableMap = hashMapOf() - val oldClassIdIndexesMap: MutableMap = hashMapOf() - val newClassIdIndexesMap: MutableMap = hashMapOf() - - private val classIds = Interner() - - open fun checkEquals(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { - if (!checkEqualsPackageFunction(old, new)) return false - - if (!checkEqualsPackageProperty(old, new)) return false - - if (old.hasTypeTable() != new.hasTypeTable()) return false - if (old.hasTypeTable()) { - if (!checkEquals(old.typeTable, new.typeTable)) return false - } - - if (old.hasExtension(JvmProtoBuf.packageModuleName) != new.hasExtension(JvmProtoBuf.packageModuleName)) return false - if (old.hasExtension(JvmProtoBuf.packageModuleName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.packageModuleName), new.getExtension(JvmProtoBuf.packageModuleName))) return false - } - - return true - } - enum class ProtoBufPackageKind { - FUNCTION_LIST, - PROPERTY_LIST, - TYPE_TABLE, - PACKAGE_MODULE_NAME - } - - fun difference(old: ProtoBuf.Package, new: ProtoBuf.Package): EnumSet { - val result = EnumSet.noneOf(ProtoBufPackageKind::class.java) - - if (!checkEqualsPackageFunction(old, new)) result.add(ProtoBufPackageKind.FUNCTION_LIST) - - if (!checkEqualsPackageProperty(old, new)) result.add(ProtoBufPackageKind.PROPERTY_LIST) - - if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufPackageKind.TYPE_TABLE) - if (old.hasTypeTable()) { - if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufPackageKind.TYPE_TABLE) - } - - if (old.hasExtension(JvmProtoBuf.packageModuleName) != new.hasExtension(JvmProtoBuf.packageModuleName)) result.add(ProtoBufPackageKind.PACKAGE_MODULE_NAME) - if (old.hasExtension(JvmProtoBuf.packageModuleName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.packageModuleName), new.getExtension(JvmProtoBuf.packageModuleName))) result.add(ProtoBufPackageKind.PACKAGE_MODULE_NAME) - } - - return result - } - - open fun checkEquals(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.hasFlags() != new.hasFlags()) return false - if (old.hasFlags()) { - if (old.flags != new.flags) return false - } - - if (!checkClassIdEquals(old.fqName, new.fqName)) return false - - if (old.hasCompanionObjectName() != new.hasCompanionObjectName()) return false - if (old.hasCompanionObjectName()) { - if (!checkStringEquals(old.companionObjectName, new.companionObjectName)) return false - } - - if (!checkEqualsClassTypeParameter(old, new)) return false - - if (!checkEqualsClassSupertype(old, new)) return false - - if (!checkEqualsClassSupertypeId(old, new)) return false - - if (!checkEqualsClassNestedClassName(old, new)) return false - - if (!checkEqualsClassConstructor(old, new)) return false - - if (!checkEqualsClassFunction(old, new)) return false - - if (!checkEqualsClassProperty(old, new)) return false - - if (!checkEqualsClassEnumEntry(old, new)) return false - - if (old.hasTypeTable() != new.hasTypeTable()) return false - if (old.hasTypeTable()) { - if (!checkEquals(old.typeTable, new.typeTable)) return false - } - - if (old.hasExtension(JvmProtoBuf.classModuleName) != new.hasExtension(JvmProtoBuf.classModuleName)) return false - if (old.hasExtension(JvmProtoBuf.classModuleName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) return false - } - - return true - } - enum class ProtoBufClassKind { - FLAGS, - FQ_NAME, - COMPANION_OBJECT_NAME, - TYPE_PARAMETER_LIST, - SUPERTYPE_LIST, - SUPERTYPE_ID_LIST, - NESTED_CLASS_NAME_LIST, - CONSTRUCTOR_LIST, - FUNCTION_LIST, - PROPERTY_LIST, - ENUM_ENTRY_LIST, - TYPE_TABLE, - CLASS_MODULE_NAME - } - - fun difference(old: ProtoBuf.Class, new: ProtoBuf.Class): EnumSet { - val result = EnumSet.noneOf(ProtoBufClassKind::class.java) - - if (old.hasFlags() != new.hasFlags()) result.add(ProtoBufClassKind.FLAGS) - if (old.hasFlags()) { - if (old.flags != new.flags) result.add(ProtoBufClassKind.FLAGS) - } - - if (!checkClassIdEquals(old.fqName, new.fqName)) result.add(ProtoBufClassKind.FQ_NAME) - - if (old.hasCompanionObjectName() != new.hasCompanionObjectName()) result.add(ProtoBufClassKind.COMPANION_OBJECT_NAME) - if (old.hasCompanionObjectName()) { - if (!checkStringEquals(old.companionObjectName, new.companionObjectName)) result.add(ProtoBufClassKind.COMPANION_OBJECT_NAME) - } - - if (!checkEqualsClassTypeParameter(old, new)) result.add(ProtoBufClassKind.TYPE_PARAMETER_LIST) - - if (!checkEqualsClassSupertype(old, new)) result.add(ProtoBufClassKind.SUPERTYPE_LIST) - - if (!checkEqualsClassSupertypeId(old, new)) result.add(ProtoBufClassKind.SUPERTYPE_ID_LIST) - - if (!checkEqualsClassNestedClassName(old, new)) result.add(ProtoBufClassKind.NESTED_CLASS_NAME_LIST) - - if (!checkEqualsClassConstructor(old, new)) result.add(ProtoBufClassKind.CONSTRUCTOR_LIST) - - if (!checkEqualsClassFunction(old, new)) result.add(ProtoBufClassKind.FUNCTION_LIST) - - if (!checkEqualsClassProperty(old, new)) result.add(ProtoBufClassKind.PROPERTY_LIST) - - if (!checkEqualsClassEnumEntry(old, new)) result.add(ProtoBufClassKind.ENUM_ENTRY_LIST) - - if (old.hasTypeTable() != new.hasTypeTable()) result.add(ProtoBufClassKind.TYPE_TABLE) - if (old.hasTypeTable()) { - if (!checkEquals(old.typeTable, new.typeTable)) result.add(ProtoBufClassKind.TYPE_TABLE) - } - - if (old.hasExtension(JvmProtoBuf.classModuleName) != new.hasExtension(JvmProtoBuf.classModuleName)) result.add(ProtoBufClassKind.CLASS_MODULE_NAME) - if (old.hasExtension(JvmProtoBuf.classModuleName)) { - if (!checkStringEquals(old.getExtension(JvmProtoBuf.classModuleName), new.getExtension(JvmProtoBuf.classModuleName))) result.add(ProtoBufClassKind.CLASS_MODULE_NAME) - } - - return result - } - - open fun checkEquals(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean { - if (old.hasFlags() != new.hasFlags()) return false - if (old.hasFlags()) { - if (old.flags != new.flags) return false - } - - if (old.hasNewFlags() != new.hasNewFlags()) return false - if (old.hasNewFlags()) { - if (old.newFlags != new.newFlags) return false - } - - if (!checkStringEquals(old.name, new.name)) return false - - if (old.hasReturnType() != new.hasReturnType()) return false - if (old.hasReturnType()) { - if (!checkEquals(old.returnType, new.returnType)) return false - } - - if (old.hasReturnTypeId() != new.hasReturnTypeId()) return false - if (old.hasReturnTypeId()) { - if (old.returnTypeId != new.returnTypeId) return false - } - - if (!checkEqualsFunctionTypeParameter(old, new)) return false - - if (old.hasReceiverType() != new.hasReceiverType()) return false - if (old.hasReceiverType()) { - if (!checkEquals(old.receiverType, new.receiverType)) return false - } - - if (old.hasReceiverTypeId() != new.hasReceiverTypeId()) return false - if (old.hasReceiverTypeId()) { - if (old.receiverTypeId != new.receiverTypeId) return false - } - - if (!checkEqualsFunctionValueParameter(old, new)) return false - - if (old.hasTypeTable() != new.hasTypeTable()) return false - if (old.hasTypeTable()) { - if (!checkEquals(old.typeTable, new.typeTable)) return false - } - - if (old.hasExtension(JvmProtoBuf.methodSignature) != new.hasExtension(JvmProtoBuf.methodSignature)) return false - if (old.hasExtension(JvmProtoBuf.methodSignature)) { - if (!checkEquals(old.getExtension(JvmProtoBuf.methodSignature), new.getExtension(JvmProtoBuf.methodSignature))) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.Property, new: ProtoBuf.Property): Boolean { - if (old.hasFlags() != new.hasFlags()) return false - if (old.hasFlags()) { - if (old.flags != new.flags) return false - } - - if (old.hasNewFlags() != new.hasNewFlags()) return false - if (old.hasNewFlags()) { - if (old.newFlags != new.newFlags) return false - } - - if (!checkStringEquals(old.name, new.name)) return false - - if (old.hasReturnType() != new.hasReturnType()) return false - if (old.hasReturnType()) { - if (!checkEquals(old.returnType, new.returnType)) return false - } - - if (old.hasReturnTypeId() != new.hasReturnTypeId()) return false - if (old.hasReturnTypeId()) { - if (old.returnTypeId != new.returnTypeId) return false - } - - if (!checkEqualsPropertyTypeParameter(old, new)) return false - - if (old.hasReceiverType() != new.hasReceiverType()) return false - if (old.hasReceiverType()) { - if (!checkEquals(old.receiverType, new.receiverType)) return false - } - - if (old.hasReceiverTypeId() != new.hasReceiverTypeId()) return false - if (old.hasReceiverTypeId()) { - if (old.receiverTypeId != new.receiverTypeId) return false - } - - if (old.hasSetterValueParameter() != new.hasSetterValueParameter()) return false - if (old.hasSetterValueParameter()) { - if (!checkEquals(old.setterValueParameter, new.setterValueParameter)) return false - } - - if (old.hasGetterFlags() != new.hasGetterFlags()) return false - if (old.hasGetterFlags()) { - if (old.getterFlags != new.getterFlags) return false - } - - if (old.hasSetterFlags() != new.hasSetterFlags()) return false - if (old.hasSetterFlags()) { - if (old.setterFlags != new.setterFlags) return false - } - - if (old.hasExtension(JvmProtoBuf.propertySignature) != new.hasExtension(JvmProtoBuf.propertySignature)) return false - if (old.hasExtension(JvmProtoBuf.propertySignature)) { - if (!checkEquals(old.getExtension(JvmProtoBuf.propertySignature), new.getExtension(JvmProtoBuf.propertySignature))) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.TypeTable, new: ProtoBuf.TypeTable): Boolean { - if (!checkEqualsTypeTableType(old, new)) return false - - if (old.hasFirstNullable() != new.hasFirstNullable()) return false - if (old.hasFirstNullable()) { - if (old.firstNullable != new.firstNullable) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { - if (old.id != new.id) return false - - if (!checkStringEquals(old.name, new.name)) return false - - if (old.hasReified() != new.hasReified()) return false - if (old.hasReified()) { - if (old.reified != new.reified) return false - } - - if (old.hasVariance() != new.hasVariance()) return false - if (old.hasVariance()) { - if (old.variance != new.variance) return false - } - - if (!checkEqualsTypeParameterUpperBound(old, new)) return false - - if (!checkEqualsTypeParameterUpperBoundId(old, new)) return false - - if (old.getExtensionCount(JvmProtoBuf.typeParameterAnnotation) != new.getExtensionCount(JvmProtoBuf.typeParameterAnnotation)) return false - - for(i in 0..old.getExtensionCount(JvmProtoBuf.typeParameterAnnotation) - 1) { - if (!checkEquals(old.getExtension(JvmProtoBuf.typeParameterAnnotation, i), new.getExtension(JvmProtoBuf.typeParameterAnnotation, i))) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.Type, new: ProtoBuf.Type): Boolean { - if (!checkEqualsTypeArgument(old, new)) return false - - if (old.hasNullable() != new.hasNullable()) return false - if (old.hasNullable()) { - if (old.nullable != new.nullable) return false - } - - if (old.hasFlexibleTypeCapabilitiesId() != new.hasFlexibleTypeCapabilitiesId()) return false - if (old.hasFlexibleTypeCapabilitiesId()) { - if (!checkStringEquals(old.flexibleTypeCapabilitiesId, new.flexibleTypeCapabilitiesId)) return false - } - - if (old.hasFlexibleUpperBound() != new.hasFlexibleUpperBound()) return false - if (old.hasFlexibleUpperBound()) { - if (!checkEquals(old.flexibleUpperBound, new.flexibleUpperBound)) return false - } - - if (old.hasFlexibleUpperBoundId() != new.hasFlexibleUpperBoundId()) return false - if (old.hasFlexibleUpperBoundId()) { - if (old.flexibleUpperBoundId != new.flexibleUpperBoundId) return false - } - - if (old.hasClassName() != new.hasClassName()) return false - if (old.hasClassName()) { - if (!checkClassIdEquals(old.className, new.className)) return false - } - - if (old.hasTypeParameter() != new.hasTypeParameter()) return false - if (old.hasTypeParameter()) { - if (old.typeParameter != new.typeParameter) return false - } - - if (old.hasTypeParameterName() != new.hasTypeParameterName()) return false - if (old.hasTypeParameterName()) { - if (!checkStringEquals(old.typeParameterName, new.typeParameterName)) return false - } - - if (old.hasOuterType() != new.hasOuterType()) return false - if (old.hasOuterType()) { - if (!checkEquals(old.outerType, new.outerType)) return false - } - - if (old.hasOuterTypeId() != new.hasOuterTypeId()) return false - if (old.hasOuterTypeId()) { - if (old.outerTypeId != new.outerTypeId) return false - } - - if (old.getExtensionCount(JvmProtoBuf.typeAnnotation) != new.getExtensionCount(JvmProtoBuf.typeAnnotation)) return false - - for(i in 0..old.getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { - if (!checkEquals(old.getExtension(JvmProtoBuf.typeAnnotation, i), new.getExtension(JvmProtoBuf.typeAnnotation, i))) return false - } - - if (old.hasExtension(JvmProtoBuf.isRaw) != new.hasExtension(JvmProtoBuf.isRaw)) return false - if (old.hasExtension(JvmProtoBuf.isRaw)) { - if (old.getExtension(JvmProtoBuf.isRaw) != new.getExtension(JvmProtoBuf.isRaw)) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean { - if (old.hasFlags() != new.hasFlags()) return false - if (old.hasFlags()) { - if (old.flags != new.flags) return false - } - - if (!checkEqualsConstructorValueParameter(old, new)) return false - - if (old.hasExtension(JvmProtoBuf.constructorSignature) != new.hasExtension(JvmProtoBuf.constructorSignature)) return false - if (old.hasExtension(JvmProtoBuf.constructorSignature)) { - if (!checkEquals(old.getExtension(JvmProtoBuf.constructorSignature), new.getExtension(JvmProtoBuf.constructorSignature))) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.EnumEntry, new: ProtoBuf.EnumEntry): Boolean { - if (old.hasName() != new.hasName()) return false - if (old.hasName()) { - if (!checkStringEquals(old.name, new.name)) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.ValueParameter, new: ProtoBuf.ValueParameter): Boolean { - if (old.hasFlags() != new.hasFlags()) return false - if (old.hasFlags()) { - if (old.flags != new.flags) return false - } - - if (!checkStringEquals(old.name, new.name)) return false - - if (old.hasType() != new.hasType()) return false - if (old.hasType()) { - if (!checkEquals(old.type, new.type)) return false - } - - if (old.hasTypeId() != new.hasTypeId()) return false - if (old.hasTypeId()) { - if (old.typeId != new.typeId) return false - } - - if (old.hasVarargElementType() != new.hasVarargElementType()) return false - if (old.hasVarargElementType()) { - if (!checkEquals(old.varargElementType, new.varargElementType)) return false - } - - if (old.hasVarargElementTypeId() != new.hasVarargElementTypeId()) return false - if (old.hasVarargElementTypeId()) { - if (old.varargElementTypeId != new.varargElementTypeId) return false - } - - return true - } - - open fun checkEquals(old: JvmProtoBuf.JvmMethodSignature, new: JvmProtoBuf.JvmMethodSignature): Boolean { - if (old.hasName() != new.hasName()) return false - if (old.hasName()) { - if (!checkStringEquals(old.name, new.name)) return false - } - - if (old.hasDesc() != new.hasDesc()) return false - if (old.hasDesc()) { - if (!checkStringEquals(old.desc, new.desc)) return false - } - - return true - } - - open fun checkEquals(old: JvmProtoBuf.JvmPropertySignature, new: JvmProtoBuf.JvmPropertySignature): Boolean { - if (old.hasField() != new.hasField()) return false - if (old.hasField()) { - if (!checkEquals(old.field, new.field)) return false - } - - if (old.hasSyntheticMethod() != new.hasSyntheticMethod()) return false - if (old.hasSyntheticMethod()) { - if (!checkEquals(old.syntheticMethod, new.syntheticMethod)) return false - } - - if (old.hasGetter() != new.hasGetter()) return false - if (old.hasGetter()) { - if (!checkEquals(old.getter, new.getter)) return false - } - - if (old.hasSetter() != new.hasSetter()) return false - if (old.hasSetter()) { - if (!checkEquals(old.setter, new.setter)) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { - if (!checkClassIdEquals(old.id, new.id)) return false - - if (!checkEqualsAnnotationArgument(old, new)) return false - - return true - } - - open fun checkEquals(old: ProtoBuf.Type.Argument, new: ProtoBuf.Type.Argument): Boolean { - if (old.hasProjection() != new.hasProjection()) return false - if (old.hasProjection()) { - if (old.projection != new.projection) return false - } - - if (old.hasType() != new.hasType()) return false - if (old.hasType()) { - if (!checkEquals(old.type, new.type)) return false - } - - if (old.hasTypeId() != new.hasTypeId()) return false - if (old.hasTypeId()) { - if (old.typeId != new.typeId) return false - } - - return true - } - - open fun checkEquals(old: JvmProtoBuf.JvmFieldSignature, new: JvmProtoBuf.JvmFieldSignature): Boolean { - if (old.hasName() != new.hasName()) return false - if (old.hasName()) { - if (!checkStringEquals(old.name, new.name)) return false - } - - if (old.hasDesc() != new.hasDesc()) return false - if (old.hasDesc()) { - if (!checkStringEquals(old.desc, new.desc)) return false - } - - return true - } - - open fun checkEquals(old: ProtoBuf.Annotation.Argument, new: ProtoBuf.Annotation.Argument): Boolean { - if (!checkStringEquals(old.nameId, new.nameId)) return false - - if (!checkEquals(old.value, new.value)) return false - - return true - } - - open fun checkEquals(old: ProtoBuf.Annotation.Argument.Value, new: ProtoBuf.Annotation.Argument.Value): Boolean { - if (old.hasType() != new.hasType()) return false - if (old.hasType()) { - if (old.type != new.type) return false - } - - if (old.hasIntValue() != new.hasIntValue()) return false - if (old.hasIntValue()) { - if (old.intValue != new.intValue) return false - } - - if (old.hasFloatValue() != new.hasFloatValue()) return false - if (old.hasFloatValue()) { - if (old.floatValue != new.floatValue) return false - } - - if (old.hasDoubleValue() != new.hasDoubleValue()) return false - if (old.hasDoubleValue()) { - if (old.doubleValue != new.doubleValue) return false - } - - if (old.hasStringValue() != new.hasStringValue()) return false - if (old.hasStringValue()) { - if (!checkStringEquals(old.stringValue, new.stringValue)) return false - } - - if (old.hasClassId() != new.hasClassId()) return false - if (old.hasClassId()) { - if (!checkClassIdEquals(old.classId, new.classId)) return false - } - - if (old.hasEnumValueId() != new.hasEnumValueId()) return false - if (old.hasEnumValueId()) { - if (!checkStringEquals(old.enumValueId, new.enumValueId)) return false - } - - if (old.hasAnnotation() != new.hasAnnotation()) return false - if (old.hasAnnotation()) { - if (!checkEquals(old.annotation, new.annotation)) return false - } - - if (!checkEqualsAnnotationArgumentValueArrayElement(old, new)) return false - - return true - } - - open fun checkEqualsPackageFunction(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { - if (old.functionCount != new.functionCount) return false - - for(i in 0..old.functionCount - 1) { - if (!checkEquals(old.getFunction(i), new.getFunction(i))) return false - } - - return true - } - - open fun checkEqualsPackageProperty(old: ProtoBuf.Package, new: ProtoBuf.Package): Boolean { - if (old.propertyCount != new.propertyCount) return false - - for(i in 0..old.propertyCount - 1) { - if (!checkEquals(old.getProperty(i), new.getProperty(i))) return false - } - - return true - } - - open fun checkEqualsClassTypeParameter(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.typeParameterCount != new.typeParameterCount) return false - - for(i in 0..old.typeParameterCount - 1) { - if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false - } - - return true - } - - open fun checkEqualsClassSupertype(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.supertypeCount != new.supertypeCount) return false - - for(i in 0..old.supertypeCount - 1) { - if (!checkEquals(old.getSupertype(i), new.getSupertype(i))) return false - } - - return true - } - - open fun checkEqualsClassSupertypeId(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.supertypeIdCount != new.supertypeIdCount) return false - - for(i in 0..old.supertypeIdCount - 1) { - if (old.getSupertypeId(i) != new.getSupertypeId(i)) return false - } - - return true - } - - open fun checkEqualsClassNestedClassName(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.nestedClassNameCount != new.nestedClassNameCount) return false - - for(i in 0..old.nestedClassNameCount - 1) { - if (!checkStringEquals(old.getNestedClassName(i), new.getNestedClassName(i))) return false - } - - return true - } - - open fun checkEqualsClassConstructor(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.constructorCount != new.constructorCount) return false - - for(i in 0..old.constructorCount - 1) { - if (!checkEquals(old.getConstructor(i), new.getConstructor(i))) return false - } - - return true - } - - open fun checkEqualsClassFunction(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.functionCount != new.functionCount) return false - - for(i in 0..old.functionCount - 1) { - if (!checkEquals(old.getFunction(i), new.getFunction(i))) return false - } - - return true - } - - open fun checkEqualsClassProperty(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.propertyCount != new.propertyCount) return false - - for(i in 0..old.propertyCount - 1) { - if (!checkEquals(old.getProperty(i), new.getProperty(i))) return false - } - - return true - } - - open fun checkEqualsClassEnumEntry(old: ProtoBuf.Class, new: ProtoBuf.Class): Boolean { - if (old.enumEntryCount != new.enumEntryCount) return false - - for(i in 0..old.enumEntryCount - 1) { - if (!checkEquals(old.getEnumEntry(i), new.getEnumEntry(i))) return false - } - - return true - } - - open fun checkEqualsFunctionTypeParameter(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean { - if (old.typeParameterCount != new.typeParameterCount) return false - - for(i in 0..old.typeParameterCount - 1) { - if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false - } - - return true - } - - open fun checkEqualsFunctionValueParameter(old: ProtoBuf.Function, new: ProtoBuf.Function): Boolean { - if (old.valueParameterCount != new.valueParameterCount) return false - - for(i in 0..old.valueParameterCount - 1) { - if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false - } - - return true - } - - open fun checkEqualsPropertyTypeParameter(old: ProtoBuf.Property, new: ProtoBuf.Property): Boolean { - if (old.typeParameterCount != new.typeParameterCount) return false - - for(i in 0..old.typeParameterCount - 1) { - if (!checkEquals(old.getTypeParameter(i), new.getTypeParameter(i))) return false - } - - return true - } - - open fun checkEqualsTypeTableType(old: ProtoBuf.TypeTable, new: ProtoBuf.TypeTable): Boolean { - if (old.typeCount != new.typeCount) return false - - for(i in 0..old.typeCount - 1) { - if (!checkEquals(old.getType(i), new.getType(i))) return false - } - - return true - } - - open fun checkEqualsTypeParameterUpperBound(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { - if (old.upperBoundCount != new.upperBoundCount) return false - - for(i in 0..old.upperBoundCount - 1) { - if (!checkEquals(old.getUpperBound(i), new.getUpperBound(i))) return false - } - - return true - } - - open fun checkEqualsTypeParameterUpperBoundId(old: ProtoBuf.TypeParameter, new: ProtoBuf.TypeParameter): Boolean { - if (old.upperBoundIdCount != new.upperBoundIdCount) return false - - for(i in 0..old.upperBoundIdCount - 1) { - if (old.getUpperBoundId(i) != new.getUpperBoundId(i)) return false - } - - return true - } - - open fun checkEqualsTypeArgument(old: ProtoBuf.Type, new: ProtoBuf.Type): Boolean { - if (old.argumentCount != new.argumentCount) return false - - for(i in 0..old.argumentCount - 1) { - if (!checkEquals(old.getArgument(i), new.getArgument(i))) return false - } - - return true - } - - open fun checkEqualsConstructorValueParameter(old: ProtoBuf.Constructor, new: ProtoBuf.Constructor): Boolean { - if (old.valueParameterCount != new.valueParameterCount) return false - - for(i in 0..old.valueParameterCount - 1) { - if (!checkEquals(old.getValueParameter(i), new.getValueParameter(i))) return false - } - - return true - } - - open fun checkEqualsAnnotationArgument(old: ProtoBuf.Annotation, new: ProtoBuf.Annotation): Boolean { - if (old.argumentCount != new.argumentCount) return false - - for(i in 0..old.argumentCount - 1) { - if (!checkEquals(old.getArgument(i), new.getArgument(i))) return false - } - - return true - } - - open fun checkEqualsAnnotationArgumentValueArrayElement(old: ProtoBuf.Annotation.Argument.Value, new: ProtoBuf.Annotation.Argument.Value): Boolean { - if (old.arrayElementCount != new.arrayElementCount) return false - - for(i in 0..old.arrayElementCount - 1) { - if (!checkEquals(old.getArrayElement(i), new.getArrayElement(i))) return false - } - - return true - } - - fun oldGetIndexOfString(index: Int): Int = getIndexOfString(index, oldStringIndexesMap, oldNameResolver) - fun newGetIndexOfString(index: Int): Int = getIndexOfString(index, newStringIndexesMap, newNameResolver) - - fun getIndexOfString(index: Int, map: MutableMap, nameResolver: NameResolver): Int { - map[index]?.let { return it } - - val result = strings.intern(nameResolver.getString(index)) - map[index] = result - return result - } - - fun oldGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, oldClassIdIndexesMap, oldNameResolver) - fun newGetIndexOfClassId(index: Int): Int = getIndexOfClassId(index, newClassIdIndexesMap, newNameResolver) - - fun getIndexOfClassId(index: Int, map: MutableMap, nameResolver: NameResolver): Int { - map[index]?.let { return it } - - val result = classIds.intern(nameResolver.getClassId(index)) - map[index] = result - return result - } - - private fun checkStringEquals(old: Int, new: Int): Boolean { - return oldGetIndexOfString(old) == newGetIndexOfString(new) - } - - private fun checkClassIdEquals(old: Int, new: Int): Boolean { - return oldGetIndexOfClassId(old) == newGetIndexOfClassId(new) - } -} - -fun ProtoBuf.Package.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - for(i in 0..functionCount - 1) { - hashCode = 31 * hashCode + getFunction(i).hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..propertyCount - 1) { - hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasTypeTable()) { - hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasExtension(JvmProtoBuf.packageModuleName)) { - hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.packageModuleName)) - } - - return hashCode -} - -fun ProtoBuf.Class.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasFlags()) { - hashCode = 31 * hashCode + flags - } - - hashCode = 31 * hashCode + fqNameIndexes(fqName) - - if (hasCompanionObjectName()) { - hashCode = 31 * hashCode + stringIndexes(companionObjectName) - } - - for(i in 0..typeParameterCount - 1) { - hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..supertypeCount - 1) { - hashCode = 31 * hashCode + getSupertype(i).hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..supertypeIdCount - 1) { - hashCode = 31 * hashCode + getSupertypeId(i) - } - - for(i in 0..nestedClassNameCount - 1) { - hashCode = 31 * hashCode + stringIndexes(getNestedClassName(i)) - } - - for(i in 0..constructorCount - 1) { - hashCode = 31 * hashCode + getConstructor(i).hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..functionCount - 1) { - hashCode = 31 * hashCode + getFunction(i).hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..propertyCount - 1) { - hashCode = 31 * hashCode + getProperty(i).hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..enumEntryCount - 1) { - hashCode = 31 * hashCode + getEnumEntry(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasTypeTable()) { - hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasExtension(JvmProtoBuf.classModuleName)) { - hashCode = 31 * hashCode + stringIndexes(getExtension(JvmProtoBuf.classModuleName)) - } - - return hashCode -} - -fun ProtoBuf.Function.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasFlags()) { - hashCode = 31 * hashCode + flags - } - - if (hasNewFlags()) { - hashCode = 31 * hashCode + newFlags - } - - hashCode = 31 * hashCode + stringIndexes(name) - - if (hasReturnType()) { - hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasReturnTypeId()) { - hashCode = 31 * hashCode + returnTypeId - } - - for(i in 0..typeParameterCount - 1) { - hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasReceiverType()) { - hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasReceiverTypeId()) { - hashCode = 31 * hashCode + receiverTypeId - } - - for(i in 0..valueParameterCount - 1) { - hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasTypeTable()) { - hashCode = 31 * hashCode + typeTable.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasExtension(JvmProtoBuf.methodSignature)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.methodSignature).hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} - -fun ProtoBuf.Property.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasFlags()) { - hashCode = 31 * hashCode + flags - } - - if (hasNewFlags()) { - hashCode = 31 * hashCode + newFlags - } - - hashCode = 31 * hashCode + stringIndexes(name) - - if (hasReturnType()) { - hashCode = 31 * hashCode + returnType.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasReturnTypeId()) { - hashCode = 31 * hashCode + returnTypeId - } - - for(i in 0..typeParameterCount - 1) { - hashCode = 31 * hashCode + getTypeParameter(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasReceiverType()) { - hashCode = 31 * hashCode + receiverType.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasReceiverTypeId()) { - hashCode = 31 * hashCode + receiverTypeId - } - - if (hasSetterValueParameter()) { - hashCode = 31 * hashCode + setterValueParameter.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasGetterFlags()) { - hashCode = 31 * hashCode + getterFlags - } - - if (hasSetterFlags()) { - hashCode = 31 * hashCode + setterFlags - } - - if (hasExtension(JvmProtoBuf.propertySignature)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.propertySignature).hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} - -fun ProtoBuf.TypeTable.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - for(i in 0..typeCount - 1) { - hashCode = 31 * hashCode + getType(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasFirstNullable()) { - hashCode = 31 * hashCode + firstNullable - } - - return hashCode -} - -fun ProtoBuf.TypeParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - hashCode = 31 * hashCode + id - - hashCode = 31 * hashCode + stringIndexes(name) - - if (hasReified()) { - hashCode = 31 * hashCode + reified.hashCode() - } - - if (hasVariance()) { - hashCode = 31 * hashCode + variance.hashCode() - } - - for(i in 0..upperBoundCount - 1) { - hashCode = 31 * hashCode + getUpperBound(i).hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..upperBoundIdCount - 1) { - hashCode = 31 * hashCode + getUpperBoundId(i) - } - - for(i in 0..getExtensionCount(JvmProtoBuf.typeParameterAnnotation) - 1) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.typeParameterAnnotation, i).hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} - -fun ProtoBuf.Type.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - for(i in 0..argumentCount - 1) { - hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasNullable()) { - hashCode = 31 * hashCode + nullable.hashCode() - } - - if (hasFlexibleTypeCapabilitiesId()) { - hashCode = 31 * hashCode + stringIndexes(flexibleTypeCapabilitiesId) - } - - if (hasFlexibleUpperBound()) { - hashCode = 31 * hashCode + flexibleUpperBound.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasFlexibleUpperBoundId()) { - hashCode = 31 * hashCode + flexibleUpperBoundId - } - - if (hasClassName()) { - hashCode = 31 * hashCode + fqNameIndexes(className) - } - - if (hasTypeParameter()) { - hashCode = 31 * hashCode + typeParameter - } - - if (hasTypeParameterName()) { - hashCode = 31 * hashCode + stringIndexes(typeParameterName) - } - - if (hasOuterType()) { - hashCode = 31 * hashCode + outerType.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasOuterTypeId()) { - hashCode = 31 * hashCode + outerTypeId - } - - for(i in 0..getExtensionCount(JvmProtoBuf.typeAnnotation) - 1) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.typeAnnotation, i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasExtension(JvmProtoBuf.isRaw)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.isRaw).hashCode() - } - - return hashCode -} - -fun ProtoBuf.Constructor.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasFlags()) { - hashCode = 31 * hashCode + flags - } - - for(i in 0..valueParameterCount - 1) { - hashCode = 31 * hashCode + getValueParameter(i).hashCode(stringIndexes, fqNameIndexes) - } - - if (hasExtension(JvmProtoBuf.constructorSignature)) { - hashCode = 31 * hashCode + getExtension(JvmProtoBuf.constructorSignature).hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} - -fun ProtoBuf.EnumEntry.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasName()) { - hashCode = 31 * hashCode + stringIndexes(name) - } - - return hashCode -} - -fun ProtoBuf.ValueParameter.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasFlags()) { - hashCode = 31 * hashCode + flags - } - - hashCode = 31 * hashCode + stringIndexes(name) - - if (hasType()) { - hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasTypeId()) { - hashCode = 31 * hashCode + typeId - } - - if (hasVarargElementType()) { - hashCode = 31 * hashCode + varargElementType.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasVarargElementTypeId()) { - hashCode = 31 * hashCode + varargElementTypeId - } - - return hashCode -} - -fun JvmProtoBuf.JvmMethodSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasName()) { - hashCode = 31 * hashCode + stringIndexes(name) - } - - if (hasDesc()) { - hashCode = 31 * hashCode + stringIndexes(desc) - } - - return hashCode -} - -fun JvmProtoBuf.JvmPropertySignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasField()) { - hashCode = 31 * hashCode + field.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasSyntheticMethod()) { - hashCode = 31 * hashCode + syntheticMethod.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasGetter()) { - hashCode = 31 * hashCode + getter.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasSetter()) { - hashCode = 31 * hashCode + setter.hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} - -fun ProtoBuf.Annotation.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - hashCode = 31 * hashCode + fqNameIndexes(id) - - for(i in 0..argumentCount - 1) { - hashCode = 31 * hashCode + getArgument(i).hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} - -fun ProtoBuf.Type.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasProjection()) { - hashCode = 31 * hashCode + projection.hashCode() - } - - if (hasType()) { - hashCode = 31 * hashCode + type.hashCode(stringIndexes, fqNameIndexes) - } - - if (hasTypeId()) { - hashCode = 31 * hashCode + typeId - } - - return hashCode -} - -fun JvmProtoBuf.JvmFieldSignature.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasName()) { - hashCode = 31 * hashCode + stringIndexes(name) - } - - if (hasDesc()) { - hashCode = 31 * hashCode + stringIndexes(desc) - } - - return hashCode -} - -fun ProtoBuf.Annotation.Argument.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - hashCode = 31 * hashCode + stringIndexes(nameId) - - hashCode = 31 * hashCode + value.hashCode(stringIndexes, fqNameIndexes) - - return hashCode -} - -fun ProtoBuf.Annotation.Argument.Value.hashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - var hashCode = 1 - - if (hasType()) { - hashCode = 31 * hashCode + type.hashCode() - } - - if (hasIntValue()) { - hashCode = 31 * hashCode + intValue.hashCode() - } - - if (hasFloatValue()) { - hashCode = 31 * hashCode + floatValue.hashCode() - } - - if (hasDoubleValue()) { - hashCode = 31 * hashCode + doubleValue.hashCode() - } - - if (hasStringValue()) { - hashCode = 31 * hashCode + stringIndexes(stringValue) - } - - if (hasClassId()) { - hashCode = 31 * hashCode + fqNameIndexes(classId) - } - - if (hasEnumValueId()) { - hashCode = 31 * hashCode + stringIndexes(enumValueId) - } - - if (hasAnnotation()) { - hashCode = 31 * hashCode + annotation.hashCode(stringIndexes, fqNameIndexes) - } - - for(i in 0..arrayElementCount - 1) { - hashCode = 31 * hashCode + getArrayElement(i).hashCode(stringIndexes, fqNameIndexes) - } - - return hashCode -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt deleted file mode 100644 index 3f7971857ad..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/protoDifferenceUtils.kt +++ /dev/null @@ -1,277 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental - -import com.google.protobuf.MessageLite -import org.jetbrains.kotlin.descriptors.Visibilities -import org.jetbrains.kotlin.jps.incremental.ProtoCompareGenerated.ProtoBufClassKind -import org.jetbrains.kotlin.jps.incremental.ProtoCompareGenerated.ProtoBufPackageKind -import org.jetbrains.kotlin.jps.incremental.storage.ProtoMapValue -import org.jetbrains.kotlin.serialization.Flags -import org.jetbrains.kotlin.serialization.ProtoBuf -import org.jetbrains.kotlin.serialization.deserialization.Deserialization -import org.jetbrains.kotlin.serialization.deserialization.NameResolver -import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil -import org.jetbrains.kotlin.utils.HashSetUtil -import java.util.* - -data class Difference( - val isClassAffected: Boolean = false, - val areSubclassesAffected: Boolean = false, - val changedMembersNames: Set = emptySet() -) - -fun difference(oldData: ProtoMapValue, newData: ProtoMapValue): Difference { - if (!oldData.isPackageFacade && newData.isPackageFacade) return Difference(isClassAffected = true, areSubclassesAffected = true) - - if (oldData.isPackageFacade && !newData.isPackageFacade) return Difference(isClassAffected = true) - - val differenceObject = - if (oldData.isPackageFacade) { - DifferenceCalculatorForPackageFacade(oldData, newData) - } - else { - DifferenceCalculatorForClass(oldData, newData) - } - - return differenceObject.difference() -} - -internal val MessageLite.isPrivate: Boolean - get() = Visibilities.isPrivate(Deserialization.visibility( - when (this) { - is ProtoBuf.Constructor -> Flags.VISIBILITY.get(flags) - is ProtoBuf.Function -> Flags.VISIBILITY.get(flags) - is ProtoBuf.Property -> Flags.VISIBILITY.get(flags) - else -> error("Unknown message: $this") - })) - -private fun MessageLite.name(nameResolver: NameResolver): String { - return when (this) { - is ProtoBuf.Constructor -> "" - is ProtoBuf.Function -> nameResolver.getString(name) - is ProtoBuf.Property -> nameResolver.getString(name) - else -> error("Unknown message: $this") - } -} - -internal fun List.names(nameResolver: NameResolver): List = map { it.name(nameResolver) } - -private abstract class DifferenceCalculator() { - protected abstract val oldNameResolver: NameResolver - protected abstract val newNameResolver: NameResolver - - protected val compareObject by lazy { ProtoCompareGenerated(oldNameResolver, newNameResolver) } - - abstract fun difference(): Difference - - protected fun calcDifferenceForMembers(oldList: List, newList: List): Collection { - val result = hashSetOf() - - val oldMap = - oldList.groupBy { it.getHashCode({ compareObject.oldGetIndexOfString(it) }, { compareObject.oldGetIndexOfClassId(it) }) } - val newMap = - newList.groupBy { it.getHashCode({ compareObject.newGetIndexOfString(it) }, { compareObject.newGetIndexOfClassId(it) }) } - - val hashes = oldMap.keys + newMap.keys - for (hash in hashes) { - val oldMembers = oldMap[hash] - val newMembers = newMap[hash] - - val differentMembers = when { - newMembers == null -> oldMembers!!.names(compareObject.oldNameResolver) - oldMembers == null -> newMembers.names(compareObject.newNameResolver) - else -> calcDifferenceForEqualHashes(oldMembers, newMembers) - } - result.addAll(differentMembers) - } - - return result - } - - private fun calcDifferenceForEqualHashes( - oldList: List, - newList: List - ): Collection { - val result = hashSetOf() - val newSet = HashSet(newList) - - oldList.forEach { oldMember -> - val newMember = newSet.firstOrNull { compareObject.checkEquals(oldMember, it) } - if (newMember != null) { - newSet.remove(newMember) - } - else { - result.add(oldMember.name(compareObject.oldNameResolver)) - } - } - - newSet.forEach { newMember -> - result.add(newMember.name(compareObject.newNameResolver)) - } - - return result - } - - protected fun calcDifferenceForNames( - oldList: List, - newList: List - ): Collection { - val oldNames = oldList.map { compareObject.oldNameResolver.getString(it) }.toSet() - val newNames = newList.map { compareObject.newNameResolver.getString(it) }.toSet() - return HashSetUtil.symmetricDifference(oldNames, newNames) - } - - private fun MessageLite.getHashCode(stringIndexes: (Int) -> Int, fqNameIndexes: (Int) -> Int): Int { - return when (this) { - is ProtoBuf.Constructor -> hashCode(stringIndexes, fqNameIndexes) - is ProtoBuf.Function -> hashCode(stringIndexes, fqNameIndexes) - is ProtoBuf.Property -> hashCode(stringIndexes, fqNameIndexes) - else -> error("Unknown message: $this") - } - } - - private fun ProtoCompareGenerated.checkEquals(old: MessageLite, new: MessageLite): Boolean { - return when { - old is ProtoBuf.Constructor && new is ProtoBuf.Constructor -> checkEquals(old, new) - old is ProtoBuf.Function && new is ProtoBuf.Function -> checkEquals(old, new) - old is ProtoBuf.Property && new is ProtoBuf.Property -> checkEquals(old, new) - else -> error("Unknown message: $this") - } - } -} - -private class DifferenceCalculatorForClass(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { - companion object { - private val CLASS_SIGNATURE_ENUMS = EnumSet.of( - ProtoBufClassKind.FLAGS, - ProtoBufClassKind.FQ_NAME, - ProtoBufClassKind.TYPE_PARAMETER_LIST, - ProtoBufClassKind.SUPERTYPE_LIST - ) - } - - val oldClassData = JvmProtoBufUtil.readClassDataFrom(oldData.bytes, oldData.strings) - val newClassData = JvmProtoBufUtil.readClassDataFrom(newData.bytes, newData.strings) - - val oldProto = oldClassData.classProto - val newProto = newClassData.classProto - - override val oldNameResolver = oldClassData.nameResolver - override val newNameResolver = newClassData.nameResolver - - val diff = compareObject.difference(oldProto, newProto) - - override fun difference(): Difference { - var isClassAffected = false - var areSubclassesAffected = false - val names = hashSetOf() - val classIsSealed = newProto.isSealed && oldProto.isSealed - - fun Int.oldToNames() = names.add(oldNameResolver.getString(this)) - fun Int.newToNames() = names.add(newNameResolver.getString(this)) - - fun calcDifferenceForNonPrivateMembers(members: (ProtoBuf.Class) -> List): Collection { - val oldMembers = members(oldProto).filterNot { it.isPrivate } - val newMembers = members(newProto).filterNot { it.isPrivate } - return calcDifferenceForMembers(oldMembers, newMembers) - } - - for (kind in diff) { - when (kind!!) { - ProtoBufClassKind.COMPANION_OBJECT_NAME -> { - if (oldProto.hasCompanionObjectName()) oldProto.companionObjectName.oldToNames() - if (newProto.hasCompanionObjectName()) newProto.companionObjectName.newToNames() - } - ProtoBufClassKind.NESTED_CLASS_NAME_LIST -> { - if (classIsSealed) { - // when class is sealed, adding an implementation can break exhaustive when expressions - // the workaround is to recompile all class usages - isClassAffected = true - } - - names.addAll(calcDifferenceForNames(oldProto.nestedClassNameList, newProto.nestedClassNameList)) - } - ProtoBufClassKind.CONSTRUCTOR_LIST -> { - val differentNonPrivateConstructors = calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getConstructorList) - - if (differentNonPrivateConstructors.isNotEmpty()) { - isClassAffected = true - } - } - ProtoBufClassKind.FUNCTION_LIST -> - names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getFunctionList)) - ProtoBufClassKind.PROPERTY_LIST -> - names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Class::getPropertyList)) - ProtoBufClassKind.ENUM_ENTRY_LIST -> { - isClassAffected = true - } - ProtoBufClassKind.TYPE_TABLE -> { - // TODO - } - in CLASS_SIGNATURE_ENUMS -> { - isClassAffected = true - areSubclassesAffected = true - } - else -> throw IllegalArgumentException("Unsupported kind: $kind") - } - } - - return Difference(isClassAffected, areSubclassesAffected, names) - } -} - -private class DifferenceCalculatorForPackageFacade(oldData: ProtoMapValue, newData: ProtoMapValue) : DifferenceCalculator() { - val oldPackageData = JvmProtoBufUtil.readPackageDataFrom(oldData.bytes, oldData.strings) - val newPackageData = JvmProtoBufUtil.readPackageDataFrom(newData.bytes, newData.strings) - - val oldProto = oldPackageData.packageProto - val newProto = newPackageData.packageProto - - override val oldNameResolver = oldPackageData.nameResolver - override val newNameResolver = newPackageData.nameResolver - - val diff = compareObject.difference(oldProto, newProto) - - override fun difference(): Difference { - val names = hashSetOf() - - fun calcDifferenceForNonPrivateMembers(members: (ProtoBuf.Package) -> List): Collection { - val oldMembers = members(oldProto).filterNot { it.isPrivate } - val newMembers = members(newProto).filterNot { it.isPrivate } - return calcDifferenceForMembers(oldMembers, newMembers) - } - - for (kind in diff) { - when (kind!!) { - ProtoBufPackageKind.FUNCTION_LIST -> - names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getFunctionList)) - ProtoBufPackageKind.PROPERTY_LIST -> - names.addAll(calcDifferenceForNonPrivateMembers(ProtoBuf.Package::getPropertyList)) - ProtoBufPackageKind.TYPE_TABLE -> { - // TODO - } - else -> throw IllegalArgumentException("Unsupported kind: $kind") - } - } - - return Difference(changedMembersNames = names) - } -} - -private val ProtoBuf.Class.isSealed: Boolean - get() = ProtoBuf.Modality.SEALED == Flags.MODALITY.get(flags) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt deleted file mode 100644 index d2ba1c11631..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMap.kt +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import com.intellij.util.io.DataExternalizer -import com.intellij.util.io.EnumeratorStringDescriptor -import com.intellij.util.io.KeyDescriptor -import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.utils.Printer -import java.io.File - -internal abstract class BasicMap, V>( - storageFile: File, - keyDescriptor: KeyDescriptor, - valueExternalizer: DataExternalizer -) { - protected val storage = LazyStorage(storageFile, keyDescriptor, valueExternalizer) - - open fun clean() { - storage.clean() - } - - fun flush(memoryCachesOnly: Boolean) { - storage.flush(memoryCachesOnly) - } - - fun close() { - storage.close() - } - - @TestOnly - fun dump(): String { - return with(StringBuilder()) { - with(Printer(this)) { - println(this@BasicMap.javaClass.simpleName) - pushIndent() - - for (key in storage.keys.sorted()) { - println("${dumpKey(key)} -> ${dumpValue(storage[key]!!)}") - } - - popIndent() - } - - this - }.toString() - } - - @TestOnly - protected abstract fun dumpKey(key: K): String - - @TestOnly - protected abstract fun dumpValue(value: V): String -} - -internal abstract class BasicStringMap( - storageFile: File, - keyDescriptor: KeyDescriptor, - valueExternalizer: DataExternalizer -) : BasicMap(storageFile, keyDescriptor, valueExternalizer) { - constructor( - storageFile: File, - valueExternalizer: DataExternalizer - ) : this(storageFile, EnumeratorStringDescriptor.INSTANCE, valueExternalizer) - - override fun dumpKey(key: String): String = key -} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt deleted file mode 100644 index 6e11fb22d50..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/BasicMapsOwner.kt +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import org.jetbrains.annotations.TestOnly -import org.jetbrains.jps.incremental.storage.StorageOwner - -open class BasicMapsOwner : StorageOwner { - private val maps = arrayListOf>() - - companion object { - val CACHE_EXTENSION = "tab" - } - - protected fun > registerMap(map: M): M { - maps.add(map) - return map - } - - override fun clean() { - maps.forEach { it.clean() } - } - - override fun close() { - maps.forEach { it.close() } - } - - override fun flush(memoryCachesOnly: Boolean) { - maps.forEach { it.flush(memoryCachesOnly) } - } - - @TestOnly fun dump(): String = maps.map { it.dump() }.joinToString("\n\n") -} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt deleted file mode 100644 index b04477bf682..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/ClassOneToManyMap.kt +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import org.jetbrains.kotlin.jps.incremental.dumpCollection -import org.jetbrains.kotlin.name.FqName -import java.io.File - -internal open class ClassOneToManyMap( - storageFile: File -) : BasicStringMap>(storageFile, StringCollectionExternalizer) { - override fun dumpValue(value: Collection): String = value.dumpCollection() - - fun add(key: FqName, value: FqName) { - storage.append(key.asString(), value.asString()) - } - - operator fun get(key: FqName): Collection = - storage[key.asString()]?.map(::FqName) ?: setOf() - - operator fun set(key: FqName, values: Collection) { - if (values.isEmpty()) { - remove(key) - return - } - - storage[key.asString()] = values.map(FqName::asString) - } - - fun remove(key: FqName) { - storage.remove(key.asString()) - } - - fun removeValues(key: FqName, removed: Set) { - val notRemoved = this[key].filter { it !in removed } - this[key] = notRemoved - } -} - -internal class SubtypesMap(storageFile: File) : ClassOneToManyMap(storageFile) -internal class SupertypesMap(storageFile: File) : ClassOneToManyMap(storageFile) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt deleted file mode 100644 index cd6ce62bc4e..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/IdToFileMap.kt +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import com.intellij.util.io.ExternalIntegerKeyDescriptor -import java.io.File - -internal class IdToFileMap(file: File) : BasicMap(file, ExternalIntegerKeyDescriptor(), FileKeyDescriptor) { - override fun dumpKey(key: Int): String = key.toString() - - override fun dumpValue(value: File): String = value.toString() - - operator fun get(id: Int): File? = storage[id] - - operator fun contains(id: Int): Boolean = id in storage - - operator fun set(id: Int, file: File) { - storage[id] = file - } - - fun remove(id: Int) { - storage.remove(id) - } -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt deleted file mode 100644 index 0a5690c8c41..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LazyStorage.kt +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import com.intellij.util.io.DataExternalizer -import com.intellij.util.io.IOUtil -import com.intellij.util.io.KeyDescriptor -import com.intellij.util.io.PersistentHashMap -import java.io.DataOutput -import java.io.File -import java.io.IOException - - -/** - * It's lazy in a sense that PersistentHashMap is created only on write - */ -internal class LazyStorage( - private val storageFile: File, - private val keyDescriptor: KeyDescriptor, - private val valueExternalizer: DataExternalizer -) { - @Volatile - private var storage: PersistentHashMap? = null - - @Synchronized - private fun getStorageIfExists(): PersistentHashMap? { - if (storage != null) return storage - - if (storageFile.exists()) { - storage = createMap() - return storage - } - - return null - } - - @Synchronized - private fun getStorageOrCreateNew(): PersistentHashMap { - if (storage == null) { - storage = createMap() - } - - return storage!! - } - - val keys: Collection - get() = getStorageIfExists()?.allKeysWithExistingMapping ?: listOf() - - operator fun contains(key: K): Boolean = - getStorageIfExists()?.containsMapping(key) ?: false - - operator fun get(key: K): V? = - getStorageIfExists()?.get(key) - - operator fun set(key: K, value: V) { - getStorageOrCreateNew().put(key, value) - } - - fun remove(key: K) { - getStorageIfExists()?.remove(key) - } - - fun append(key: K, value: String) { - append(key) { out -> IOUtil.writeUTF(out, value) } - } - - fun append(key: K, value: Int) { - append(key) { out -> out.writeInt(value) } - } - - @Synchronized - fun clean() { - try { - storage?.close() - } - catch (ignored: IOException) { - } - - PersistentHashMap.deleteFilesStartingWith(storageFile) - storage = null - } - - @Synchronized - fun flush(memoryCachesOnly: Boolean) { - val existingStorage = storage ?: return - - if (memoryCachesOnly) { - if (existingStorage.isDirty) { - existingStorage.dropMemoryCaches() - } - } - else { - existingStorage.force() - } - } - - @Synchronized - fun close() { - storage?.close() - } - - private fun createMap(): PersistentHashMap = - PersistentHashMap(storageFile, keyDescriptor, valueExternalizer) - - private fun append(key: K, append: (DataOutput)->Unit) { - getStorageOrCreateNew().appendData(key, append) - } -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt deleted file mode 100644 index 70fe113bf72..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/LookupMap.kt +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import java.io.File - -internal class LookupMap(storage: File) : BasicMap>(storage, LookupSymbolKeyDescriptor, IntCollectionExternalizer) { - override fun dumpKey(key: LookupSymbolKey): String = key.toString() - - override fun dumpValue(value: Collection): String = value.toString() - - fun add(name: String, scope: String, fileId: Int) { - storage.append(LookupSymbolKey(name, scope), fileId) - } - - operator fun get(key: LookupSymbolKey): Collection? = storage[key] - - operator fun set(key: LookupSymbolKey, fileIds: Set) { - storage[key] = fileIds - } - - fun remove(key: LookupSymbolKey) { - storage.remove(key) - } - - val keys: Collection - get() = storage.keys -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt deleted file mode 100644 index 39acab1e1de..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/externalizers.kt +++ /dev/null @@ -1,233 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import com.intellij.openapi.util.io.FileUtil -import com.intellij.util.io.DataExternalizer -import com.intellij.util.io.EnumeratorStringDescriptor -import com.intellij.util.io.IOUtil -import com.intellij.util.io.KeyDescriptor -import gnu.trove.THashSet -import org.jetbrains.jps.incremental.storage.PathStringDescriptor -import java.io.DataInput -import java.io.DataInputStream -import java.io.DataOutput -import java.io.File -import java.util.* - -object LookupSymbolKeyDescriptor : KeyDescriptor { - override fun read(input: DataInput): LookupSymbolKey { - val first = input.readInt() - val second = input.readInt() - - return LookupSymbolKey(first, second) - } - - override fun save(output: DataOutput, value: LookupSymbolKey) { - output.writeInt(value.nameHash) - output.writeInt(value.scopeHash) - } - - override fun getHashCode(value: LookupSymbolKey): Int = value.hashCode() - - override fun isEqual(val1: LookupSymbolKey, val2: LookupSymbolKey): Boolean = val1 == val2 -} - - -object PathFunctionPairKeyDescriptor : KeyDescriptor { - override fun read(input: DataInput): PathFunctionPair { - val path = IOUtil.readUTF(input) - val function = IOUtil.readUTF(input) - return PathFunctionPair(path, function) - } - - override fun save(output: DataOutput, value: PathFunctionPair) { - IOUtil.writeUTF(output, value.path) - IOUtil.writeUTF(output, value.function) - } - - override fun getHashCode(value: PathFunctionPair): Int = value.hashCode() - - override fun isEqual(val1: PathFunctionPair, val2: PathFunctionPair): Boolean = val1 == val2 -} - - -object ProtoMapValueExternalizer : DataExternalizer { - override fun save(output: DataOutput, value: ProtoMapValue) { - output.writeBoolean(value.isPackageFacade) - output.writeInt(value.bytes.size) - output.write(value.bytes) - output.writeInt(value.strings.size) - - for (string in value.strings) { - output.writeUTF(string) - } - } - - override fun read(input: DataInput): ProtoMapValue { - val isPackageFacade = input.readBoolean() - val bytesLength = input.readInt() - val bytes = ByteArray(bytesLength) - input.readFully(bytes, 0, bytesLength) - val stringsLength = input.readInt() - val strings = Array(stringsLength) { input.readUTF() } - return ProtoMapValue(isPackageFacade, bytes, strings) - } -} - - -abstract class StringMapExternalizer : DataExternalizer> { - override fun save(output: DataOutput, map: Map?) { - output.writeInt(map!!.size) - - for ((key, value) in map.entries) { - IOUtil.writeString(key, output) - writeValue(output, value) - } - } - - override fun read(input: DataInput): Map? { - val size = input.readInt() - val map = HashMap(size) - - repeat(size) { - val name = IOUtil.readString(input)!! - map[name] = readValue(input) - } - - return map - } - - protected abstract fun writeValue(output: DataOutput, value: T) - protected abstract fun readValue(input: DataInput): T -} - - -object StringToLongMapExternalizer : StringMapExternalizer() { - override fun readValue(input: DataInput): Long = input.readLong() - - override fun writeValue(output: DataOutput, value: Long) { - output.writeLong(value) - } -} - -object ConstantsMapExternalizer : DataExternalizer> { - override fun save(output: DataOutput, map: Map?) { - output.writeInt(map!!.size) - for (name in map.keys.sorted()) { - IOUtil.writeString(name, output) - val value = map[name]!! - when (value) { - is Int -> { - output.writeByte(Kind.INT.ordinal) - output.writeInt(value) - } - is Float -> { - output.writeByte(Kind.FLOAT.ordinal) - output.writeFloat(value) - } - is Long -> { - output.writeByte(Kind.LONG.ordinal) - output.writeLong(value) - } - is Double -> { - output.writeByte(Kind.DOUBLE.ordinal) - output.writeDouble(value) - } - is String -> { - output.writeByte(Kind.STRING.ordinal) - IOUtil.writeString(value, output) - } - else -> throw IllegalStateException("Unexpected constant class: ${value.javaClass}") - } - } - } - - override fun read(input: DataInput): Map? { - val size = input.readInt() - val map = HashMap(size) - - repeat(size) { - val name = IOUtil.readString(input)!! - val kind = Kind.values()[input.readByte().toInt()] - - val value: Any = when (kind) { - Kind.INT -> input.readInt() - Kind.FLOAT -> input.readFloat() - Kind.LONG -> input.readLong() - Kind.DOUBLE -> input.readDouble() - Kind.STRING -> IOUtil.readString(input)!! - } - - map[name] = value - } - - return map - } - - private enum class Kind { - INT, FLOAT, LONG, DOUBLE, STRING - } -} - -object IntExternalizer : DataExternalizer { - override fun read(input: DataInput): Int = input.readInt() - - override fun save(output: DataOutput, value: Int) { - output.writeInt(value) - } -} - -object FileKeyDescriptor : KeyDescriptor { - override fun read(input: DataInput): File = File(input.readUTF()) - - override fun save(output: DataOutput, value: File) { - output.writeUTF(value.canonicalPath) - } - - override fun getHashCode(value: File?): Int = - FileUtil.FILE_HASHING_STRATEGY.computeHashCode(value) - - override fun isEqual(val1: File?, val2: File?): Boolean = - FileUtil.FILE_HASHING_STRATEGY.equals(val1, val2) -} - -open class CollectionExternalizer( - private val elementExternalizer: DataExternalizer, - private val newCollection: ()->MutableCollection -) : DataExternalizer> { - override fun read(input: DataInput): Collection { - val result = newCollection() - val stream = input as DataInputStream - - while (stream.available() > 0) { - result.add(elementExternalizer.read(stream)) - } - - return result - } - - override fun save(output: DataOutput, value: Collection) { - value.forEach { elementExternalizer.save(output, it) } - } -} - -object StringCollectionExternalizer : CollectionExternalizer(EnumeratorStringDescriptor(), { HashSet() }) - -object PathCollectionExternalizer : CollectionExternalizer(PathStringDescriptor(), { THashSet(FileUtil.PATH_HASHING_STRATEGY) }) - -object IntCollectionExternalizer : CollectionExternalizer(IntExternalizer, { HashSet() }) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt deleted file mode 100644 index 986415f3d61..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storage/values.kt +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.incremental.storage - -import com.intellij.openapi.util.io.FileUtil - -data class LookupSymbolKey(val nameHash: Int, val scopeHash: Int) : Comparable { - constructor(name: String, scope: String) : this(name.hashCode(), scope.hashCode()) - - override fun compareTo(other: LookupSymbolKey): Int { - val nameCmp = nameHash.compareTo(other.nameHash) - - if (nameCmp != 0) return nameCmp - - return scopeHash.compareTo(other.scopeHash) - } -} - -class PathFunctionPair( - val path: String, - val function: String -): Comparable { - override fun compareTo(other: PathFunctionPair): Int { - val pathComp = FileUtil.comparePaths(path, other.path) - - if (pathComp != 0) return pathComp - - return function.compareTo(other.function) - } - - override fun equals(other: Any?): Boolean = - when (other) { - is PathFunctionPair -> - FileUtil.pathsEqual(path, other.path) && function == other.function - else -> - false - } - - override fun hashCode(): Int = 31 * FileUtil.pathHashCode(path) + function.hashCode() -} - -data class ProtoMapValue(val isPackageFacade: Boolean, val bytes: ByteArray, val strings: Array) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 37cac8b92db..744871793e7 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -44,11 +44,11 @@ import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories +import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget -import org.jetbrains.kotlin.jps.incremental.LookupStorageProvider -import org.jetbrains.kotlin.jps.incremental.LookupSymbol import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.Printer @@ -384,7 +384,7 @@ abstract class AbstractIncrementalJpsTest( p.println("Begin of Lookup Maps") p.println() - val lookupStorage = project.dataManager.getStorage(KotlinDataContainerTarget, LookupStorageProvider) + val lookupStorage = project.dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) lookupStorage.forceGC() p.print(lookupStorage.dump(lookupsDuringTest)) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 2ee10bc107a..9850719ebd1 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -20,11 +20,11 @@ import com.intellij.testFramework.UsefulTestCase import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.jps.incremental.CacheVersion +import org.jetbrains.kotlin.incremental.CacheVersion +import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider -import org.jetbrains.kotlin.jps.incremental.KOTLIN_CACHE_DIRECTORY_NAME +import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget -import org.jetbrains.kotlin.jps.incremental.storage.BasicMapsOwner import org.jetbrains.kotlin.utils.Printer import java.io.File @@ -119,4 +119,4 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() return result } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index ff1accafe69..e2fdf2ca5f5 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -21,7 +21,7 @@ import com.google.common.hash.Hashing import com.google.common.io.Files import com.google.protobuf.ExtensionRegistry import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.jps.incremental.LocalFileKotlinClass +import org.jetbrains.kotlin.incremental.LocalFileKotlinClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.serialization.DebugProtoBuf import org.jetbrains.kotlin.serialization.jvm.BitEncoding diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index b5664c77f93..922bad39daf 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -19,7 +19,9 @@ package org.jetbrains.kotlin.jps.incremental import com.intellij.openapi.util.io.FileUtil import com.intellij.testFramework.UsefulTestCase import com.intellij.util.SmartList -import org.jetbrains.kotlin.jps.incremental.storage.ProtoMapValue +import org.jetbrains.kotlin.incremental.LocalFileKotlinClass +import org.jetbrains.kotlin.incremental.difference +import org.jetbrains.kotlin.incremental.storage.ProtoMapValue import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.serialization.jvm.BitEncoding @@ -124,4 +126,4 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { FileUtil.createDirectory(directory) return directory } -} \ No newline at end of file +} From c55ea2c4a08ed3de7ab5262ca1547d0ff7954658 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 21 Jan 2016 14:59:45 +0300 Subject: [PATCH 0762/1557] Move back classes which used only in JPS Original commit: cc1c5b7e10f19dac679bed5b471ae5ad090f981f --- .../incremental/JpsIncrementalCacheImpl.kt | 10 ++++- .../jps/incremental/storages/externalizers.kt | 45 +++++++++++++++++++ .../kotlin/jps/incremental/storages/values.kt | 42 +++++++++++++++++ 3 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/externalizers.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/values.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt index 6653b066084..4616450bfb1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt @@ -25,9 +25,15 @@ import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.* -import org.jetbrains.kotlin.incremental.storage.* +import org.jetbrains.kotlin.incremental.storage.BasicMap +import org.jetbrains.kotlin.incremental.storage.BasicStringMap +import org.jetbrains.kotlin.incremental.storage.StringCollectionExternalizer +import org.jetbrains.kotlin.incremental.storage.StringToLongMapExternalizer import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames import org.jetbrains.kotlin.jps.build.KotlinBuilder +import org.jetbrains.kotlin.jps.incremental.storages.PathCollectionExternalizer +import org.jetbrains.kotlin.jps.incremental.storages.PathFunctionPair +import org.jetbrains.kotlin.jps.incremental.storages.PathFunctionPairKeyDescriptor import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.org.objectweb.asm.* import java.io.File @@ -179,7 +185,7 @@ class JpsIncrementalCacheImpl( * * inlineFunction - jvmSignature of some inline function in source file * * target files - collection of files inlineFunction has been inlined to */ - private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathStringCollectionExternalizer) { + private inner class InlineFunctionsFilesMap(storageFile: File) : BasicMap>(storageFile, PathFunctionPairKeyDescriptor, PathCollectionExternalizer) { fun add(sourcePath: String, jvmSignature: String, targetPath: String) { val key = PathFunctionPair(sourcePath, jvmSignature) storage.append(key, targetPath) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/externalizers.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/externalizers.kt new file mode 100644 index 00000000000..5625caca6fa --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/externalizers.kt @@ -0,0 +1,45 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.incremental.storages + +import com.intellij.openapi.util.io.FileUtil +import com.intellij.util.io.IOUtil +import com.intellij.util.io.KeyDescriptor +import gnu.trove.THashSet +import org.jetbrains.jps.incremental.storage.PathStringDescriptor +import org.jetbrains.kotlin.incremental.storage.CollectionExternalizer +import java.io.DataInput +import java.io.DataOutput + +object PathFunctionPairKeyDescriptor : KeyDescriptor { + override fun read(input: DataInput): PathFunctionPair { + val path = IOUtil.readUTF(input) + val function = IOUtil.readUTF(input) + return PathFunctionPair(path, function) + } + + override fun save(output: DataOutput, value: PathFunctionPair) { + IOUtil.writeUTF(output, value.path) + IOUtil.writeUTF(output, value.function) + } + + override fun getHashCode(value: PathFunctionPair): Int = value.hashCode() + + override fun isEqual(val1: PathFunctionPair, val2: PathFunctionPair): Boolean = val1 == val2 +} + +object PathCollectionExternalizer : CollectionExternalizer(PathStringDescriptor(), { THashSet(FileUtil.PATH_HASHING_STRATEGY) }) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/values.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/values.kt new file mode 100644 index 00000000000..40c633f4660 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/storages/values.kt @@ -0,0 +1,42 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.incremental.storages + +import com.intellij.openapi.util.io.FileUtil + +class PathFunctionPair( + val path: String, + val function: String +): Comparable { + override fun compareTo(other: PathFunctionPair): Int { + val pathComp = FileUtil.comparePaths(path, other.path) + + if (pathComp != 0) return pathComp + + return function.compareTo(other.function) + } + + override fun equals(other: Any?): Boolean = + when (other) { + is PathFunctionPair -> + FileUtil.pathsEqual(path, other.path) && function == other.function + else -> + false + } + + override fun hashCode(): Int = 31 * FileUtil.pathHashCode(path) + function.hashCode() +} From 2537e44fc294ac0a3afb6d5c170ed3aae347c085 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 18 Jan 2016 23:05:56 +0300 Subject: [PATCH 0763/1557] J2K KotlinModuleXmlBuilder: rename file Original commit: 60892f2b9c1ab8b85da6cc6fd93dbfd3e4d3aad4 --- .../{KotlinModuleXmlBuilder.java => KotlinModuleXmlBuilder.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/modules/{KotlinModuleXmlBuilder.java => KotlinModuleXmlBuilder.kt} (100%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt From 2878d8d56dc4720b03984ba804b8a134dc4b23a4 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 18 Jan 2016 23:06:22 +0300 Subject: [PATCH 0764/1557] J2K KotlinModuleXmlBuilder: convert Original commit: a36e6a2e0717a3a604785df9a63f93f08491e0b3 --- .../kotlin/modules/KotlinModuleXmlBuilder.kt | 154 ++++++++---------- 1 file changed, 72 insertions(+), 82 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt index 4b48e2340e5..41f90832c4f 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt @@ -14,133 +14,123 @@ * limitations under the License. */ -package org.jetbrains.kotlin.modules; +package org.jetbrains.kotlin.modules -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; -import org.jetbrains.kotlin.config.IncrementalCompilation; -import org.jetbrains.kotlin.jps.build.JvmSourceRoot; -import org.jetbrains.kotlin.utils.Printer; +import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName +import com.intellij.openapi.util.text.StringUtil.escapeXml +import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType +import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.* +import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.jps.build.JvmSourceRoot +import org.jetbrains.kotlin.utils.Printer +import java.io.File -import java.io.File; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Set; +class KotlinModuleXmlBuilder { + private val xml = StringBuilder() + private val p = Printer(xml) + private var done = false -import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName; -import static com.intellij.openapi.util.text.StringUtil.escapeXml; -import static org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.*; - -public class KotlinModuleXmlBuilder { - private final StringBuilder xml = new StringBuilder(); - private final Printer p = new Printer(xml); - private boolean done = false; - - public KotlinModuleXmlBuilder() { - openTag(p, MODULES); + init { + openTag(p, MODULES) } - public KotlinModuleXmlBuilder addModule( - String moduleName, - String outputDir, - List sourceFiles, - List javaSourceRoots, - Collection classpathRoots, - JavaModuleBuildTargetType targetType, - Set directoriesToFilterOut, - @NotNull List friendDirs - ) { - assert !done : "Already done"; + fun addModule( + moduleName: String, + outputDir: String, + sourceFiles: List, + javaSourceRoots: List, + classpathRoots: Collection, + targetType: JavaModuleBuildTargetType, + directoriesToFilterOut: Set, + friendDirs: List): KotlinModuleXmlBuilder { + assert(!done) { "Already done" } - if (targetType.isTests()) { - p.println(""); + if (targetType.isTests) { + p.println("") } else { - p.println(""); + p.println("") } p.println("<", MODULE, " ", NAME, "=\"", escapeXml(moduleName), "\" ", - TYPE, "=\"", escapeXml(targetType.getTypeId()), "\" ", - OUTPUT_DIR, "=\"", getEscapedPath(new File(outputDir)), "\">" - ); - p.pushIndent(); + TYPE, "=\"", escapeXml(targetType.typeId), "\" ", + OUTPUT_DIR, "=\"", getEscapedPath(File(outputDir)), "\">") + p.pushIndent() - for (File friendDir : friendDirs) { - p.println("<", FRIEND_DIR, " ", PATH, "=\"", getEscapedPath(friendDir), "\"/>"); + for (friendDir in friendDirs) { + p.println("<", FRIEND_DIR, " ", PATH, "=\"", getEscapedPath(friendDir), "\"/>") } - for (File sourceFile : sourceFiles) { - p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>"); + for (sourceFile in sourceFiles) { + p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>") } - processJavaSourceRoots(javaSourceRoots); - processClasspath(classpathRoots, directoriesToFilterOut); + processJavaSourceRoots(javaSourceRoots) + processClasspath(classpathRoots, directoriesToFilterOut) - closeTag(p, MODULE); - return this; + closeTag(p, MODULE) + return this } - private void processClasspath( - @NotNull Collection files, - @NotNull Set directoriesToFilterOut - ) { - p.println(""); - for (File file : files) { - boolean isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.isEnabled(); + private fun processClasspath( + files: Collection, + directoriesToFilterOut: Set) { + p.println("") + for (file in files) { + val isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.isEnabled() if (isOutput) { // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was // removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath. - p.println(""); - p.println("") + p.println(""); + p.popIndent() + p.println("-->") } } } - private void processJavaSourceRoots(@NotNull List roots) { - p.println(""); - for (JvmSourceRoot root : roots) { - p.print("<"); - p.printWithNoIndent(JAVA_SOURCE_ROOTS, " ", PATH, "=\"", getEscapedPath(root.getFile()), "\""); + private fun processJavaSourceRoots(roots: List) { + p.println("") + for (root in roots) { + p.print("<") + p.printWithNoIndent(JAVA_SOURCE_ROOTS, " ", PATH, "=\"", getEscapedPath(root.file), "\"") - if (root.getPackagePrefix() != null) { - p.printWithNoIndent(" ", JAVA_SOURCE_PACKAGE_PREFIX, "=\"", root.getPackagePrefix(), "\""); + if (root.packagePrefix != null) { + p.printWithNoIndent(" ", JAVA_SOURCE_PACKAGE_PREFIX, "=\"", root.packagePrefix, "\"") } - p.printWithNoIndent("/>"); - p.println(); + p.printWithNoIndent("/>") + p.println() } } - public CharSequence asText() { + fun asText(): CharSequence { if (!done) { - closeTag(p, MODULES); - done = true; + closeTag(p, MODULES) + done = true } - return xml; + return xml } - private static void openTag(Printer p, String tag) { - p.println("<" + tag + ">"); - p.pushIndent(); + private fun openTag(p: Printer, tag: String) { + p.println("<$tag>") + p.pushIndent() } - private static void closeTag(Printer p, String tag) { - p.popIndent(); - p.println(""); + private fun closeTag(p: Printer, tag: String) { + p.popIndent() + p.println("") } - private static String getEscapedPath(File sourceFile) { - return escapeXml(toSystemIndependentName(sourceFile.getPath())); + private fun getEscapedPath(sourceFile: File): String { + return escapeXml(toSystemIndependentName(sourceFile.path)) } } From 4c7dfda0809101a7f0c40e0f2c2ad16e1cf8e909 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 15 Jan 2016 15:57:40 +0300 Subject: [PATCH 0765/1557] Move compiler running utils to common module Original commit: 6198d0abbc71cc7fd5ed506dc39d90d67b804da9 --- .../compilerRunner/OutputItemsCollector.java | 24 ---- .../OutputItemsCollectorImpl.java | 38 ----- .../compilerRunner/SimpleOutputItem.java | 47 ------ .../kotlin/jps/build/JvmSourceRoot.kt | 21 --- .../KotlinBuilderModuleScriptGenerator.java | 4 +- .../kotlin/modules/KotlinModuleXmlBuilder.kt | 136 ------------------ .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 5 +- .../modules/KotlinModuleXmlGeneratorTest.java | 14 +- 8 files changed, 15 insertions(+), 274 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JvmSourceRoot.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java deleted file mode 100644 index a05fe540e47..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.compilerRunner; - -import java.io.File; -import java.util.Collection; - -public interface OutputItemsCollector { - void add(Collection sourceFiles, File outputFile); -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java deleted file mode 100644 index b2b40cd1811..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.compilerRunner; - -import com.intellij.util.containers.ContainerUtil; -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.util.Collection; -import java.util.List; - -public class OutputItemsCollectorImpl implements OutputItemsCollector { - private final List outputs = ContainerUtil.newArrayList(); - - @Override - public void add(Collection sourceFiles, File outputFile) { - outputs.add(new SimpleOutputItem(sourceFiles, outputFile)); - } - - @NotNull - public List getOutputs() { - return outputs; - } -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java deleted file mode 100644 index ed9c716f7cb..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.compilerRunner; - -import org.jetbrains.annotations.NotNull; - -import java.io.File; -import java.util.Collection; - -public class SimpleOutputItem { - private final Collection sourceFiles; - private final File outputFile; - - public SimpleOutputItem(@NotNull Collection sourceFiles, @NotNull File outputFile) { - this.sourceFiles = sourceFiles; - this.outputFile = outputFile; - } - - @NotNull - public Collection getSourceFiles() { - return sourceFiles; - } - - @NotNull - public File getOutputFile() { - return outputFile; - } - - @Override - public String toString() { - return sourceFiles + " -> " + outputFile; - } -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JvmSourceRoot.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JvmSourceRoot.kt deleted file mode 100644 index 6dba446f049..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JvmSourceRoot.kt +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.build - -import java.io.File - -data class JvmSourceRoot(val file: File, val packagePrefix: String? = null) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java index af6e1488181..f6afa1e7e14 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java @@ -33,6 +33,7 @@ import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.incremental.ProjectBuildException; import org.jetbrains.jps.model.java.JpsJavaExtensionService; +import org.jetbrains.kotlin.build.JvmSourceRoot; import org.jetbrains.kotlin.config.IncrementalCompilation; import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder; @@ -89,7 +90,8 @@ public class KotlinBuilderModuleScriptGenerator { moduleSources, findSourceRoots(context, target), findClassPathRoots(target), - (JavaModuleBuildTargetType) targetType, + ((JavaModuleBuildTargetType) targetType).getTypeId(), + ((JavaModuleBuildTargetType) targetType).isTests(), // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs, friendDirs diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt deleted file mode 100644 index 41f90832c4f..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/KotlinModuleXmlBuilder.kt +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.modules - -import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName -import com.intellij.openapi.util.text.StringUtil.escapeXml -import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType -import org.jetbrains.kotlin.cli.common.modules.ModuleXmlParser.* -import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.jps.build.JvmSourceRoot -import org.jetbrains.kotlin.utils.Printer -import java.io.File - -class KotlinModuleXmlBuilder { - private val xml = StringBuilder() - private val p = Printer(xml) - private var done = false - - init { - openTag(p, MODULES) - } - - fun addModule( - moduleName: String, - outputDir: String, - sourceFiles: List, - javaSourceRoots: List, - classpathRoots: Collection, - targetType: JavaModuleBuildTargetType, - directoriesToFilterOut: Set, - friendDirs: List): KotlinModuleXmlBuilder { - assert(!done) { "Already done" } - - if (targetType.isTests) { - p.println("") - } - else { - p.println("") - } - - p.println("<", MODULE, " ", - NAME, "=\"", escapeXml(moduleName), "\" ", - TYPE, "=\"", escapeXml(targetType.typeId), "\" ", - OUTPUT_DIR, "=\"", getEscapedPath(File(outputDir)), "\">") - p.pushIndent() - - for (friendDir in friendDirs) { - p.println("<", FRIEND_DIR, " ", PATH, "=\"", getEscapedPath(friendDir), "\"/>") - } - - for (sourceFile in sourceFiles) { - p.println("<", SOURCES, " ", PATH, "=\"", getEscapedPath(sourceFile), "\"/>") - } - - processJavaSourceRoots(javaSourceRoots) - processClasspath(classpathRoots, directoriesToFilterOut) - - closeTag(p, MODULE) - return this - } - - private fun processClasspath( - files: Collection, - directoriesToFilterOut: Set) { - p.println("") - for (file in files) { - val isOutput = directoriesToFilterOut.contains(file) && !IncrementalCompilation.isEnabled() - if (isOutput) { - // For IDEA's make (incremental compilation) purposes, output directories of the current module and its dependencies - // appear on the class path, so we are at risk of seeing the results of the previous build, i.e. if some class was - // removed in the sources, it may still be there in binaries. Thus, we delete these entries from the classpath. - p.println("") - p.println("") - } - } - } - - private fun processJavaSourceRoots(roots: List) { - p.println("") - for (root in roots) { - p.print("<") - p.printWithNoIndent(JAVA_SOURCE_ROOTS, " ", PATH, "=\"", getEscapedPath(root.file), "\"") - - if (root.packagePrefix != null) { - p.printWithNoIndent(" ", JAVA_SOURCE_PACKAGE_PREFIX, "=\"", root.packagePrefix, "\"") - } - - p.printWithNoIndent("/>") - p.println() - } - } - - fun asText(): CharSequence { - if (!done) { - closeTag(p, MODULES) - done = true - } - return xml - } - - private fun openTag(p: Printer, tag: String) { - p.println("<$tag>") - p.pushIndent() - } - - private fun closeTag(p: Printer, tag: String) { - p.popIndent() - p.println("") - } - - private fun getEscapedPath(sourceFile: File): String { - return escapeXml(toSystemIndependentName(sourceFile.path)) - } -} diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 40f75a9b648..a3c1581b6b6 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -17,7 +17,7 @@ package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType -import org.jetbrains.kotlin.jps.build.JvmSourceRoot +import org.jetbrains.kotlin.build.JvmSourceRoot import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil @@ -46,7 +46,8 @@ class ClasspathOrderTest : TestCaseWithTmpdir() { listOf(sourceDir), listOf(JvmSourceRoot(sourceDir)), listOf(PathUtil.getKotlinPathsForDistDirectory().runtimePath), - JavaModuleBuildTargetType.PRODUCTION, + JavaModuleBuildTargetType.PRODUCTION.typeId, + JavaModuleBuildTargetType.PRODUCTION.isTests, setOf(), emptyList() ).asText().toString() diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java index a30b6c775ad..b8fedb9f6fd 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.modules; import junit.framework.TestCase; import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; -import org.jetbrains.kotlin.jps.build.JvmSourceRoot; +import org.jetbrains.kotlin.build.JvmSourceRoot; import org.jetbrains.kotlin.test.KotlinTestUtils; import java.io.File; @@ -33,7 +33,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.singletonList(new JvmSourceRoot(new File("java"), null)), Arrays.asList(new File("cp1"), new File("cp2")), - JavaModuleBuildTargetType.PRODUCTION, + JavaModuleBuildTargetType.PRODUCTION.getTypeId(), + JavaModuleBuildTargetType.PRODUCTION.isTests(), Collections.emptySet(), Collections.emptyList() ).asText().toString(); @@ -47,7 +48,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), - JavaModuleBuildTargetType.PRODUCTION, + JavaModuleBuildTargetType.PRODUCTION.getTypeId(), + JavaModuleBuildTargetType.PRODUCTION.isTests(), Collections.singleton(new File("cp1")), Collections.emptyList() ).asText().toString(); @@ -62,7 +64,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s1"), new File("s2")), Collections.emptyList(), Arrays.asList(new File("cp1"), new File("cp2")), - JavaModuleBuildTargetType.PRODUCTION, + JavaModuleBuildTargetType.PRODUCTION.getTypeId(), + JavaModuleBuildTargetType.PRODUCTION.isTests(), Collections.singleton(new File("cp1")), Collections.emptyList() ); @@ -72,7 +75,8 @@ public class KotlinModuleXmlGeneratorTest extends TestCase { Arrays.asList(new File("s12"), new File("s22")), Collections.emptyList(), Arrays.asList(new File("cp12"), new File("cp22")), - JavaModuleBuildTargetType.TEST, + JavaModuleBuildTargetType.TEST.getTypeId(), + JavaModuleBuildTargetType.TEST.isTests(), Collections.singleton(new File("cp12")), Collections.emptyList() ); From 00020f6d742c13d4f9862c2455c9defa0fdc79d2 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 28 Nov 2015 01:42:20 +0300 Subject: [PATCH 0766/1557] Fix testData in compiler: add collections and ranges package to fq-names. Original commit: f4822cd75747f659356a8d3cd9a8b1c2ba835b15 --- .../pureKotlin/conflictingPlatformDeclarations/build.log | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index a52dc89f8cb..33f02d294ad 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -8,8 +8,8 @@ src/fun2.kt End of files COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: kotlin.List): kotlin.Unit - fun function(list: kotlin.List): kotlin.Unit + fun function(list: kotlin.collections.List): kotlin.Unit + fun function(list: kotlin.collections.List): kotlin.Unit Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: kotlin.List): kotlin.Unit - fun function(list: kotlin.List): kotlin.Unit \ No newline at end of file + fun function(list: kotlin.collections.List): kotlin.Unit + fun function(list: kotlin.collections.List): kotlin.Unit \ No newline at end of file From 5ded4dd4b045c377e0c3c9a23cded9de6a01804a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Dec 2015 15:05:34 +0300 Subject: [PATCH 0767/1557] Add incremental compilation tests with changes of companion object Original commit: a7c432ebe868b3bc2e121bdd511a78fb554d897b --- ...perimentalIncrementalJpsTestGenerated.java | 24 ++++++++++++ .../A.kt | 3 ++ .../B.kt | 3 ++ .../B.kt.new.1 | 3 ++ .../build.log | 36 ++++++++++++++++++ .../companionExtension.kt | 3 ++ .../companionExtension.kt.new.2 | 3 ++ .../companionReferenceExplicit.kt | 3 ++ .../companionReferenceExplicit.kt.new.2 | 3 ++ .../companionReferenceImplicit.kt | 3 ++ .../companionReferenceImplicit.kt.new.2 | 3 ++ .../importedMember.kt | 5 +++ .../importedMember.kt.new.2 | 5 +++ .../companionObjectMemberChanged/A.kt | 5 +++ .../companionObjectMemberChanged/A.kt.new.1 | 5 +++ .../companionObjectMemberChanged/build.log | 38 +++++++++++++++++++ .../companionExtension.kt | 3 ++ .../companionExtension.kt.new.2 | 3 ++ .../companionReferenceExplicit.kt | 3 ++ .../companionReferenceExplicit.kt.new.2 | 3 ++ .../companionReferenceImplicit.kt | 3 ++ .../companionReferenceImplicit.kt.new.2 | 3 ++ .../importedMember.kt | 5 +++ .../importedMember.kt.new.2 | 5 +++ .../companionObjectNameChanged/A.kt | 5 +++ .../companionObjectNameChanged/A.kt.new.1 | 5 +++ .../companionObjectNameChanged/build.log | 33 ++++++++++++++++ .../companionExtension.kt | 3 ++ .../companionExtension.kt.new.2 | 3 ++ .../companionReferenceExplicit.kt | 3 ++ .../companionReferenceExplicit.kt.new.2 | 3 ++ .../companionReferenceImplicit.kt | 3 ++ .../companionObjectToSimpleObject/A.kt | 5 +++ .../companionObjectToSimpleObject/A.kt.new.1 | 5 +++ .../companionObjectToSimpleObject/build.log | 32 ++++++++++++++++ .../companionExtension.kt | 3 ++ .../companionReferenceExplicit.kt | 3 ++ .../companionReferenceImplicit.kt | 3 ++ .../companionReferenceImplicit.kt.new.2 | 3 ++ 39 files changed, 285 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 67fde1a276f..617ba2511c9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1075,6 +1075,30 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("companionObjectInheritedMemberChanged") + public void testCompanionObjectInheritedMemberChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/"); + doTest(fileName); + } + + @TestMetadata("companionObjectMemberChanged") + public void testCompanionObjectMemberChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/"); + doTest(fileName); + } + + @TestMetadata("companionObjectNameChanged") + public void testCompanionObjectNameChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/"); + doTest(fileName); + } + + @TestMetadata("companionObjectToSimpleObject") + public void testCompanionObjectToSimpleObject() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/"); + doTest(fileName); + } + @TestMetadata("constructorVisibilityChanged") public void testConstructorVisibilityChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/"); diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt new file mode 100644 index 00000000000..953bf9cccce --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/A.kt @@ -0,0 +1,3 @@ +class A { + companion object AA : B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt new file mode 100644 index 00000000000..907bdf34387 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt @@ -0,0 +1,3 @@ +open class B { + val x: String = "" +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 new file mode 100644 index 00000000000..d31e5521fd0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/B.kt.new.1 @@ -0,0 +1,3 @@ +open class B { + val x: String? = null +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log new file mode 100644 index 00000000000..f83d4d254bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log @@ -0,0 +1,36 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/CompanionExtensionKt.class +out/production/module/CompanionReferenceExplicitKt.class +out/production/module/CompanionReferenceImplicitKt.class +out/production/module/ImportedMemberKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +src/importedMember.kt +End of files +COMPILATION FAILED +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +src/importedMember.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt new file mode 100644 index 00000000000..983f6be3eec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 new file mode 100644 index 00000000000..9f737301219 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionExtension.kt.new.2 @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt new file mode 100644 index 00000000000..1a0c196d40c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 new file mode 100644 index 00000000000..c9e3e203569 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceExplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt new file mode 100644 index 00000000000..b811959ef21 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 new file mode 100644 index 00000000000..8745fbe624c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/companionReferenceImplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt new file mode 100644 index 00000000000..fa4633524d1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt @@ -0,0 +1,5 @@ +import A.AA.x + +fun importedMember() { + x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 new file mode 100644 index 00000000000..bf230a27d1b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/importedMember.kt.new.2 @@ -0,0 +1,5 @@ +import A.AA.x + +fun importedMember() { + x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt new file mode 100644 index 00000000000..9023a3c731d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt @@ -0,0 +1,5 @@ +class A { + companion object AA { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 new file mode 100644 index 00000000000..0976411519f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +class A { + companion object AA { + val x: String? = "" + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log new file mode 100644 index 00000000000..7c6f3bca8d8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log @@ -0,0 +1,38 @@ +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/CompanionExtensionKt.class +out/production/module/CompanionReferenceExplicitKt.class +out/production/module/CompanionReferenceImplicitKt.class +out/production/module/ImportedMemberKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +src/importedMember.kt +End of files +COMPILATION FAILED +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? + + +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +src/importedMember.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt new file mode 100644 index 00000000000..983f6be3eec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 new file mode 100644 index 00000000000..9f737301219 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionExtension.kt.new.2 @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt new file mode 100644 index 00000000000..1a0c196d40c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 new file mode 100644 index 00000000000..c9e3e203569 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceExplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt new file mode 100644 index 00000000000..b811959ef21 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 new file mode 100644 index 00000000000..8745fbe624c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/companionReferenceImplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt new file mode 100644 index 00000000000..fa4633524d1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt @@ -0,0 +1,5 @@ +import A.AA.x + +fun importedMember() { + x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 new file mode 100644 index 00000000000..bf230a27d1b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/importedMember.kt.new.2 @@ -0,0 +1,5 @@ +import A.AA.x + +fun importedMember() { + x?.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt new file mode 100644 index 00000000000..bfaf514dd9a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt @@ -0,0 +1,5 @@ +class A { + companion object { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 new file mode 100644 index 00000000000..9023a3c731d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/A.kt.new.1 @@ -0,0 +1,5 @@ +class A { + companion object AA { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log new file mode 100644 index 00000000000..1787756a360 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log @@ -0,0 +1,33 @@ +Cleaning output files: +out/production/module/A$Companion.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/CompanionExtensionKt.class +out/production/module/CompanionReferenceExplicitKt.class +out/production/module/CompanionReferenceImplicitKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +End of files +COMPILATION FAILED +Unresolved reference: Companion +Unresolved reference: Companion + + +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt new file mode 100644 index 00000000000..5968cacacaa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt @@ -0,0 +1,3 @@ +fun A.Companion.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 new file mode 100644 index 00000000000..983f6be3eec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionExtension.kt.new.2 @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt new file mode 100644 index 00000000000..e5a86cc31a2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt @@ -0,0 +1,3 @@ +fun explicitRef() { + A.Companion.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 new file mode 100644 index 00000000000..1a0c196d40c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceExplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt new file mode 100644 index 00000000000..b811959ef21 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/companionReferenceImplicit.kt @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt new file mode 100644 index 00000000000..9023a3c731d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt @@ -0,0 +1,5 @@ +class A { + companion object AA { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 new file mode 100644 index 00000000000..bbcc3b8bd24 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/A.kt.new.1 @@ -0,0 +1,5 @@ +class A { + object AA { + val x: String = "" + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log new file mode 100644 index 00000000000..2d1c1668c52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log @@ -0,0 +1,32 @@ +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/CompanionExtensionKt.class +out/production/module/CompanionReferenceExplicitKt.class +out/production/module/CompanionReferenceImplicitKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +End of files +COMPILATION FAILED +Unresolved reference: x + + +Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/companionExtension.kt +src/companionReferenceExplicit.kt +src/companionReferenceImplicit.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt new file mode 100644 index 00000000000..983f6be3eec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionExtension.kt @@ -0,0 +1,3 @@ +fun A.AA.ext() { + x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt new file mode 100644 index 00000000000..1a0c196d40c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceExplicit.kt @@ -0,0 +1,3 @@ +fun explicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt new file mode 100644 index 00000000000..b811959ef21 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt @@ -0,0 +1,3 @@ +fun implicitRef() { + A.x.hashCode() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 new file mode 100644 index 00000000000..af0f9bee8f3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/companionReferenceImplicit.kt.new.2 @@ -0,0 +1,3 @@ +fun implicitRef() { + A.AA.x.hashCode() +} \ No newline at end of file From 2a1bde949645337934a4c9069cbd783112debb3f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 15 Jan 2016 15:24:15 +0300 Subject: [PATCH 0768/1557] Add proto comparison tests with changes of class/member flags Original commit: 58a91b3d205be6264fb943810256d434385ab079 --- .../ProtoComparisonTestGenerated.java | 12 +++ .../membersFlagsChanged/new.kt | 85 +++++++++++++++++++ .../membersFlagsChanged/old.kt | 85 +++++++++++++++++++ .../membersFlagsChanged/result.out | 4 + .../classFlagsChanged/new.kt | 53 +++++++++++- .../classFlagsChanged/old.kt | 53 +++++++++++- .../classFlagsChanged/result.out | 42 ++++++++- .../packageMembers/membersFlagsChanged/new.kt | 51 +++++++++++ .../packageMembers/membersFlagsChanged/old.kt | 49 +++++++++++ .../membersFlagsChanged/result.out | 2 + 10 files changed, 432 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/result.out diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 896815ab04f..2b557376bb9 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -159,6 +159,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } + @TestMetadata("membersFlagsChanged") + public void testMembersFlagsChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/"); + doTest(fileName); + } + @TestMetadata("sealedClassImplAdded") public void testSealedClassImplAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded/"); @@ -175,6 +181,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("membersFlagsChanged") + public void testMembersFlagsChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/"); + doTest(fileName); + } + @TestMetadata("packageFacadeMultifileClassChanged") public void testPackageFacadeMultifileClassChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/packageFacadeMultifileClassChanged/"); diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt new file mode 100644 index 00000000000..64e31c38d67 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt @@ -0,0 +1,85 @@ +package test + +abstract class A { + abstract val abstractFlagAddedVal: String + val abstractFlagRemovedVal: String = "" + abstract val abstractFlagUnchangedVal: String + abstract fun abstractFlagAddedFun() + fun abstractFlagRemovedFun() {} + abstract fun abstractFlagUnchangedFun() + + external fun externalFlagAddedFun() + fun externalFlagRemovedFun() {} + external fun externalFlagUnchangedFun() + + final val finalFlagAddedVal = "" + val finalFlagRemovedVal = "" + final val finalFlagUnchangedVal = "" + final fun finalFlagAddedFun() {} + fun finalFlagRemovedFun() {} + final fun finalFlagUnchangedFun() {} + + infix fun infixFlagAddedFun() {} + fun infixFlagRemovedFun() {} + infix fun infixFlagUnchangedFun() {} + + inline fun inlineFlagAddedFun() {} + fun inlineFlagRemovedFun() {} + inline fun inlineFlagUnchangedFun() {} + + internal val internalFlagAddedVal = "" + val internalFlagRemovedVal = "" + internal val internalFlagUnchangedVal = "" + internal fun internalFlagAddedFun() {} + fun internalFlagRemovedFun() {} + internal fun internalFlagUnchangedFun() {} + + lateinit var lateinitFlagAddedVal: String + var lateinitFlagRemovedVal: String = "" + lateinit var lateinitFlagUnchangedVal: String + + open val openFlagAddedVal = "" + val openFlagRemovedVal = "" + open val openFlagUnchangedVal = "" + open fun openFlagAddedFun() {} + fun openFlagRemovedFun() {} + open fun openFlagUnchangedFun() {} + + operator fun operatorFlagAddedFun() {} + fun operatorFlagRemovedFun() {} + operator fun operatorFlagUnchangedFun() {} + + private val privateFlagAddedVal = "" + val privateFlagRemovedVal = "" + private val privateFlagUnchangedVal = "" + private fun privateFlagAddedFun() {} + fun privateFlagRemovedFun() {} + private fun privateFlagUnchangedFun() {} + + protected val protectedFlagAddedVal = "" + val protectedFlagRemovedVal = "" + protected val protectedFlagUnchangedVal = "" + protected fun protectedFlagAddedFun() {} + fun protectedFlagRemovedFun() {} + protected fun protectedFlagUnchangedFun() {} + + public val publicFlagAddedVal = "" + val publicFlagRemovedVal = "" + public val publicFlagUnchangedVal = "" + public fun publicFlagAddedFun() {} + fun publicFlagRemovedFun() {} + public fun publicFlagUnchangedFun() {} + + tailrec fun tailrecFlagAddedFun() {} + fun tailrecFlagRemovedFun() {} + tailrec fun tailrecFlagUnchangedFun() {} + + val noFlagsUnchangedVal = "" + fun noFlagsUnchangedFun() {} +} + +object O { + const val constFlagAddedVal = "" + val constFlagRemovedVal = "" + const val constFlagUnchangedVal = "" +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt new file mode 100644 index 00000000000..b9097dd4a86 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt @@ -0,0 +1,85 @@ +package test + +abstract class A { + val abstractFlagAddedVal: String = "" + abstract val abstractFlagRemovedVal: String + abstract val abstractFlagUnchangedVal: String + fun abstractFlagAddedFun() {} + abstract fun abstractFlagRemovedFun() + abstract fun abstractFlagUnchangedFun() + + fun externalFlagAddedFun() {} + external fun externalFlagRemovedFun() + external fun externalFlagUnchangedFun() + + val finalFlagAddedVal = "" + final val finalFlagRemovedVal = "" + final val finalFlagUnchangedVal = "" + fun finalFlagAddedFun() {} + final fun finalFlagRemovedFun() {} + final fun finalFlagUnchangedFun() {} + + fun infixFlagAddedFun() {} + infix fun infixFlagRemovedFun() {} + infix fun infixFlagUnchangedFun() {} + + fun inlineFlagAddedFun() {} + inline fun inlineFlagRemovedFun() {} + inline fun inlineFlagUnchangedFun() {} + + val internalFlagAddedVal = "" + internal val internalFlagRemovedVal = "" + internal val internalFlagUnchangedVal = "" + fun internalFlagAddedFun() {} + internal fun internalFlagRemovedFun() {} + internal fun internalFlagUnchangedFun() {} + + var lateinitFlagAddedVal = "" + lateinit var lateinitFlagRemovedVal: String + lateinit var lateinitFlagUnchangedVal: String + + val openFlagAddedVal = "" + open val openFlagRemovedVal = "" + open val openFlagUnchangedVal = "" + fun openFlagAddedFun() {} + open fun openFlagRemovedFun() {} + open fun openFlagUnchangedFun() {} + + fun operatorFlagAddedFun() {} + operator fun operatorFlagRemovedFun() {} + operator fun operatorFlagUnchangedFun() {} + + val privateFlagAddedVal = "" + private val privateFlagRemovedVal = "" + private val privateFlagUnchangedVal = "" + fun privateFlagAddedFun() {} + private fun privateFlagRemovedFun() {} + private fun privateFlagUnchangedFun() {} + + val protectedFlagAddedVal = "" + protected val protectedFlagRemovedVal = "" + protected val protectedFlagUnchangedVal = "" + fun protectedFlagAddedFun() {} + protected fun protectedFlagRemovedFun() {} + protected fun protectedFlagUnchangedFun() {} + + val publicFlagAddedVal = "" + public val publicFlagRemovedVal = "" + public val publicFlagUnchangedVal = "" + fun publicFlagAddedFun() {} + public fun publicFlagRemovedFun() {} + public fun publicFlagUnchangedFun() {} + + fun tailrecFlagAddedFun() {} + tailrec fun tailrecFlagRemovedFun() {} + tailrec fun tailrecFlagUnchangedFun() {} + + val noFlagsUnchangedVal = "" + fun noFlagsUnchangedFun() {} +} + +object O { + val constFlagAddedVal = "" + const val constFlagRemovedVal = "" + const val constFlagUnchangedVal = "" +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out new file mode 100644 index 00000000000..f767ff8431d --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/result.out @@ -0,0 +1,4 @@ +changes in test/A: MEMBERS + [abstractFlagAddedFun, abstractFlagAddedVal, abstractFlagRemovedFun, abstractFlagRemovedVal, externalFlagAddedFun, externalFlagRemovedFun, infixFlagAddedFun, infixFlagRemovedFun, inlineFlagAddedFun, inlineFlagRemovedFun, internalFlagAddedFun, internalFlagAddedVal, internalFlagRemovedFun, internalFlagRemovedVal, lateinitFlagAddedVal, lateinitFlagRemovedVal, openFlagAddedFun, openFlagAddedVal, openFlagRemovedFun, openFlagRemovedVal, operatorFlagAddedFun, operatorFlagRemovedFun, privateFlagAddedFun, privateFlagAddedVal, privateFlagRemovedFun, privateFlagRemovedVal, protectedFlagAddedFun, protectedFlagAddedVal, protectedFlagRemovedFun, protectedFlagRemovedVal, tailrecFlagAddedFun, tailrecFlagRemovedFun] +changes in test/O: MEMBERS + [constFlagAddedVal, constFlagRemovedVal] diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/new.kt index 710e70d4f91..3ecb27bbb47 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/new.kt +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/new.kt @@ -1,6 +1,55 @@ package test -import kotlin.annotation.* +abstract class AbstractFlagAdded +class AbstractFlagRemoved +abstract class AbstractFlagUnchanged -open class ClassWithFlagsChanged { +annotation class AnnotationFlagAdded +class AnnotationFlagRemoved +annotation class AnnotationFlagUnchanged + +data class DataFlagAdded(val x: Int) +class DataFlagRemoved(val x: Int) +data class DataFlagUnchanged(val x: Int) + +enum class EnumFlagAdded +class EnumFlagRemoved +enum class EnumFlagUnchanged + +final class FinalFlagAdded +class FinalFlagRemoved +final class FinalFlagUnchanged + +class InnerClassHolder { + inner class InnerFlagAdded + class InnerFlagRemoved + inner class InnerFlagUnchanged } + +internal class InternalFlagAdded +class InternalFlagRemoved +internal class InternalFlagUnchanged + +open class OpenFlagAdded +class OpenFlagRemoved +open class OpenFlagUnchanged + +private class PrivateFlagAdded +class PrivateFlagRemoved +private class PrivateFlagUnchanged + +class ProtectedClassHolder { + protected class ProtectedFlagAdded + class ProtectedFlagRemoved + protected class ProtectedFlagUnchanged +} + +public class PublicFlagAdded +class PublicFlagRemoved +public class PublicFlagUnchanged + +sealed class SealedFlagAdded +class SealedFlagRemoved +sealed class SealedFlagUnchanged + +class UnchangedNoFlags \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/old.kt index 6d7875d5438..756c07a80ee 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/old.kt +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/old.kt @@ -1,4 +1,55 @@ package test -class ClassWithFlagsChanged { +class AbstractFlagAdded +abstract class AbstractFlagRemoved +abstract class AbstractFlagUnchanged + +class AnnotationFlagAdded +annotation class AnnotationFlagRemoved +annotation class AnnotationFlagUnchanged + +class DataFlagAdded(val x: Int) +data class DataFlagRemoved(val x: Int) +data class DataFlagUnchanged(val x: Int) + +class EnumFlagAdded +enum class EnumFlagRemoved +enum class EnumFlagUnchanged + +class FinalFlagAdded +final class FinalFlagRemoved +final class FinalFlagUnchanged + +class InnerClassHolder { + class InnerFlagAdded + inner class InnerFlagRemoved + inner class InnerFlagUnchanged } + +class InternalFlagAdded +internal class InternalFlagRemoved +internal class InternalFlagUnchanged + +class OpenFlagAdded +open class OpenFlagRemoved +open class OpenFlagUnchanged + +class PrivateFlagAdded +private class PrivateFlagRemoved +private class PrivateFlagUnchanged + +class ProtectedClassHolder { + class ProtectedFlagAdded + protected class ProtectedFlagRemoved + protected class ProtectedFlagUnchanged +} + +class PublicFlagAdded +public class PublicFlagRemoved +public class PublicFlagUnchanged + +class SealedFlagAdded +sealed class SealedFlagRemoved +sealed class SealedFlagUnchanged + +class UnchangedNoFlags \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out index 212f70d8f79..df8bc66d450 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out @@ -1 +1,41 @@ -changes in test/ClassWithFlagsChanged: CLASS_SIGNATURE +changes in test/AbstractFlagAdded: CLASS_SIGNATURE +changes in test/AbstractFlagRemoved: CLASS_SIGNATURE +changes in test/AbstractFlagUnchanged: NONE +changes in test/AnnotationFlagAdded: CLASS_SIGNATURE +changes in test/AnnotationFlagRemoved: CLASS_SIGNATURE +changes in test/AnnotationFlagUnchanged: NONE +changes in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS + [component1, copy] +changes in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS + [component1, copy] +changes in test/DataFlagUnchanged: NONE +changes in test/EnumFlagAdded: CLASS_SIGNATURE +changes in test/EnumFlagRemoved: CLASS_SIGNATURE +changes in test/EnumFlagUnchanged: NONE +changes in test/FinalFlagAdded: NONE +changes in test/FinalFlagRemoved: NONE +changes in test/FinalFlagUnchanged: NONE +changes in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE +changes in test/InnerClassHolder.InnerFlagRemoved: CLASS_SIGNATURE +changes in test/InnerClassHolder.InnerFlagUnchanged: NONE +changes in test/InnerClassHolder: NONE +changes in test/InternalFlagAdded: CLASS_SIGNATURE +changes in test/InternalFlagRemoved: CLASS_SIGNATURE +changes in test/InternalFlagUnchanged: NONE +changes in test/OpenFlagAdded: CLASS_SIGNATURE +changes in test/OpenFlagRemoved: CLASS_SIGNATURE +changes in test/OpenFlagUnchanged: NONE +changes in test/PrivateFlagAdded: CLASS_SIGNATURE +changes in test/PrivateFlagRemoved: CLASS_SIGNATURE +changes in test/PrivateFlagUnchanged: NONE +changes in test/ProtectedClassHolder.ProtectedFlagAdded: CLASS_SIGNATURE +changes in test/ProtectedClassHolder.ProtectedFlagRemoved: CLASS_SIGNATURE +changes in test/ProtectedClassHolder.ProtectedFlagUnchanged: NONE +changes in test/ProtectedClassHolder: NONE +changes in test/PublicFlagAdded: NONE +changes in test/PublicFlagRemoved: NONE +changes in test/PublicFlagUnchanged: NONE +changes in test/SealedFlagAdded: CLASS_SIGNATURE +changes in test/SealedFlagRemoved: CLASS_SIGNATURE +changes in test/SealedFlagUnchanged: NONE +changes in test/UnchangedNoFlags: NONE diff --git a/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt new file mode 100644 index 00000000000..84e35d2b83c --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt @@ -0,0 +1,51 @@ +package test + +const val constFlagAddedVal = "" +val constFlagRemovedVal = "" +const val constFlagUnchangedVal = "" + +external fun externalFlagAddedFun() +fun externalFlagRemovedFun() {} +external fun externalFlagUnchangedFun() + +infix fun infixFlagAddedFun() {} +fun infixFlagRemovedFun() {} +infix fun infixFlagUnchangedFun() {} + +inline fun inlineFlagAddedFun() {} +fun inlineFlagRemovedFun() {} +inline fun inlineFlagUnchangedFun() {} + +internal val internalFlagAddedVal = "" +val internalFlagRemovedVal = "" +internal val internalFlagUnchangedVal = "" +internal fun internalFlagAddedFun() {} +fun internalFlagRemovedFun() {} +internal fun internalFlagUnchangedFun() {} + +operator fun operatorFlagAddedFun() {} +fun operatorFlagRemovedFun() {} +operator fun operatorFlagUnchangedFun() {} + +private val privateFlagAddedVal = "" +val privateFlagRemovedVal = "" +private val privateFlagUnchangedVal = "" +private fun privateFlagAddedFun() {} +fun privateFlagRemovedFun() {} +private fun privateFlagUnchangedFun() {} + +public val publicFlagAddedVal = "" +val publicFlagRemovedVal = "" +public val publicFlagUnchangedVal = "" +public fun publicFlagAddedFun() {} +fun publicFlagRemovedFun() {} +public fun publicFlagUnchangedFun() {} + +tailrec fun tailrecFlagAddedFun() {} +fun tailrecFlagRemovedFun() {} +tailrec fun tailrecFlagUnchangedFun() {} + +val noFlagsUnchangedVal = "" +fun noFlagsUnchangedFun() {} + + diff --git a/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt new file mode 100644 index 00000000000..cfda1b58923 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt @@ -0,0 +1,49 @@ +package test + +val constFlagAddedVal = "" +const val constFlagRemovedVal = "" +const val constFlagUnchangedVal = "" + +fun externalFlagAddedFun() {} +external fun externalFlagRemovedFun() +external fun externalFlagUnchangedFun() + +fun infixFlagAddedFun() {} +infix fun infixFlagRemovedFun() {} +infix fun infixFlagUnchangedFun() {} + +fun inlineFlagAddedFun() {} +inline fun inlineFlagRemovedFun() {} +inline fun inlineFlagUnchangedFun() {} + +val internalFlagAddedVal = "" +internal val internalFlagRemovedVal = "" +internal val internalFlagUnchangedVal = "" +fun internalFlagAddedFun() {} +internal fun internalFlagRemovedFun() {} +internal fun internalFlagUnchangedFun() {} + +fun operatorFlagAddedFun() {} +operator fun operatorFlagRemovedFun() {} +operator fun operatorFlagUnchangedFun() {} + +val privateFlagAddedVal = "" +private val privateFlagRemovedVal = "" +private val privateFlagUnchangedVal = "" +fun privateFlagAddedFun() {} +private fun privateFlagRemovedFun() {} +private fun privateFlagUnchangedFun() {} + +val publicFlagAddedVal = "" +public val publicFlagRemovedVal = "" +public val publicFlagUnchangedVal = "" +fun publicFlagAddedFun() {} +public fun publicFlagRemovedFun() {} +public fun publicFlagUnchangedFun() {} + +fun tailrecFlagAddedFun() {} +tailrec fun tailrecFlagRemovedFun() {} +tailrec fun tailrecFlagUnchangedFun() {} + +val noFlagsUnchangedVal = "" +fun noFlagsUnchangedFun() {} diff --git a/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/result.out b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/result.out new file mode 100644 index 00000000000..a54ca374687 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/result.out @@ -0,0 +1,2 @@ +changes in test/MainKt: MEMBERS + [constFlagAddedVal, constFlagRemovedVal, externalFlagAddedFun, externalFlagRemovedFun, infixFlagAddedFun, infixFlagRemovedFun, inlineFlagAddedFun, inlineFlagRemovedFun, internalFlagAddedFun, internalFlagAddedVal, internalFlagRemovedFun, internalFlagRemovedVal, operatorFlagAddedFun, operatorFlagRemovedFun, privateFlagAddedFun, privateFlagAddedVal, privateFlagRemovedFun, privateFlagRemovedVal, tailrecFlagAddedFun, tailrecFlagRemovedFun] From 9d71fd4b21c7ee1b81d40d1d49f24b98d304b1cc Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 15 Jan 2016 15:32:23 +0300 Subject: [PATCH 0769/1557] Improve proto comparison test with changes of annotation list Original commit: 5ce692a75c0c2eadcff89fa21b49686e8690613e --- .../ProtoComparisonTestGenerated.java | 12 +++++------ .../classAnnotationListChanged/new.kt | 20 +++++++++++++++++++ .../classAnnotationListChanged/old.kt | 20 +++++++++++++++++++ .../classAnnotationListChanged/result.out | 7 +++++++ .../new.kt | 5 ----- .../old.kt | 4 ---- .../result.out | 1 - 7 files changed, 53 insertions(+), 16 deletions(-) create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out delete mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/new.kt delete mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/old.kt delete mode 100644 jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 2b557376bb9..4269b47f0ac 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -37,6 +37,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("classAnnotationListChanged") + public void testClassAnnotationListChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/"); + doTest(fileName); + } + @TestMetadata("classFlagsAndMembersChanged") public void testClassFlagsAndMembersChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged/"); @@ -61,12 +67,6 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } - @TestMetadata("classWithClassAnnotationListChanged") - public void testClassWithClassAnnotationListChanged() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/"); - doTest(fileName); - } - @TestMetadata("classWithSuperTypeListChanged") public void testClassWithSuperTypeListChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/"); diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/new.kt new file mode 100644 index 00000000000..fc7bee7454c --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/new.kt @@ -0,0 +1,20 @@ +package test + +annotation class Ann1 +annotation class Ann2 + +@Ann1 +@Ann2 +class AnnotationListBecomeNotEmpty + +class AnnotationListBecomeEmpty + +@Ann1 +@Ann2 +class AnnotationAdded + +@Ann1 +class AnnotationRemoved + +@Ann2 +class AnnotationReplaced diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/old.kt new file mode 100644 index 00000000000..517cdb5d01a --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/old.kt @@ -0,0 +1,20 @@ +package test + +annotation class Ann1 +annotation class Ann2 + +class AnnotationListBecomeNotEmpty + +@Ann1 +@Ann2 +class AnnotationListBecomeEmpty + +@Ann1 +class AnnotationAdded + +@Ann1 +@Ann2 +class AnnotationRemoved + +@Ann1 +class AnnotationReplaced diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out new file mode 100644 index 00000000000..34b8db80090 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged/result.out @@ -0,0 +1,7 @@ +changes in test/Ann1: NONE +changes in test/Ann2: NONE +changes in test/AnnotationAdded: NONE +changes in test/AnnotationListBecomeEmpty: CLASS_SIGNATURE +changes in test/AnnotationListBecomeNotEmpty: CLASS_SIGNATURE +changes in test/AnnotationRemoved: NONE +changes in test/AnnotationReplaced: NONE diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/new.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/new.kt deleted file mode 100644 index 7f1d546bb5c..00000000000 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/new.kt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -import kotlin.annotation.* - -annotation class ClassWithClassAnnotationListChanged diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/old.kt b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/old.kt deleted file mode 100644 index d7c7cb077d4..00000000000 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/old.kt +++ /dev/null @@ -1,4 +0,0 @@ -package test - -@Deprecated("") class ClassWithClassAnnotationListChanged - diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out deleted file mode 100644 index d447c5da3f9..00000000000 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithClassAnnotationListChanged/result.out +++ /dev/null @@ -1 +0,0 @@ -changes in test/ClassWithClassAnnotationListChanged: CLASS_SIGNATURE From cc979e34b1db99c6a53ad0e39f157279f901a342 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 15 Jan 2016 15:44:29 +0300 Subject: [PATCH 0770/1557] Add incremental compilation test with change of annotation class Original commit: 1ef615e02024c43647ff794ff11650e6666a503c --- ...perimentalIncrementalJpsTestGenerated.java | 6 ++++ .../annotationFlagRemoved/Ann1.kt | 1 + .../annotationFlagRemoved/Ann1.kt.new.1 | 1 + .../annotationFlagRemoved/Ann1.kt.new.2 | 1 + .../annotationFlagRemoved/Ann2.kt | 1 + .../annotationFlagRemoved/UseAnn1Class.kt | 2 ++ .../annotationFlagRemoved/UseAnn2Class.kt | 2 ++ .../annotationFlagRemoved/build.log | 32 +++++++++++++++++++ .../annotationFlagRemoved/useAnn1Fun.kt | 2 ++ .../annotationFlagRemoved/useAnn1Val.kt | 2 ++ .../annotationFlagRemoved/useAnn2Fun.kt | 2 ++ .../annotationFlagRemoved/useAnn2Val.kt | 2 ++ 12 files changed, 54 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 617ba2511c9..fc8fa859040 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1039,6 +1039,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("annotationFlagRemoved") + public void testAnnotationFlagRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/"); + doTest(fileName); + } + @TestMetadata("annotationListChanged") public void testAnnotationListChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/"); diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt new file mode 100644 index 00000000000..700be2ad7e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt @@ -0,0 +1 @@ +annotation class Ann1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1 new file mode 100644 index 00000000000..d01ba85a9bf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.1 @@ -0,0 +1 @@ +class Ann1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2 new file mode 100644 index 00000000000..700be2ad7e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann1.kt.new.2 @@ -0,0 +1 @@ +annotation class Ann1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt new file mode 100644 index 00000000000..42dfdb1c4fa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/Ann2.kt @@ -0,0 +1 @@ +annotation class Ann2 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt new file mode 100644 index 00000000000..ad3f6f5ef00 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn1Class.kt @@ -0,0 +1,2 @@ +@Ann1 +class UseAnn1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt new file mode 100644 index 00000000000..2536f9af76c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/UseAnn2Class.kt @@ -0,0 +1,2 @@ +@Ann2 +class UseAnn2 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log new file mode 100644 index 00000000000..f72a87fbfa2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log @@ -0,0 +1,32 @@ +Cleaning output files: +out/production/module/Ann1.class +End of files +Compiling files: +src/Ann1.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UseAnn1.class +out/production/module/UseAnn1FunKt.class +out/production/module/UseAnn1ValKt.class +End of files +Compiling files: +src/UseAnn1Class.kt +src/useAnn1Fun.kt +src/useAnn1Val.kt +End of files +COMPILATION FAILED +'Ann1' is not an annotation class +'Ann1' is not an annotation class +'Ann1' is not an annotation class + + +Cleaning output files: +out/production/module/Ann1.class +End of files +Compiling files: +src/Ann1.kt +src/UseAnn1Class.kt +src/useAnn1Fun.kt +src/useAnn1Val.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt new file mode 100644 index 00000000000..901f70ec8fa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Fun.kt @@ -0,0 +1,2 @@ +@Ann1 +fun useAnn1() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt new file mode 100644 index 00000000000..dcc6a8d732d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn1Val.kt @@ -0,0 +1,2 @@ +@Ann1 +val useAnn1Val = 0 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt new file mode 100644 index 00000000000..733627858aa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Fun.kt @@ -0,0 +1,2 @@ +@Ann2 +fun useAnn2() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt new file mode 100644 index 00000000000..8e10342e1aa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/useAnn2Val.kt @@ -0,0 +1,2 @@ +@Ann2 +val useAnn2Val = 0 \ No newline at end of file From ecd7b0c9d6b2f20fad5c9b1468a5cd9dc2187477 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 21 Jan 2016 18:33:57 +0300 Subject: [PATCH 0771/1557] Add lookup for every expression's type Original commit: 310a995bb155d88596d4b0776a8f5f82a105a1cb --- .../jps/build/LookupTrackerTestGenerated.java | 6 +++ .../lookupTracker/classifierMembers/foo.kt | 40 ++++++++--------- .../lookupTracker/classifierMembers/usages.kt | 40 ++++++++--------- .../lookupTracker/conventions/comparison.kt | 26 +++++------ .../lookupTracker/conventions/declarations.kt | 30 ++++++------- .../conventions/delegateProperty.kt | 4 +- .../conventions/mathematicalLike.kt | 28 ++++++------ .../lookupTracker/conventions/other.kt | 12 ++--- .../expressionType/inferredType.kt | 19 ++++++++ .../expressionType/lambdaParameterType.kt | 11 +++++ .../expressionType/localInnerClassType.kt | 9 ++++ .../incremental/lookupTracker/java/usages.kt | 30 ++++++------- .../lookupTracker/localDeclarations/locals.kt | 38 ++++++++-------- .../lookupTracker/packageDeclarations/foo1.kt | 14 +++--- .../syntheticProperties/KotlinClass.kt | 2 +- .../syntheticProperties/usages.kt | 44 +++++++++---------- 16 files changed, 199 insertions(+), 154 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/expressionType/localInnerClassType.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 5109411ef0a..fa4d89c14a3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -47,6 +47,12 @@ public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { doTest(fileName); } + @TestMetadata("expressionType") + public void testExpressionType() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/expressionType/"); + doTest(fileName); + } + @TestMetadata("java") public void testJava() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/lookupTracker/java/"); diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 19799784f85..6b3b664e10e 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -3,28 +3,28 @@ package foo import bar.* /*p:foo*/class A { - val a = 1 - var b = "" + val a = /*p:kotlin(Int)*/1 + var b = /*p:kotlin(String)*/"" val c: /*c:foo.A c:foo.A.Companion p:foo*/String - get() = /*c:foo.A*/b + get() = /*c:foo.A p:kotlin(String)*/b - var d: /*c:foo.A c:foo.A.Companion p:foo*/String = "ddd" - get() = field - set(v) { field = v } + var d: /*c:foo.A c:foo.A.Companion p:foo*/String = /*p:kotlin(String)*/"ddd" + get() = /*p:kotlin(String)*/field + set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v } fun foo() { - /*c:foo.A*/a + /*c:foo.A p:kotlin(Int)*/a /*c:foo.A*/foo() - this./*c:foo.A*/a - this./*c:foo.A*/foo() + /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a + /*p:foo(A)*/this./*c:foo.A*/foo() /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/O./*c:foo.A.O*/v = "OK" + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { - val a = 1 + val a = /*p:kotlin(Int)*/1 companion object CO { fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo*/Int) {} @@ -34,12 +34,12 @@ import bar.* inner class C companion object { - val a = 1 + val a = /*p:kotlin(Int)*/1 fun baz() {} } object O { - var v = "vvv" + var v = /*p:kotlin(String)*/"vvv" } } @@ -51,20 +51,20 @@ import bar.* } /*p:foo*/object Obj : /*p:foo*/I { - override var a = 1 + override var a = /*p:kotlin(Int)*/1 override fun foo() {} - val b = 1 - fun bar(): /*c:foo.Obj p:foo*/I = null as /*c:foo.Obj p:foo*/I + val b = /*p:kotlin(Int)*/1 + fun bar(): /*c:foo.Obj p:foo*/I = /*p:kotlin(Nothing) p:foo(I)*/null as /*c:foo.Obj p:foo*/I } /*p:foo*/enum class E { X, Y; - val a = 1 + val a = /*p:kotlin(Int)*/1 fun foo() { - /*c:foo.E*/a - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/Y./*c:foo.E*/a + /*c:foo.E p:kotlin(Int)*/a + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a /*c:foo.E*/foo() /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/X./*c:foo.E*/foo() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 7438fedacec..4e17f29efae 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -3,39 +3,39 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) { - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/a - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/b - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/c - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/d = "new value" + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo*/A - /*p:foo*/A./*c:foo.A c:foo.A.Companion*/a + /*p:foo c:foo.A(Companion)*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion + /*p:foo c:foo.A(Companion)*/A./*c:foo.A c:foo.A.Companion*/Companion /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo*/A./*c:foo.A c:foo.A.Companion*/O - /*p:foo*/A./*c:foo.A*/O./*c:foo.A.O*/v = "OK" + /*p:foo c:foo.A(O)*/A./*c:foo.A c:foo.A.Companion*/O + /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vala /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vara() - i./*c:foo.I*/a = 2 - /*p:foo*/Obj./*c:foo.Obj*/a + /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 + /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a /*p:foo*/Obj./*c:foo.Obj*/foo() var ii: /*p:foo*/I = /*p:foo*/Obj - ii./*c:foo.I*/a - ii./*c:foo.I*/foo() - /*p:foo*/Obj./*c:foo.Obj*/b - val iii = /*p:foo*/Obj./*c:foo.Obj*/bar() - iii./*c:foo.I*/foo() + /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a + /*p:foo(I)*/ii./*c:foo.I*/foo() + /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b + val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() + /*p:foo(I)*/iii./*c:foo.I*/foo() /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/values() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/valueOf("") + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/foo /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/bar() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index 33669a221f5..5eb74e65463 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -1,18 +1,18 @@ package foo.bar -/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - a /*c:foo.bar.A(equals)*/== c - a /*c:foo.bar.A(equals)*/!= c - na /*c:foo.bar.A(equals)*/== a - na /*c:foo.bar.A(equals)*/== null +/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a + /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:kotlin(Nothing)*/null - a /*c:foo.bar.A(compareTo)*/> b - a /*c:foo.bar.A(compareTo)*/< b - a /*c:foo.bar.A(compareTo)*/>= b - a /*c:foo.bar.A(compareTo)*/<= b + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/> /*p:kotlin(Int)*/b + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/< /*p:kotlin(Int)*/b + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b - a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/> c - a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/< c - a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/>= c - a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/<= c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt index 0dc0141f4f5..ef0612c5cba 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt @@ -1,35 +1,35 @@ package foo.bar /*p:foo.bar*/class A { - operator fun plus(a: /*c:foo.bar.A p:foo.bar*/Int) = this + operator fun plus(a: /*c:foo.bar.A p:foo.bar*/Int) = /*p:foo.bar(A)*/this operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar*/Any?) {} - operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = this + operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this - operator fun get(i: /*c:foo.bar.A p:foo.bar*/Int) = 1 - operator fun contains(a: /*c:foo.bar.A p:foo.bar*/Int): /*c:foo.bar.A p:foo.bar*/Boolean = false + operator fun get(i: /*c:foo.bar.A p:foo.bar*/Int) = /*p:kotlin(Int)*/1 + operator fun contains(a: /*c:foo.bar.A p:foo.bar*/Int): /*c:foo.bar.A p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/false operator fun invoke() {} - operator fun compareTo(a: /*c:foo.bar.A p:foo.bar*/Int) = 0 + operator fun compareTo(a: /*c:foo.bar.A p:foo.bar*/Int) = /*p:kotlin(Int)*/0 - operator fun component1() = this + operator fun component1() = /*p:foo.bar(A)*/this - operator fun iterator() = this - operator fun next() = this + operator fun iterator() = /*p:foo.bar(A)*/this + operator fun next() = /*p:foo.bar(A)*/this } -/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar*/Any?) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {} /*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar*/Int, v: /*p:foo.bar*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = true +/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/true /*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = 0 +/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = /*p:kotlin(Int)*/0 -/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this -/*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = this!! -/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = false +/*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!! +/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 579e0b9ec69..287914b8d64 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -3,7 +3,7 @@ package foo.bar import kotlin.reflect./*p:kotlin.reflect*/KProperty /*p:foo.bar*/class D1 { - operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = 1 + operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = /*p:kotlin(Int)*/1 } /*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar*/Any?, p: KProperty<*>, v: /*p:foo.bar*/Int) {} @@ -12,7 +12,7 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar*/Int) {} } -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = 1 +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = /*p:kotlin(Int)*/1 /*p:foo.bar*/operator fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 486fbf26478..de63e2b99ca 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -1,24 +1,24 @@ package foo.bar /*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) { - var d = a + var d = /*p:foo.bar(A)*/a - d/*c:foo.bar.A(inc)*/++ - /*c:foo.bar.A(inc)*/++d - d/*c:foo.bar.A(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC) p:foo.bar(dec)*/-- - /*c:foo.bar.A(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC) p:foo.bar(dec)*/--d + /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++ + /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d + /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC) p:foo.bar(dec)*/-- + /*c:foo.bar.A(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC) p:foo.bar(dec) p:foo.bar(A)*/--/*p:foo.bar(A)*/d - a /*c:foo.bar.A(plus)*/+ b - a /*c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/- b - /*c:foo.bar.A(not) c:foo.bar.A(getNot) c:foo.bar.A(getNOT) p:foo.bar(not)*/!a + /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b + /*c:foo.bar.A(not) c:foo.bar.A(getNot) c:foo.bar.A(getNOT) p:foo.bar(not)*/!/*p:foo.bar(A)*/a // for val - a /*c:foo.bar.A(timesAssign)*/*= b - a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= b + /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= b - d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= b - d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times)*/*= b - d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div)*//= b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index 5bb64a7dc33..bf27ef791d0 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { - /*c:foo.bar.A(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get)*/a[2] + /*p:foo.bar(A) c:foo.bar.A(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET) p:foo.bar(set)*/a[1] = /*p:foo.bar(A) c:foo.bar.A(get) p:kotlin(Int)*/a[2] - b /*c:foo.bar.A(contains)*/in a - "s" /*c:foo.bar.A(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS) p:foo.bar(contains)*/!in a + /*p:kotlin(Int) p:kotlin(Boolean)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a + /*p:kotlin(String) p:kotlin(Boolean)*/"s" /*c:foo.bar.A(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a /*c:foo.bar.A(invoke)*/a() /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) - val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/t) = a; + val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a; - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(hasNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getHASNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(iterator) c:foo.bar.A(getIterator) c:foo.bar.A(getITERATOR) p:foo.bar(iterator) c:foo.bar.A(hasNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getHASNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) c:foo.bar.A(hasNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getHASNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) c:foo.bar.A(getIterator) c:foo.bar.A(getITERATOR) p:foo.bar(iterator) c:foo.bar.A(hasNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getHASNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt new file mode 100644 index 00000000000..fb15d1dc4f4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -0,0 +1,19 @@ +package foo + +/*p:foo(A)*/open class A +/*p:foo*/class B : /*p:foo*/A() + +/*p:foo*/fun getA() = /*p:foo*/A() +/*p:foo*/fun getB() = /*p:foo*/B() + +/*p:foo*/fun getListOfA() = /*p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) + +/*p:foo*/fun useListOfA(a: /*p:foo*/List) {} +/*p:foo*/fun useListOfB(b: /*p:foo*/List) {} + +/*p:foo*/fun testInferredType() { + /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(A)*/getListOfA()) + /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) + /*p:foo*/useListOfB(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt new file mode 100644 index 00000000000..736fba6ade3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt @@ -0,0 +1,11 @@ +package foo + +/*p:foo*/class C + +/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo*/Unit) {} +/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo*/Unit) {} + +/*p:foo*/fun testLambdaParameterType() { + /*p:foo*/lambdaConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/it } + /*p:foo*/extensionConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/this } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/localInnerClassType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/localInnerClassType.kt new file mode 100644 index 00000000000..c9e10d74f07 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/localInnerClassType.kt @@ -0,0 +1,9 @@ +package foo + +/*p:foo*/fun bar() { + class A { + inner class B + } + + val b = A().B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 604e17d850d..b9495b2c69a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -4,33 +4,33 @@ import bar./*p:bar*/C import baz.* /*p:foo*/fun usages() { - val c = C() + val c = /*p:bar*/C() - c./*c:bar.C*/field - c./*c:bar.C*/field = 2 - c./*c:bar.C*/func() - c./*c:bar.C*/B() + /*p:bar(C) p:kotlin(Int)*/c./*c:bar.C*/field + /*p:bar(C) p:kotlin(Int)*/c./*c:bar.C*/field = /*p:kotlin(Int)*/2 + /*p:bar(C)*/c./*c:bar.C*/func() + /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfield - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfield = "new" + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/S() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I - c./*c:bar.C*/ifunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/isfield + /*p:bar(C)*/c./*c:bar.C*/ifunc() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/IS() - val i: /*p:foo*/I = c - i./*c:foo.I*/ifunc() + val i: /*p:foo*/I = /*p:bar(C)*/c + /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/I./*c:foo.I*/isfield - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/I./*c:foo.I*/IS() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/F - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index 8ae9ed1928f..8dc43de85c1 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -2,13 +2,13 @@ package local.declarations import bar.* -/*p:local.declarations*/fun f(p: /*p:local.declarations*/Any) { - p.toString() +/*p:local.declarations*/fun f(p: /*p:local.declarations*/Any) /*p:kotlin(Int)*/{ + /*p:kotlin(Any) p:kotlin(String)*/p.toString() - val a = 1 - val b = a - fun localFun() = b - fun /*p:local.declarations*/Int.localExtFun() = localFun() + val a = /*p:kotlin(Int)*/1 + val b = /*p:kotlin(Int)*/a + fun localFun() = /*p:kotlin(Int)*/b + fun /*p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() abstract class LocalI { abstract var a: /*p:local.declarations*/Int @@ -16,34 +16,34 @@ import bar.* } class LocalC : LocalI() { - override var a = 1 + override var a = /*p:kotlin(Int)*/1 override fun foo() {} - var b = "bbb" + var b = /*p:kotlin(String)*/"bbb" - fun bar() = b + fun bar() = /*p:kotlin(Int)*/b } val o = object { - val a = "aaa" - fun foo(): LocalI = null as LocalI + val a = /*p:kotlin(String)*/"aaa" + fun foo(): LocalI = /*p:kotlin(Nothing)*/null as LocalI } - localFun() - 1./*c:kotlin.Int(getLocalExtFun) c:kotlin.Int(getLOCALExtFun)*/localExtFun() + /*p:kotlin(Int)*/localFun() + /*p:kotlin(Int)*/1./*c:kotlin.Int(getLocalExtFun) c:kotlin.Int(getLOCALExtFun)*/localExtFun() val c = LocalC() - c.a - c.b + /*p:kotlin(Int)*/c.a + /*p:kotlin(String)*/c.b c.foo() - c.bar() + /*p:kotlin(Int)*/c.bar() val i: LocalI = c - i.a + /*p:kotlin(Int)*/i.a i.foo() - o.a + /*p:kotlin(String)*/o.a val ii = o.foo() - ii.a + /*p:kotlin(Int)*/ii.a } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 3b7575c7e00..ce3b7606f8f 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,14 +4,14 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:baz(B)*/baz./*p:baz*/B() -/*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B { - /*p:foo*/a - return /*p:foo p:bar*/B() +/*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ + /*p:foo p:bar(A)*/a + /*p:kotlin(Nothing)*/return /*p:foo p:bar*/B() } -/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface { - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/b - return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/MyClass() +/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt index abc2cb3f81d..75b360dbbb9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt @@ -3,6 +3,6 @@ package foo import /*p:*/JavaClass /*p:foo*/class KotlinClass : JavaClass() { - override fun getFoo() = 2 + override fun getFoo() = /*p:kotlin(Int)*/2 fun setFoo(i: /*c:foo.KotlinClass c:JavaClass p:foo*/Int) {} } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 34e7367eea7..49a068b5e1c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -4,27 +4,27 @@ import /*p:*/JavaClass import foo./*p:foo*/KotlinClass /*p:foo.bar*/fun test() { - val j = JavaClass() - val k = KotlinClass() + val j = /*p:*/JavaClass() + val k = /*p:foo*/KotlinClass() - j./*c:JavaClass*/getFoo() - j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/setFoo(2) - j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = 2 - j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo - j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar - j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = "" - j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz - j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz = "" - j./*c:JavaClass*/setBoo(2) - j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/boo = 2 - k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass - k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) - k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = 2 - k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo - k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar - k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = "" - k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz - k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz = "" - k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/boo = 2 + /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/setFoo(2) + /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 + /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo + /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar + /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) + /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo + /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar + /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 } From d77e5a2b598f88fca53d5e5f852b54e0a90273f0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 21 Jan 2016 18:34:38 +0300 Subject: [PATCH 0772/1557] Recompile implicit type usages when class signature is changed Original commit: f32ff42ba33556d339a6738ddee7e49754d99a04 --- ...perimentalIncrementalJpsTestGenerated.java | 24 +++++++++++ .../annotationListChanged/build.log | 4 ++ .../classBecamePrivate/build.log | 4 ++ .../enumEntryAdded/build.log | 3 ++ .../classHierarchyAffected/implcitUpcast/A.kt | 1 + .../classHierarchyAffected/implcitUpcast/B.kt | 1 + .../implcitUpcast/B.kt.new.1 | 1 + .../implcitUpcast/B.kt.new.2 | 1 + .../classHierarchyAffected/implcitUpcast/C.kt | 1 + .../classHierarchyAffected/implcitUpcast/D.kt | 1 + .../implcitUpcast/build.log | 37 ++++++++++++++++ .../implcitUpcast/callUseAWithA.kt | 3 ++ .../implcitUpcast/callUseAWithB.kt | 3 ++ .../implcitUpcast/callUseAWithC.kt | 3 ++ .../implcitUpcast/callUseAWithD.kt | 3 ++ .../implcitUpcast/getA.kt | 1 + .../implcitUpcast/getB.kt | 1 + .../implcitUpcast/getC.kt | 1 + .../implcitUpcast/getD.kt | 1 + .../implcitUpcast/useA.kt | 1 + .../inferredTypeArgumentChanged/A.kt | 1 + .../inferredTypeArgumentChanged/B.kt | 1 + .../inferredTypeArgumentChanged/B.kt.new.1 | 1 + .../inferredTypeArgumentChanged/B.kt.new.2 | 1 + .../inferredTypeArgumentChanged/C.kt | 1 + .../inferredTypeArgumentChanged/D.kt | 1 + .../inferredTypeArgumentChanged/build.log | 43 +++++++++++++++++++ .../inferredTypeArgumentChanged/getListOfA.kt | 1 + .../inferredTypeArgumentChanged/getListOfB.kt | 1 + .../inferredTypeArgumentChanged/getListOfC.kt | 1 + .../inferredTypeArgumentChanged/getListOfD.kt | 1 + .../inferredTypeArgumentChanged/useListOfA.kt | 1 + .../useListOfAWithListOfA.kt | 3 ++ .../useListOfAWithListOfB.kt | 3 ++ .../useListOfAWithListOfC.kt | 3 ++ .../useListOfAWithListOfD.kt | 3 ++ .../inferredTypeChanged/A.kt | 1 + .../inferredTypeChanged/B.kt | 1 + .../inferredTypeChanged/B.kt.new | 1 + .../inferredTypeChanged/C.kt | 1 + .../inferredTypeChanged/D.kt | 1 + .../inferredTypeChanged/build.log | 23 ++++++++++ .../inferredTypeChanged/getA.kt | 1 + .../inferredTypeChanged/getAorD.kt | 1 + .../inferredTypeChanged/getB.kt | 1 + .../inferredTypeChanged/getBorC.kt | 1 + .../inferredTypeChanged/getBorD.kt | 1 + .../inferredTypeChanged/getC.kt | 1 + .../inferredTypeChanged/getCorD.kt | 1 + .../inferredTypeChanged/getD.kt | 1 + .../lambdaParameterAffected/A.kt | 1 + .../lambdaParameterAffected/B.kt | 1 + .../lambdaParameterAffected/B.kt.new.1 | 1 + .../lambdaParameterAffected/B.kt.new.2 | 1 + .../lambdaParameterAffected/build.log | 36 ++++++++++++++++ .../lambdaParameterAffected/consumeA.kt | 1 + .../consumeBExtLambda.kt | 3 ++ .../lambdaParameterAffected/consumeBLambda.kt | 3 ++ .../useConsumeBExtLambda.kt | 3 ++ .../useConsumeBLambda.kt | 3 ++ .../supertypesListChanged/build.log | 2 + .../varianceChanged/build.log | 25 ++--------- .../{useD.kt.new.3 => useD.kt.new.2} | 0 63 files changed, 255 insertions(+), 22 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt rename jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/{useD.kt.new.3 => useD.kt.new.2} (100%) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index fc8fa859040..21cb93aca87 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1135,12 +1135,36 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("implcitUpcast") + public void testImplcitUpcast() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/"); + doTest(fileName); + } + + @TestMetadata("inferredTypeArgumentChanged") + public void testInferredTypeArgumentChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/"); + doTest(fileName); + } + + @TestMetadata("inferredTypeChanged") + public void testInferredTypeChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/"); + doTest(fileName); + } + @TestMetadata("jvmNameChanged") public void testJvmNameChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/"); doTest(fileName); } + @TestMetadata("lambdaParameterAffected") + public void testLambdaParameterAffected() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/"); + doTest(fileName); + } + @TestMetadata("methodAdded") public void testMethodAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/"); diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log index 6661481845f..fa8b4a82368 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log @@ -14,6 +14,7 @@ out/production/module/foo/ATypeParameter.class out/production/module/foo/ClassLiteralKt.class out/production/module/foo/FunctionParameterKt.class out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class out/production/module/foo/ReturnTypeKt.class End of files Compiling files: @@ -28,6 +29,7 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files @@ -48,6 +50,7 @@ out/production/module/foo/ATypeParameter.class out/production/module/foo/ClassLiteralKt.class out/production/module/foo/FunctionParameterKt.class out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class out/production/module/foo/ReturnTypeKt.class End of files Compiling files: @@ -62,4 +65,5 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log index 0cd42f84f75..e6ef1c22e73 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -14,6 +14,7 @@ out/production/module/foo/ATypeParameter.class out/production/module/foo/ClassLiteralKt.class out/production/module/foo/FunctionParameterKt.class out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class out/production/module/foo/ReturnTypeKt.class End of files Compiling files: @@ -28,6 +29,7 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files COMPILATION FAILED Cannot access 'A': it is 'private' in file @@ -46,6 +48,7 @@ Cannot access 'A': it is 'private' in file Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file +Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' Cleaning output files: @@ -64,4 +67,5 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log index ee16e42ee70..99ebd362fb5 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -7,11 +7,13 @@ End of files Cleaning output files: out/production/module/GetRandomEnumEntryKt.class out/production/module/META-INF/module.kotlin_module +out/production/module/UseEnumImplicitlyKt.class out/production/module/UseKt.class End of files Compiling files: src/getRandomEnumEntry.kt src/use.kt +src/useEnumImplicitly.kt End of files COMPILATION FAILED when expression must be exhaustive, add necessary 'C' branch or 'else' branch instead @@ -24,4 +26,5 @@ Compiling files: src/Enum.kt src/getRandomEnumEntry.kt src/use.kt +src/useEnumImplicitly.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt new file mode 100644 index 00000000000..7f0bdfbb9ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/A.kt @@ -0,0 +1 @@ +open class A diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt @@ -0,0 +1 @@ +open class B : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 new file mode 100644 index 00000000000..711103786bc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.1 @@ -0,0 +1 @@ +open class B diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/B.kt.new.2 @@ -0,0 +1 @@ +open class B : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt new file mode 100644 index 00000000000..bca481db106 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/C.kt @@ -0,0 +1 @@ +class C : B() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt new file mode 100644 index 00000000000..b1da90d456f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/D.kt @@ -0,0 +1 @@ +class D : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log new file mode 100644 index 00000000000..d70203b60b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log @@ -0,0 +1,37 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/C.class +out/production/module/CallUseAWithBKt.class +out/production/module/CallUseAWithCKt.class +out/production/module/GetBKt.class +out/production/module/GetCKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/C.kt +src/callUseAWithB.kt +src/callUseAWithC.kt +src/getB.kt +src/getC.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is B but A was expected +Type mismatch: inferred type is C but A was expected + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/C.kt +src/callUseAWithB.kt +src/callUseAWithC.kt +src/getB.kt +src/getC.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt new file mode 100644 index 00000000000..edf2d0ba1c2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithA.kt @@ -0,0 +1,3 @@ +fun callUseAWithA() { + useA(getA()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt new file mode 100644 index 00000000000..f7aff927a73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithB.kt @@ -0,0 +1,3 @@ +fun callUseAWithB() { + useA(getB()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt new file mode 100644 index 00000000000..f824fe53847 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithC.kt @@ -0,0 +1,3 @@ +fun callUseAWithC() { + useA(getC()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt new file mode 100644 index 00000000000..20b43d486a6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/callUseAWithD.kt @@ -0,0 +1,3 @@ +fun callUseAWithD() { + useA(getD()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt new file mode 100644 index 00000000000..bd04874b85b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getA.kt @@ -0,0 +1 @@ +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt new file mode 100644 index 00000000000..ff08b7154a6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getB.kt @@ -0,0 +1 @@ +fun getB() = B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt new file mode 100644 index 00000000000..a7f96aa5970 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getC.kt @@ -0,0 +1 @@ +fun getC() = C() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt new file mode 100644 index 00000000000..caec5c8b01a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/getD.kt @@ -0,0 +1 @@ +fun getD() = D() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt new file mode 100644 index 00000000000..900c1a151f3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/useA.kt @@ -0,0 +1 @@ +fun useA(a: A) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt new file mode 100644 index 00000000000..7f0bdfbb9ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/A.kt @@ -0,0 +1 @@ +open class A diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt @@ -0,0 +1 @@ +open class B : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 new file mode 100644 index 00000000000..711103786bc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.1 @@ -0,0 +1 @@ +open class B diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/B.kt.new.2 @@ -0,0 +1 @@ +open class B : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt new file mode 100644 index 00000000000..bca481db106 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/C.kt @@ -0,0 +1 @@ +class C : B() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt new file mode 100644 index 00000000000..b1da90d456f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/D.kt @@ -0,0 +1 @@ +class D : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log new file mode 100644 index 00000000000..59bc08e72d3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log @@ -0,0 +1,43 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/C.class +out/production/module/GetListOfAKt.class +out/production/module/GetListOfBKt.class +out/production/module/GetListOfCKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseListOfAKt.class +out/production/module/UseListOfAWithListOfBKt.class +out/production/module/UseListOfAWithListOfCKt.class +End of files +Compiling files: +src/C.kt +src/getListOfA.kt +src/getListOfB.kt +src/getListOfC.kt +src/useListOfA.kt +src/useListOfAWithListOfB.kt +src/useListOfAWithListOfC.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected +Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/C.kt +src/getListOfA.kt +src/getListOfB.kt +src/getListOfC.kt +src/useListOfA.kt +src/useListOfAWithListOfB.kt +src/useListOfAWithListOfC.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt new file mode 100644 index 00000000000..80b37b19150 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfA.kt @@ -0,0 +1 @@ +fun getListOfA() = listOf(A()) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt new file mode 100644 index 00000000000..081f011bac6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfB.kt @@ -0,0 +1 @@ +fun getListOfB() = listOf(B()) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt new file mode 100644 index 00000000000..c18a23d6f9a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfC.kt @@ -0,0 +1 @@ +fun getListOfC() = listOf(C()) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt new file mode 100644 index 00000000000..1c038c61e77 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/getListOfD.kt @@ -0,0 +1 @@ +fun getListOfD() = listOf(D()) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt new file mode 100644 index 00000000000..51fd8ad94cc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfA.kt @@ -0,0 +1 @@ +fun useListOfA(aas: List) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt new file mode 100644 index 00000000000..3d4d3ce467d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfA.kt @@ -0,0 +1,3 @@ +fun useListOfAWithListOfA() { + useListOfA(getListOfA()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt new file mode 100644 index 00000000000..ef90c64a1ca --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfB.kt @@ -0,0 +1,3 @@ +fun useListOfAWithListOfB() { + useListOfA(getListOfB()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt new file mode 100644 index 00000000000..ba71aa7f30c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfC.kt @@ -0,0 +1,3 @@ +fun useListOfAWithListOfC() { + useListOfA(getListOfC()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt new file mode 100644 index 00000000000..1301fee38e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/useListOfAWithListOfD.kt @@ -0,0 +1,3 @@ +fun useListOfAWithListOfD() { + useListOfA(getListOfD()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt new file mode 100644 index 00000000000..7f0bdfbb9ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/A.kt @@ -0,0 +1 @@ +open class A diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt new file mode 100644 index 00000000000..b500f9774b2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt @@ -0,0 +1 @@ +open class B : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new new file mode 100644 index 00000000000..711103786bc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/B.kt.new @@ -0,0 +1 @@ +open class B diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt new file mode 100644 index 00000000000..bca481db106 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/C.kt @@ -0,0 +1 @@ +class C : B() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt new file mode 100644 index 00000000000..b1da90d456f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/D.kt @@ -0,0 +1 @@ +class D : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log new file mode 100644 index 00000000000..fc7b9a6b3b0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/C.class +out/production/module/GetBKt.class +out/production/module/GetBorCKt.class +out/production/module/GetBorDKt.class +out/production/module/GetCKt.class +out/production/module/GetCorDKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/C.kt +src/getB.kt +src/getBorC.kt +src/getBorD.kt +src/getC.kt +src/getCorD.kt +End of files diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt new file mode 100644 index 00000000000..bd04874b85b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getA.kt @@ -0,0 +1 @@ +fun getA() = A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt new file mode 100644 index 00000000000..8c69a257410 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getAorD.kt @@ -0,0 +1 @@ +fun getAorD() = if (Math.random() > 0.5) getA() else getD() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt new file mode 100644 index 00000000000..ff08b7154a6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getB.kt @@ -0,0 +1 @@ +fun getB() = B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt new file mode 100644 index 00000000000..9bd769387ff --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorC.kt @@ -0,0 +1 @@ +fun getBorC() = if (Math.random() > 0.5) getB() else getC() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt new file mode 100644 index 00000000000..153477aaff3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getBorD.kt @@ -0,0 +1 @@ +fun getBorD() = if (Math.random() > 0.5) getB() else getD() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt new file mode 100644 index 00000000000..a7f96aa5970 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getC.kt @@ -0,0 +1 @@ +fun getC() = C() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt new file mode 100644 index 00000000000..90dcb344fbf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getCorD.kt @@ -0,0 +1 @@ +fun getCorD() = if (Math.random() > 0.5) getC() else getD() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt new file mode 100644 index 00000000000..caec5c8b01a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/getD.kt @@ -0,0 +1 @@ +fun getD() = D() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt new file mode 100644 index 00000000000..7f0bdfbb9ea --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/A.kt @@ -0,0 +1 @@ +open class A diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt new file mode 100644 index 00000000000..0b8e079aef7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt @@ -0,0 +1 @@ +class B : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 new file mode 100644 index 00000000000..179f0d27584 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.1 @@ -0,0 +1 @@ +class B diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 new file mode 100644 index 00000000000..0b8e079aef7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/B.kt.new.2 @@ -0,0 +1 @@ +class B : A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log new file mode 100644 index 00000000000..37a3baf1fcf --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log @@ -0,0 +1,36 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/ConsumeBExtLambdaKt.class +out/production/module/ConsumeBLambdaKt.class +out/production/module/META-INF/module.kotlin_module +out/production/module/UseConsumeBExtLambdaKt$useConsumeBExtLambda$1.class +out/production/module/UseConsumeBExtLambdaKt.class +out/production/module/UseConsumeBLambdaKt$useConsumeBLambda$1.class +out/production/module/UseConsumeBLambdaKt.class +End of files +Compiling files: +src/consumeBExtLambda.kt +src/consumeBLambda.kt +src/useConsumeBExtLambda.kt +src/useConsumeBLambda.kt +End of files +COMPILATION FAILED +Type mismatch: inferred type is B but A was expected +Type mismatch: inferred type is B but A was expected + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/consumeBExtLambda.kt +src/consumeBLambda.kt +src/useConsumeBExtLambda.kt +src/useConsumeBLambda.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt new file mode 100644 index 00000000000..e9590d4077b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeA.kt @@ -0,0 +1 @@ +fun consumeA(a: A) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt new file mode 100644 index 00000000000..029336ea08c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBExtLambda.kt @@ -0,0 +1,3 @@ +fun consumeBExtLambda(fn: B.()->Unit) { + B().fn() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt new file mode 100644 index 00000000000..ae66c833918 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/consumeBLambda.kt @@ -0,0 +1,3 @@ +fun consumeBLambda(fn: (B)->Unit) { + fn(B()) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt new file mode 100644 index 00000000000..78c0903eb1b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBExtLambda.kt @@ -0,0 +1,3 @@ +fun useConsumeBExtLambda() { + consumeBExtLambda() { consumeA(this) } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt new file mode 100644 index 00000000000..72631e4c285 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/useConsumeBLambda.kt @@ -0,0 +1,3 @@ +fun useConsumeBLambda() { + consumeBLambda() { consumeA(it) } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log index 04492816e9b..2dced77d7d7 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log @@ -15,6 +15,7 @@ out/production/module/foo/ATypeParameter.class out/production/module/foo/ClassLiteralKt.class out/production/module/foo/FunctionParameterKt.class out/production/module/foo/GetAKt.class +out/production/module/foo/ReturnTypeImplicitKt.class out/production/module/foo/ReturnTypeKt.class End of files Compiling files: @@ -29,6 +30,7 @@ src/importAGrandChild.kt src/importStar.kt src/referencedByFqName.kt src/returnType.kt +src/returnTypeImplicit.kt End of files diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log index 01a4c3b1191..95c56aeb94f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log @@ -9,39 +9,20 @@ out/production/module/D$Companion.class out/production/module/D.class out/production/module/META-INF/module.kotlin_module out/production/module/UseAKt.class -End of files -Compiling files: -src/D.kt -src/useA.kt -End of files -COMPILATION FAILED -Type mismatch: inferred type is A but A was expected - - -Cleaning output files: -out/production/module/A.class -End of files -Compiling files: -src/A.kt -src/D.kt -src/useA.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module out/production/module/UseDKt.class End of files Compiling files: +src/D.kt +src/useA.kt src/useD.kt End of files COMPILATION FAILED Type mismatch: inferred type is A but A was expected +Type mismatch: inferred type is A but A was expected Cleaning output files: out/production/module/A.class -out/production/module/D$Companion.class -out/production/module/D.class -out/production/module/UseAKt.class End of files Compiling files: src/A.kt diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.3 rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/useD.kt.new.2 From 5b78fe9160fe38f295e2ff99b1416019e62b9118 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 20 Jan 2016 16:03:19 +0300 Subject: [PATCH 0773/1557] Optimize adding lookups to lookup storage Original commit: f63a9ee556b277ee0d77a550c6e82cbf80329a37 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a0c2c725afa..6ab0bf66423 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -542,7 +542,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val removedFiles = chunk.targets.flatMap { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it) } removedFiles.forEach { lookupStorage.removeLookupsFrom(it) } - lookupTracker.lookups.entrySet().forEach { lookupStorage.add(it.key, it.value) } + lookupStorage.addAll(lookupTracker.lookups.entrySet()) } // if null is returned, nothing was done From 2219901fe7f45f1f2dc2bcfa521e264cb14d5673 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 22 Jan 2016 20:27:16 +0300 Subject: [PATCH 0774/1557] Minor: fix test data Original commit: cfc410261b8950bfced37456945921670ab6fecd --- .../inferredTypeArgumentChanged/build.log | 3 --- 1 file changed, 3 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log index 59bc08e72d3..86aedaab86f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log @@ -6,7 +6,6 @@ src/B.kt End of files Cleaning output files: out/production/module/C.class -out/production/module/GetListOfAKt.class out/production/module/GetListOfBKt.class out/production/module/GetListOfCKt.class out/production/module/META-INF/module.kotlin_module @@ -16,7 +15,6 @@ out/production/module/UseListOfAWithListOfCKt.class End of files Compiling files: src/C.kt -src/getListOfA.kt src/getListOfB.kt src/getListOfC.kt src/useListOfA.kt @@ -34,7 +32,6 @@ End of files Compiling files: src/B.kt src/C.kt -src/getListOfA.kt src/getListOfB.kt src/getListOfC.kt src/useListOfA.kt From 627384fe11c9b990d236907506804af63b6b3b72 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Sun, 24 Jan 2016 12:03:27 +0300 Subject: [PATCH 0775/1557] KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25 # KT-10772 Fixed Original commit: aca19ed27a751d7d6b0d276e7d2cfbf579fe1f87 --- .../lookupTracker/expressionType/genericType.kt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/expressionType/genericType.kt diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/genericType.kt new file mode 100644 index 00000000000..7eb6d235268 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/genericType.kt @@ -0,0 +1,15 @@ +package foo + +// From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25 + +/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Nothing) p:kotlin(Function1)*/null as (T) -> T + +/*p:foo*/fun compute(f: () -> T) { + val result = f() +} + +/*p:foo*/class Bar(val t: T) { + init { + val a = /*c:foo.Bar c:foo.Bar(T)*/t + } +} \ No newline at end of file From 8a1a5f2bb10f9b03225e888b4171812c0524bc72 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 22 Jan 2016 16:39:44 +0300 Subject: [PATCH 0776/1557] Rename module "build" -> "build-common" Original commit: aebf681809c716669075c8de1274ca48a48e00ac --- jps/jps-plugin/jps-plugin.iml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 09a0ac0fec2..f884b9bd6b7 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -10,7 +10,7 @@ - + @@ -25,4 +25,4 @@ - + \ No newline at end of file From 63282ffa9a0fde84700a1d1777c5725cf40a2863 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 25 Dec 2015 18:35:02 +0300 Subject: [PATCH 0777/1557] "Inapplicable operator modifier" and "Inapplicable infix modifier" are now errors Original commit: 3fa506fd4514b624fe21de4875d7a14856b27848 --- .../classMembersOnlyChanged/membersFlagsChanged/new.kt | 4 ++++ .../classMembersOnlyChanged/membersFlagsChanged/old.kt | 4 ++++ .../comparison/packageMembers/membersFlagsChanged/new.kt | 4 ++++ .../comparison/packageMembers/membersFlagsChanged/old.kt | 4 ++++ .../incremental/lookupTracker/conventions/delegateProperty.kt | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt index 64e31c38d67..c662c9dddcc 100644 --- a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/new.kt @@ -19,8 +19,10 @@ abstract class A { fun finalFlagRemovedFun() {} final fun finalFlagUnchangedFun() {} + @Suppress("INAPPLICABLE_INFIX_MODIFIER") infix fun infixFlagAddedFun() {} fun infixFlagRemovedFun() {} + @Suppress("INAPPLICABLE_INFIX_MODIFIER") infix fun infixFlagUnchangedFun() {} inline fun inlineFlagAddedFun() {} @@ -45,8 +47,10 @@ abstract class A { fun openFlagRemovedFun() {} open fun openFlagUnchangedFun() {} + @Suppress("INAPPLICABLE_OPERATOR_MODIFIER") operator fun operatorFlagAddedFun() {} fun operatorFlagRemovedFun() {} + @Suppress("INAPPLICABLE_OPERATOR_MODIFIER") operator fun operatorFlagUnchangedFun() {} private val privateFlagAddedVal = "" diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt index b9097dd4a86..ac61296a5fd 100644 --- a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/old.kt @@ -20,7 +20,9 @@ abstract class A { final fun finalFlagUnchangedFun() {} fun infixFlagAddedFun() {} + @Suppress("INAPPLICABLE_INFIX_MODIFIER") infix fun infixFlagRemovedFun() {} + @Suppress("INAPPLICABLE_INFIX_MODIFIER") infix fun infixFlagUnchangedFun() {} fun inlineFlagAddedFun() {} @@ -46,7 +48,9 @@ abstract class A { open fun openFlagUnchangedFun() {} fun operatorFlagAddedFun() {} + @Suppress("INAPPLICABLE_OPERATOR_MODIFIER") operator fun operatorFlagRemovedFun() {} + @Suppress("INAPPLICABLE_OPERATOR_MODIFIER") operator fun operatorFlagUnchangedFun() {} val privateFlagAddedVal = "" diff --git a/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt index 84e35d2b83c..a2d58035891 100644 --- a/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt +++ b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/new.kt @@ -8,8 +8,10 @@ external fun externalFlagAddedFun() fun externalFlagRemovedFun() {} external fun externalFlagUnchangedFun() +@Suppress("INAPPLICABLE_INFIX_MODIFIER") infix fun infixFlagAddedFun() {} fun infixFlagRemovedFun() {} +@Suppress("INAPPLICABLE_INFIX_MODIFIER") infix fun infixFlagUnchangedFun() {} inline fun inlineFlagAddedFun() {} @@ -23,8 +25,10 @@ internal fun internalFlagAddedFun() {} fun internalFlagRemovedFun() {} internal fun internalFlagUnchangedFun() {} +@Suppress("INAPPLICABLE_OPERATOR_MODIFIER") operator fun operatorFlagAddedFun() {} fun operatorFlagRemovedFun() {} +@Suppress("INAPPLICABLE_OPERATOR_MODIFIER") operator fun operatorFlagUnchangedFun() {} private val privateFlagAddedVal = "" diff --git a/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt index cfda1b58923..9799a641449 100644 --- a/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt +++ b/jps/jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/old.kt @@ -9,7 +9,9 @@ external fun externalFlagRemovedFun() external fun externalFlagUnchangedFun() fun infixFlagAddedFun() {} +@Suppress("INAPPLICABLE_INFIX_MODIFIER") infix fun infixFlagRemovedFun() {} +@Suppress("INAPPLICABLE_INFIX_MODIFIER") infix fun infixFlagUnchangedFun() {} fun inlineFlagAddedFun() {} @@ -24,7 +26,9 @@ internal fun internalFlagRemovedFun() {} internal fun internalFlagUnchangedFun() {} fun operatorFlagAddedFun() {} +@Suppress("INAPPLICABLE_OPERATOR_MODIFIER") operator fun operatorFlagRemovedFun() {} +@Suppress("INAPPLICABLE_OPERATOR_MODIFIER") operator fun operatorFlagUnchangedFun() {} val privateFlagAddedVal = "" diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 287914b8d64..9d1ba767cff 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -13,7 +13,7 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } /*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = /*p:kotlin(Int)*/1 -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} +/*p:foo.bar*/fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { fun propertyDelegated(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?) {} From 26debc1dec7422d8f8916782ba88cc49494b28f5 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 26 Jan 2016 22:58:20 +0300 Subject: [PATCH 0778/1557] Use interner in LookupTracker implementations to reduce memory consuming Original commit: fb21ef2e1d5de4bf1c85f7ddcb9a280d24a5bf34 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../kotlin/jps/build/AbstractLookupTrackerTest.kt | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6ab0bf66423..62773565ebb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -542,7 +542,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val removedFiles = chunk.targets.flatMap { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it) } removedFiles.forEach { lookupStorage.removeLookupsFrom(it) } - lookupStorage.addAll(lookupTracker.lookups.entrySet()) + lookupStorage.addAll(lookupTracker.lookups.entrySet(), lookupTracker.pathInterner.values) } // if null is returned, nothing was done diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 28455f8773a..bf79ec43766 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.io.FileUtil +import com.intellij.util.containers.StringInterner import org.jetbrains.kotlin.incremental.components.LookupInfo import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.components.Position @@ -119,12 +120,17 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( class TestLookupTracker : LookupTracker { val lookups = arrayListOf() + private val interner = StringInterner() override val requiresPosition: Boolean get() = true override fun record(filePath: String, position: Position, scopeFqName: String, scopeKind: ScopeKind, name: String) { - lookups.add(LookupInfo(filePath, position, scopeFqName, scopeKind, name)) + val internedFilePath = interner.intern(filePath) + val internedScopeFqName = interner.intern(scopeFqName) + val internedName = interner.intern(name) + + lookups.add(LookupInfo(internedFilePath, position, internedScopeFqName, scopeKind, internedName)) } } From 08e62d3303b7b79cb46a92b1cf12cbc17d7c521f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 22 Jan 2016 15:47:35 +0300 Subject: [PATCH 0779/1557] Recompile subtypes when class member is changed Original commit: a474165a8fa752b8658d21098fff553ac2aae223 --- .../kotlin/jps/build/KotlinBuilder.kt | 16 ++++++++++--- ...perimentalIncrementalJpsTestGenerated.java | 12 ++++++++++ .../experimentalOn/expected-kotlin-caches.txt | 4 ++++ .../build.log | 4 ++++ .../methodAdded/build.log | 2 ++ .../methodAnnotationAdded/build.log | 2 ++ .../methodNullabilityChanged/build.log | 3 +++ .../overrideExplicit/A.kt | 3 +++ .../overrideExplicit/A.kt.new.1 | 3 +++ .../overrideExplicit/A.kt.new.2 | 3 +++ .../overrideExplicit/B.kt | 3 +++ .../overrideExplicit/C.kt | 1 + .../overrideExplicit/build.log | 23 +++++++++++++++++++ .../overrideImplicit/A.kt | 3 +++ .../overrideImplicit/B.kt | 3 +++ .../overrideImplicit/B.kt.new.1 | 3 +++ .../overrideImplicit/B.kt.new.2 | 3 +++ .../overrideImplicit/BA.kt | 1 + .../overrideImplicit/C.kt | 1 + .../overrideImplicit/build.log | 23 +++++++++++++++++++ .../propertyNullabilityChanged/build.log | 3 +++ .../experimental-expected-kotlin-caches.txt | 3 ++- .../experimental-expected-kotlin-caches.txt | 3 ++- .../experimental-ic-build.log | 7 ++++++ 24 files changed, 127 insertions(+), 5 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 62773565ebb..3a0d2447b13 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -744,6 +744,7 @@ private fun CompilationResult.doProcessChangesUsingLookups( caches: Collection> ) { val dirtyLookupSymbols = HashSet() + val dirtyClassesFqNames = HashSet() val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) val allCaches: Sequence> = caches.asSequence().flatMap { it.dependentsWithThis } @@ -764,10 +765,12 @@ private fun CompilationResult.doProcessChangesUsingLookups( } } else if (change is ChangeInfo.MembersChanged) { - val scopes = withSubtypes(change.fqName, allCaches).map { it.asString() } + val fqNames = withSubtypes(change.fqName, allCaches) + // need to recompile subtypes because changed member might break override + dirtyClassesFqNames.addAll(fqNames) - change.names.forAllPairs(scopes) { name, scope -> - dirtyLookupSymbols.add(LookupSymbol(name, scope)) + change.names.forAllPairs(fqNames) { name, fqName -> + dirtyLookupSymbols.add(LookupSymbol(name, fqName.asString())) } } } @@ -782,6 +785,13 @@ private fun CompilationResult.doProcessChangesUsingLookups( dirtyFiles.addAll(affectedFiles) } + for (cache in allCaches) { + for (dirtyClassFqName in dirtyClassesFqNames) { + val srcFile = cache.getSourceFileIfClass(dirtyClassFqName) ?: continue + dirtyFiles.add(srcFile) + } + } + fsOperations.markFiles(dirtyFiles.asIterable(), excludeFiles = compiledFiles) KotlinBuilder.LOG.debug("End of processing changes") } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 21cb93aca87..8d733b367d3 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1213,6 +1213,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("overrideExplicit") + public void testOverrideExplicit() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/"); + doTest(fileName); + } + + @TestMetadata("overrideImplicit") + public void testOverrideImplicit() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/"); + doTest(fileName); + } + @TestMetadata("packageFacadeToClass") public void testPackageFacadeToClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/"); diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt index c892b694310..17c6e62dbff 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt @@ -7,12 +7,14 @@ kotlin-data-container Module 'module1' production experimental-format-version.txt format-version.txt + class-fq-name-to-source.tab proto.tab source-to-classes.tab Module 'module1' tests Module 'module2' production experimental-format-version.txt format-version.txt + class-fq-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab @@ -22,12 +24,14 @@ Module 'module2' tests Module 'module3' production experimental-format-version.txt format-version.txt + class-fq-name-to-source.tab proto.tab source-to-classes.tab Module 'module3' tests Module 'module4' production experimental-format-version.txt format-version.txt + class-fq-name-to-source.tab proto.tab source-to-classes.tab Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log index f83d4d254bb..6fdf4fc4dbc 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log @@ -5,6 +5,8 @@ Compiling files: src/B.kt End of files Cleaning output files: +out/production/module/A$AA.class +out/production/module/A.class out/production/module/CompanionExtensionKt.class out/production/module/CompanionReferenceExplicitKt.class out/production/module/CompanionReferenceImplicitKt.class @@ -12,6 +14,7 @@ out/production/module/ImportedMemberKt.class out/production/module/META-INF/module.kotlin_module End of files Compiling files: +src/A.kt src/companionExtension.kt src/companionReferenceExplicit.kt src/companionReferenceImplicit.kt @@ -28,6 +31,7 @@ Cleaning output files: out/production/module/B.class End of files Compiling files: +src/A.kt src/B.kt src/companionExtension.kt src/companionReferenceExplicit.kt diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log index 270e4f5daa5..b450c2880fc 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log @@ -6,8 +6,10 @@ src/A.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class out/production/module/foo/UseAChildKt.class End of files Compiling files: +src/AChild.kt src/useAChild.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log index 270e4f5daa5..b450c2880fc 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log @@ -6,8 +6,10 @@ src/A.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class out/production/module/foo/UseAChildKt.class End of files Compiling files: +src/AChild.kt src/useAChild.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log index a6e893da45d..534d69f15e7 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log @@ -6,9 +6,11 @@ src/A.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class out/production/module/foo/UseAChildKt.class End of files Compiling files: +src/AChild.kt src/useAChild.kt End of files COMPILATION FAILED @@ -20,5 +22,6 @@ out/production/module/foo/A.class End of files Compiling files: src/A.kt +src/AChild.kt src/useAChild.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt new file mode 100644 index 00000000000..d58cb4fd74b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt @@ -0,0 +1,3 @@ +open class A { + open fun f(c: C) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1 new file mode 100644 index 00000000000..5c259647d20 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.1 @@ -0,0 +1,3 @@ +open class A { + open fun f(c: C) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2 new file mode 100644 index 00000000000..d58cb4fd74b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/A.kt.new.2 @@ -0,0 +1,3 @@ +open class A { + open fun f(c: C) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt new file mode 100644 index 00000000000..fe031bf8549 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/B.kt @@ -0,0 +1,3 @@ +class B : A() { + override fun f(c: C) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt new file mode 100644 index 00000000000..2c74d386ad3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/C.kt @@ -0,0 +1 @@ +class C \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log new file mode 100644 index 00000000000..334e8d99380 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +End of files +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +COMPILATION FAILED +'f' overrides nothing + + +Cleaning output files: +out/production/module/A.class +End of files +Compiling files: +src/A.kt +src/B.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt new file mode 100644 index 00000000000..f24918ce642 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/A.kt @@ -0,0 +1,3 @@ +interface A { + fun f(c: C) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt new file mode 100644 index 00000000000..4686016741c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt @@ -0,0 +1,3 @@ +open class B { + fun f(c: C) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1 new file mode 100644 index 00000000000..114a9baca4b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.1 @@ -0,0 +1,3 @@ +open class B { + fun f(c: C) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2 new file mode 100644 index 00000000000..4686016741c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/B.kt.new.2 @@ -0,0 +1,3 @@ +open class B { + fun f(c: C) {} +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt new file mode 100644 index 00000000000..c3556f5d64a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/BA.kt @@ -0,0 +1 @@ +open class BA : B(), A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt new file mode 100644 index 00000000000..2c74d386ad3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/C.kt @@ -0,0 +1 @@ +class C \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log new file mode 100644 index 00000000000..de3e633548e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log @@ -0,0 +1,23 @@ +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +End of files +Cleaning output files: +out/production/module/BA.class +End of files +Compiling files: +src/BA.kt +End of files +COMPILATION FAILED +Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C): kotlin.Unit defined in A + + +Cleaning output files: +out/production/module/B.class +End of files +Compiling files: +src/B.kt +src/BA.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log index e91a715b155..488756b17ac 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log @@ -7,9 +7,11 @@ src/A.kt End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module +out/production/module/foo/AChild.class out/production/module/foo/UseAChildKt.class End of files Compiling files: +src/AChild.kt src/useAChild.kt End of files COMPILATION FAILED @@ -21,5 +23,6 @@ out/production/module/foo/A.class End of files Compiling files: src/A.kt +src/AChild.kt src/useAChild.kt End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt index b12e9b37962..0889bb8f6ae 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + class-fq-name-to-source.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt index 61e7c351e3b..700ec2032f6 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt @@ -7,8 +7,9 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + class-fq-name-to-source.tab proto.tab source-to-classes.tab subtypes.tab supertypes.tab -Module 'module' tests +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log index 11f21fb526c..d7b2fc49156 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log @@ -7,3 +7,10 @@ End of files Compiling files: module2/src/module2_b.kt End of files +Cleaning output files: +out/production/module1/a/A.class +out/production/module1/a/AA.class +End of files +Compiling files: +module1/src/module1_a.kt +End of files \ No newline at end of file From 4453f6c3788c7bbb1c7afde61c4ba57f0c3186bd Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 25 Jan 2016 20:22:44 +0300 Subject: [PATCH 0780/1557] Fix updating java mappings for multifile facade Original commit: 2abc422577498c9bb0ea8a9051b5508610cc32d9 --- .../kotlin/jps/build/KotlinBuilder.kt | 30 ++++++++++++++++--- ...perimentalIncrementalJpsTestGenerated.java | 6 ++++ .../multifilePackagePartMethodAdded/build.log | 20 +++++++++++++ .../multifilePackagePartMethodAdded/partA.kt | 4 +++ .../multifilePackagePartMethodAdded/partB.kt | 5 ++++ .../partB.kt.new.1 | 6 ++++ .../useFooF.kt | 3 ++ .../useFooG.kt | 3 ++ .../multifileClassFileAdded/build.log | 10 ------- .../experimental-ic-build.log | 5 ++++ 10 files changed, 78 insertions(+), 14 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooF.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooG.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 3a0d2447b13..936410c8a2d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -252,7 +252,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } val generatedClasses = generatedFiles.filterIsInstance>() - updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses) + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses, incrementalCaches) if (!IncrementalCompilation.isEnabled()) { return OK @@ -465,16 +465,38 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, filesToCompile: MultiMap, - generatedClasses: List> + generatedClasses: List>, + incrementalCaches: Map ) { val previousMappings = context.projectDescriptor.dataManager.mappings val delta = previousMappings.createDelta() val callback = delta.callback + val targetDirtyFiles: Map> = chunk.targets.keysToMap { + val files = HashSet() + dirtyFilesHolder.getRemovedFiles(it).mapTo(files, ::File) + files.addAll(filesToCompile.get(it)) + files + } + + fun getOldSourceFiles(generatedClass: GeneratedJvmClass): Set { + val cache = incrementalCaches[generatedClass.target] ?: return emptySet() + val className = generatedClass.outputClass.className + + if (!cache.isMultifileFacade(className)) return emptySet() + + val name = previousMappings.getName(className.internalName) + return previousMappings.getClassSources(name)?.toSet() ?: emptySet() + } for (generatedClass in generatedClasses) { + val sourceFiles = THashSet(FileUtil.FILE_HASHING_STRATEGY) + sourceFiles.addAll(getOldSourceFiles(generatedClass)) + sourceFiles.removeAll(targetDirtyFiles[generatedClass.target] ?: emptySet()) + sourceFiles.addAll(generatedClass.sourceFiles) + callback.associate( - FileUtil.toSystemIndependentName(generatedClass.outputFile.absolutePath), - generatedClass.sourceFiles.map { FileUtil.toSystemIndependentName(it.absolutePath) }, + FileUtil.toSystemIndependentName(generatedClass.outputFile.canonicalPath), + sourceFiles.map { FileUtil.toSystemIndependentName(it.canonicalPath) }, ClassReader(generatedClass.outputClass.fileContents) ) } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 8d733b367d3..2ee8fd46724 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1213,6 +1213,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("multifilePackagePartMethodAdded") + public void testMultifilePackagePartMethodAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/"); + doTest(fileName); + } + @TestMetadata("overrideExplicit") public void testOverrideExplicit() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/"); diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log new file mode 100644 index 00000000000..92e37457353 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log @@ -0,0 +1,20 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/Utils.class +out/production/module/Utils__PartBKt.class +End of files +Compiling files: +src/partB.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/UseFooFKt.class +out/production/module/UseFooGKt.class +out/production/module/Utils.class +out/production/module/Utils__PartAKt.class +End of files +Compiling files: +src/partA.kt +src/useFooF.kt +src/useFooG.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partA.kt new file mode 100644 index 00000000000..a0bd73ccf29 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partA.kt @@ -0,0 +1,4 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass + +fun f(x: Any) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt new file mode 100644 index 00000000000..66c94da6e9c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt @@ -0,0 +1,5 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass + +fun g(x: Int) {} + diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt.new.1 new file mode 100644 index 00000000000..84330654a1b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt.new.1 @@ -0,0 +1,6 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass + +fun f(x: Int) {} + +fun g(x: Int?) {} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooF.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooF.kt new file mode 100644 index 00000000000..0c51fdb0b17 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooF.kt @@ -0,0 +1,3 @@ +fun useFooF() { + f(10) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooG.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooG.kt new file mode 100644 index 00000000000..46308f2117f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooG.kt @@ -0,0 +1,3 @@ +fun useFooG() { + g(10) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log index a92e18853c5..d1b09f25402 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log @@ -5,16 +5,6 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/Test.class out/production/module/test/Test__AKt.class -out/production/module/test/Test__BKt.class -End of files -Compiling files: -src/a.kt -src/b.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__AKt.class End of files Compiling files: src/a.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log new file mode 100644 index 00000000000..37766455187 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log @@ -0,0 +1,5 @@ +========== Step #1 ============ + +Compiling files: +src/b.kt +End of files \ No newline at end of file From 5ac514efaf8545a14add9f04ad28f257e0572c9e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 25 Jan 2016 20:57:50 +0300 Subject: [PATCH 0781/1557] Move InlineFunctionsMap to IncrementalCacheImpl Original commit: 44b3159867edc4cf53ed1cca6a28381b5020cdaa --- .../incremental/JpsIncrementalCacheImpl.kt | 98 +------------------ 1 file changed, 5 insertions(+), 93 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt index 4616450bfb1..2a65d8916df 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt @@ -24,27 +24,23 @@ import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.incremental.storage.StorageOwner import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.incremental.* +import org.jetbrains.kotlin.incremental.IncrementalCacheImpl +import org.jetbrains.kotlin.incremental.dumpCollection import org.jetbrains.kotlin.incremental.storage.BasicMap import org.jetbrains.kotlin.incremental.storage.BasicStringMap import org.jetbrains.kotlin.incremental.storage.StringCollectionExternalizer -import org.jetbrains.kotlin.incremental.storage.StringToLongMapExternalizer -import org.jetbrains.kotlin.inline.inlineFunctionsJvmNames import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.jps.incremental.storages.PathCollectionExternalizer import org.jetbrains.kotlin.jps.incremental.storages.PathFunctionPair import org.jetbrains.kotlin.jps.incremental.storages.PathFunctionPairKeyDescriptor import org.jetbrains.kotlin.resolve.jvm.JvmClassName -import org.jetbrains.org.objectweb.asm.* import java.io.File -import java.util.* class JpsIncrementalCacheImpl( target: ModuleBuildTarget, paths: BuildDataPaths ) : IncrementalCacheImpl(paths.getTargetDataRoot(target), target.outputDir, target), StorageOwner { - private val inlineFunctionsMap = registerMap(InlineFunctionsMap(INLINE_FUNCTIONS.storageFile)) private val dirtyInlineFunctionsMap = registerMap(DirtyInlineFunctionsMap(DIRTY_INLINE_FUNCTIONS.storageFile)) private val inlinedTo = registerMap(InlineFunctionsFilesMap(INLINED_TO.storageFile)) @@ -58,13 +54,6 @@ class JpsIncrementalCacheImpl( KotlinBuilder.LOG.debug(message) } - override fun additionalProcessChangedClass(kotlinClass: LocalFileKotlinClass, isPackage: Boolean) = - inlineFunctionsMap.process(kotlinClass, isPackage) - - override fun additionalProcessRemovedClasses(dirtyClasses: List) { - dirtyClasses.forEach { inlineFunctionsMap.remove(it) } - } - fun getFilesToReinline(): Collection { val result = THashSet(FileUtil.PATH_HASHING_STRATEGY) @@ -84,86 +73,10 @@ class JpsIncrementalCacheImpl( dirtyInlineFunctionsMap.clean() } - private inner class InlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringToLongMapExternalizer) { - private fun getInlineFunctionsMap(bytes: ByteArray): Map { - val result = HashMap() - - val inlineFunctions = inlineFunctionsJvmNames(bytes) - if (inlineFunctions.isEmpty()) return emptyMap() - - ClassReader(bytes).accept(object : ClassVisitor(Opcodes.ASM5) { - override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { - val dummyClassWriter = ClassWriter(Opcodes.ASM5) - - return object : MethodVisitor(Opcodes.ASM5, dummyClassWriter.visitMethod(0, name, desc, null, exceptions)) { - override fun visitEnd() { - val jvmName = name + desc - if (jvmName !in inlineFunctions) return - - val dummyBytes = dummyClassWriter.toByteArray()!! - val hash = dummyBytes.md5() - result[jvmName] = hash - } - } - } - - }, 0) - - return result + override fun processChangedInlineFunctions(className: JvmClassName, changedFunctions: Collection) { + if (changedFunctions.isNotEmpty()) { + dirtyInlineFunctionsMap.put(className, changedFunctions.toList()) } - - fun process(kotlinClass: LocalFileKotlinClass, isPackage: Boolean): CompilationResult { - return put(kotlinClass.className, getInlineFunctionsMap(kotlinClass.fileContents), isPackage) - } - - private fun put(className: JvmClassName, newMap: Map, isPackage: Boolean): CompilationResult { - val internalName = className.internalName - val oldMap = storage[internalName] ?: emptyMap() - - val added = hashSetOf() - val changed = hashSetOf() - val allFunctions = oldMap.keys + newMap.keys - - for (fn in allFunctions) { - val oldHash = oldMap[fn] - val newHash = newMap[fn] - - when { - oldHash == null -> added.add(fn) - oldHash != newHash -> changed.add(fn) - } - } - - when { - newMap.isNotEmpty() -> storage[internalName] = newMap - else -> storage.remove(internalName) - } - - if (changed.isNotEmpty()) { - dirtyInlineFunctionsMap.put(className, changed.toList()) - } - - val changes = - if (IncrementalCompilation.isExperimental()) { - val fqName = if (isPackage) className.packageFqName else className.fqNameForClassNameWithoutDollars - // TODO get name in better way instead of using substringBefore - (added.asSequence() + changed.asSequence()).map { ChangeInfo.MembersChanged(fqName, listOf(it.substringBefore("("))) } - } - else { - emptySequence() - } - - return CompilationResult(inlineChanged = changed.isNotEmpty(), - inlineAdded = added.isNotEmpty(), - changes = changes) - } - - fun remove(className: JvmClassName) { - storage.remove(className.internalName) - } - - override fun dumpValue(value: Map): String = - value.dumpMap { java.lang.Long.toHexString(it) } } private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { @@ -204,7 +117,6 @@ class JpsIncrementalCacheImpl( } companion object { - private val INLINE_FUNCTIONS = "inline-functions" private val DIRTY_INLINE_FUNCTIONS = "dirty-inline-functions" private val INLINED_TO = "inlined-to" } From 7ea3a50848fe7ec2cfe37831d99f339f2c602744 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 26 Jan 2016 16:06:10 +0300 Subject: [PATCH 0782/1557] Make LookupStorage thread safe #KT-10792: Fixed Original commit: 0a48d831763643ae475d4160c41beed8c70fc978 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 936410c8a2d..2a27f056ffe 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -560,9 +560,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) - filesToCompile.values().forEach { lookupStorage.removeLookupsFrom(it) } val removedFiles = chunk.targets.flatMap { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it) } - removedFiles.forEach { lookupStorage.removeLookupsFrom(it) } + lookupStorage.removeLookupsFrom(filesToCompile.values().asSequence() + removedFiles.asSequence()) lookupStorage.addAll(lookupTracker.lookups.entrySet(), lookupTracker.pathInterner.values) } From 97d529d786ecaf93e8e6f9c0f62298e41b0b83b2 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 26 Jan 2016 21:53:07 +0300 Subject: [PATCH 0783/1557] Cleanup RC deprecations in compiler and plugin. Original commit: 744a7a83f77250941731de8b5557f806fd4ded58 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../kotlin/jps/incremental/JpsIncrementalCacheImpl.kt | 2 +- .../jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt | 2 +- .../jps/build/classFilesComparison/classFilesComparison.kt | 4 +++- .../kotlin/jps/incremental/AbstractProtoComparisonTest.kt | 4 ++-- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 2a27f056ffe..34464c46c5c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -830,7 +830,7 @@ private fun withSubtypes( typeFqName: FqName, caches: Sequence> ): Set { - val types = linkedListOf(typeFqName) + val types = LinkedList(listOf(typeFqName)) val subtypes = hashSetOf() while (types.isNotEmpty()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt index 2a65d8916df..8c199778276 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt @@ -81,7 +81,7 @@ class JpsIncrementalCacheImpl( private inner class DirtyInlineFunctionsMap(storageFile: File) : BasicStringMap>(storageFile, StringCollectionExternalizer) { fun getEntries(): Map> = - storage.keys.toMapBy(JvmClassName::byInternalName) { storage[it]!! } + storage.keys.associateBy(JvmClassName::byInternalName) { storage[it]!! } fun put(className: JvmClassName, changedFunctions: List) { storage[className.internalName] = changedFunctions diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index bf79ec43766..e711b055b75 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -53,7 +53,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( fail("File $actualFile unexpectedly contains multiline comments. In range ${matchResult.range} found: ${matchResult.value} in $text") } - val lines = text.lines().toArrayList() + val lines = text.lines().toMutableList() for ((line, lookupsFromLine) in lookupsFromFile.groupBy { it.position.line }) { val columnToLookups = lookupsFromLine.groupBy { it.position.column }.toList().sortedBy { it.first } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt index e2fdf2ca5f5..64f7260b6f5 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt @@ -36,6 +36,8 @@ import java.io.File import java.io.PrintWriter import java.io.StringWriter import java.util.* +import kotlin.comparisons.* + // Set this to true if you want to dump all bytecode (test will fail in this case) val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" @@ -53,7 +55,7 @@ fun getDirectoryString(dir: File, interestingPaths: List): String { val listFiles = dir.listFiles() assertNotNull(listFiles) - val children = listFiles!!.sortedWith(compareBy ({ it.isDirectory }, { it.name } )) + val children = listFiles!!.sortedWith(compareBy({ it.isDirectory }, { it.name })) for (child in children) { if (child.isDirectory) { p.println(child.name) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 922bad39daf..9cf233a9f79 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -37,8 +37,8 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { val oldClassFiles = compileFileAndGetClasses(testDataPath, testDir, "old") val newClassFiles = compileFileAndGetClasses(testDataPath, testDir, "new") - val oldClassMap = oldClassFiles.toMapBy { it.name } - val newClassMap = newClassFiles.toMapBy { it.name } + val oldClassMap = oldClassFiles.associateBy { it.name } + val newClassMap = newClassFiles.associateBy { it.name } val sb = StringBuilder() val p = Printer(sb) From 4ff15aa21f96def7c6f09494f40bfa2309404bcf Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Mon, 1 Feb 2016 16:27:58 +0300 Subject: [PATCH 0784/1557] Fix KT-10764 IDEA doesn't show overload conflict between constructor and function... When checking for overloads in package, consider functions and top-level class constructors as possibly conflicting between each other. NB OverloadUtil uses containing package scope from module descriptor. Change diagnostic message for CONFLICTING_OVERLOAD: it's misleading in case of fun vs constructor conflict. Add custom multifile test for diagnostics in IDE (probably not the best; should preprocess file content if it's required to check highlighting in multiple files, not only in the first file). Add test for KT-10765 Incremental compilation misses overload conflict between constructor and function ... Original commit: 65f754ffcaa382ad75adb024278beb813638bad7 --- ...perimentalIncrementalJpsTestGenerated.java | 6 ++++ .../build/IncrementalJpsTestGenerated.java | 6 ++++ .../secondaryConstructorAdded/build.log | 29 +++++++------------ .../pureKotlin/funRedeclaration/build.log | 2 +- .../build.log | 9 ++++++ .../funVsConstructorOverloadConflict/fun1.kt | 5 ++++ .../funVsConstructorOverloadConflict/fun2.kt | 3 ++ .../fun2.kt.new | 5 ++++ 8 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 2ee8fd46724..ab67536190b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -335,6 +335,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("funVsConstructorOverloadConflict") + public void testFunVsConstructorOverloadConflict() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/"); + doTest(fileName); + } + @TestMetadata("functionBecameInline") public void testFunctionBecameInline() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 49b4ef012aa..0d2f97b7183 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -335,6 +335,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("funVsConstructorOverloadConflict") + public void testFunVsConstructorOverloadConflict() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/"); + doTest(fileName); + } + @TestMetadata("functionBecameInline") public void testFunctionBecameInline() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/functionBecameInline/"); diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index f9971a4960e..7122f36b6d3 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -4,9 +4,19 @@ End of files Compiling files: src/A.kt End of files +COMPILATION FAILED +'public constructor A(x: kotlin.String)' conflicts with another declaration: public constructor A(x: kotlin.String) + + +Cleaning output files: +out/production/module/AConstructorFunctionKt.class +out/production/module/META-INF/module.kotlin_module +End of files +Compiling files: +src/A.kt +End of files Cleaning output files: out/production/module/AChild.class -out/production/module/AConstructorFunctionKt.class out/production/module/CreateAFromIntKt.class out/production/module/CreateAFromStringKt.class out/production/module/META-INF/module.kotlin_module @@ -14,23 +24,6 @@ out/production/module/UseAKt.class End of files Compiling files: src/AChild.kt -src/AConstructorFunction.kt -src/createAFromInt.kt -src/createAFromString.kt -src/useA.kt -End of files -COMPILATION FAILED -Overload resolution ambiguity: -public constructor A(x: kotlin.String) defined in A -public fun A(x: kotlin.String): A defined in root package - - -Cleaning output files: -out/production/module/A.class -End of files -Compiling files: -src/A.kt -src/AChild.kt src/createAFromInt.kt src/createAFromString.kt src/useA.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 1e5f3f89482..1224d634ee4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -6,4 +6,4 @@ Compiling files: src/fun2.kt End of files COMPILATION FAILED -'public fun function(): kotlin.Unit' is already defined in test \ No newline at end of file +'public fun function(): kotlin.Unit' conflicts with another declaration: public fun function(): kotlin.Unit \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log new file mode 100644 index 00000000000..e3d39a6b779 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log @@ -0,0 +1,9 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/test/Fun2Kt.class +End of files +Compiling files: +src/fun2.kt +End of files +COMPILATION FAILED +'public constructor function()' conflicts with another declaration: public constructor function() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt new file mode 100644 index 00000000000..539d6344c39 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun1.kt @@ -0,0 +1,5 @@ +package test + +fun function() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt new file mode 100644 index 00000000000..897d69e3641 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt @@ -0,0 +1,3 @@ +package test + +val x = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new new file mode 100644 index 00000000000..bf81e8e2e1d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/fun2.kt.new @@ -0,0 +1,5 @@ +package test + +val x = 1 + +class function \ No newline at end of file From 221776169462768fd85c60ee58119505d3bd0908 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Tue, 2 Feb 2016 18:24:34 +0300 Subject: [PATCH 0785/1557] Better diagnostics for conflicting overloads. Skip declarations without sources in reporting, not when determining redeclaration groups: this allows emitting informative diagnostics for incremental compilation. Provide containing declaration with "kind", e.g., "package ''", "class A", and so on. Original commit: 4afe98a0f6c06270cab16b24e5f4f18cf3d4a77d --- .../classHierarchyAffected/secondaryConstructorAdded/build.log | 2 +- .../testData/incremental/pureKotlin/funRedeclaration/build.log | 2 +- .../pureKotlin/funVsConstructorOverloadConflict/build.log | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index 7122f36b6d3..977648d6f3f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -5,7 +5,7 @@ Compiling files: src/A.kt End of files COMPILATION FAILED -'public constructor A(x: kotlin.String)' conflicts with another declaration: public constructor A(x: kotlin.String) +'public constructor A(x: kotlin.String)' conflicts with another declaration in package '' Cleaning output files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 1224d634ee4..39ae0ba5aea 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -6,4 +6,4 @@ Compiling files: src/fun2.kt End of files COMPILATION FAILED -'public fun function(): kotlin.Unit' conflicts with another declaration: public fun function(): kotlin.Unit \ No newline at end of file +'public fun function(): kotlin.Unit' conflicts with another declaration in package 'test' \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log index e3d39a6b779..66735e9dcd1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log @@ -6,4 +6,4 @@ Compiling files: src/fun2.kt End of files COMPILATION FAILED -'public constructor function()' conflicts with another declaration: public constructor function() \ No newline at end of file +'public constructor function()' conflicts with another declaration in package 'test' \ No newline at end of file From 0e147d14e37341c1751af0df146e2cb34ce11131 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 3 Feb 2016 20:52:24 +0300 Subject: [PATCH 0786/1557] J2K KotlinBuilderModuleScriptGenerator: .java -> .kt Original commit: d5030335b6eba73793481a6bfb43f246a42c578d --- ...ScriptGenerator.java => KotlinBuilderModuleScriptGenerator.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/{KotlinBuilderModuleScriptGenerator.java => KotlinBuilderModuleScriptGenerator.kt} (100%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt From 9bf58b823ede5eedd42fd1930afb9b0f60dc1ec4 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 3 Feb 2016 20:53:21 +0300 Subject: [PATCH 0787/1557] J2K KotlinBuilderModuleScriptGenerator: convert Original commit: 21e69a0a4c63bdc0a9fc6f434c60c30b7b5a30d0 --- .../KotlinBuilderModuleScriptGenerator.kt | 190 ++++++++---------- 1 file changed, 84 insertions(+), 106 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt index f6afa1e7e14..8b05744bf0c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt @@ -14,151 +14,129 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.build; +package org.jetbrains.kotlin.jps.build -import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.MultiMap; -import kotlin.io.FilesKt; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.ModuleChunk; -import org.jetbrains.jps.builders.BuildTargetType; -import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; -import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor; -import org.jetbrains.jps.builders.logging.ProjectBuilderLogger; -import org.jetbrains.jps.incremental.CompileContext; -import org.jetbrains.jps.incremental.ModuleBuildTarget; -import org.jetbrains.jps.incremental.ProjectBuildException; -import org.jetbrains.jps.model.java.JpsJavaExtensionService; -import org.jetbrains.kotlin.build.JvmSourceRoot; -import org.jetbrains.kotlin.config.IncrementalCompilation; -import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder; +import com.intellij.openapi.util.Condition +import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.text.StringUtil +import com.intellij.util.containers.ContainerUtil +import com.intellij.util.containers.MultiMap +import org.jetbrains.jps.ModuleChunk +import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType +import org.jetbrains.jps.incremental.CompileContext +import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.jps.incremental.ProjectBuildException +import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.kotlin.build.JvmSourceRoot +import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies +import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder +import java.io.File +import java.io.IOException +import java.util.* -import java.io.File; -import java.io.IOException; -import java.util.*; +object KotlinBuilderModuleScriptGenerator { -import static org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies; + @Throws(IOException::class, ProjectBuildException::class) + fun generateModuleDescription( + context: CompileContext, + chunk: ModuleChunk, + sourceFiles: MultiMap, // ignored for non-incremental compilation + hasRemovedFiles: Boolean): File? { + val builder = KotlinModuleXmlBuilder() -public class KotlinBuilderModuleScriptGenerator { + var noSources = true - @Nullable - public static File generateModuleDescription( - CompileContext context, - ModuleChunk chunk, - MultiMap sourceFiles, // ignored for non-incremental compilation - boolean hasRemovedFiles - ) throws IOException, ProjectBuildException { - KotlinModuleXmlBuilder builder = new KotlinModuleXmlBuilder(); - - boolean noSources = true; - - Set outputDirs = new HashSet(); - for (ModuleBuildTarget target : chunk.getTargets()) { - outputDirs.add(getOutputDirSafe(target)); + val outputDirs = HashSet() + for (target in chunk.targets) { + outputDirs.add(getOutputDirSafe(target)) } - ProjectBuilderLogger logger = context.getLoggingManager().getProjectBuilderLogger(); - for (ModuleBuildTarget target : chunk.getTargets()) { - File outputDir = getOutputDirSafe(target); - List friendDirs = new ArrayList(); - File friendDir = getFriendDirSafe(target); + val logger = context.loggingManager.projectBuilderLogger + for (target in chunk.targets) { + val outputDir = getOutputDirSafe(target) + val friendDirs = ArrayList() + val friendDir = getFriendDirSafe(target) if (friendDir != null) { - friendDirs.add(friendDir); + friendDirs.add(friendDir) } - List moduleSources = new ArrayList( - IncrementalCompilation.isEnabled() - ? sourceFiles.get(target) - : KotlinSourceFileCollector.getAllKotlinSourceFiles(target)); + val moduleSources = ArrayList( + if (IncrementalCompilation.isEnabled()) + sourceFiles.get(target) + else + KotlinSourceFileCollector.getAllKotlinSourceFiles(target)) - if (moduleSources.size() > 0 || hasRemovedFiles) { - noSources = false; + if (moduleSources.size > 0 || hasRemovedFiles) { + noSources = false - if (logger.isEnabled()) { - logger.logCompiledFiles(moduleSources, KotlinBuilder.KOTLIN_BUILDER_NAME, "Compiling files:"); + if (logger.isEnabled) { + logger.logCompiledFiles(moduleSources, KotlinBuilder.KOTLIN_BUILDER_NAME, "Compiling files:") } } - BuildTargetType targetType = target.getTargetType(); - assert targetType instanceof JavaModuleBuildTargetType; + val targetType = target.targetType + assert(targetType is JavaModuleBuildTargetType) builder.addModule( - target.getId(), - outputDir.getAbsolutePath(), + target.id, + outputDir.absolutePath, moduleSources, findSourceRoots(context, target), findClassPathRoots(target), - ((JavaModuleBuildTargetType) targetType).getTypeId(), - ((JavaModuleBuildTargetType) targetType).isTests(), + (targetType as JavaModuleBuildTargetType).typeId, + targetType.isTests, // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs, - friendDirs - ); + friendDirs) } - if (noSources) return null; + if (noSources) return null - File scriptFile = File.createTempFile("kjps", StringUtil.sanitizeJavaIdentifier(chunk.getName()) + ".script.xml"); + val scriptFile = File.createTempFile("kjps", StringUtil.sanitizeJavaIdentifier(chunk.name) + ".script.xml") - FileUtil.writeToFile(scriptFile, builder.asText().toString()); + FileUtil.writeToFile(scriptFile, builder.asText().toString()) - return scriptFile; + return scriptFile } - @NotNull - public static File getOutputDirSafe(@NotNull ModuleBuildTarget target) throws ProjectBuildException { - File outputDir = target.getOutputDir(); - if (outputDir == null) { - throw new ProjectBuildException("No output directory found for " + target); - } - return outputDir; + @Throws(ProjectBuildException::class) + fun getOutputDirSafe(target: ModuleBuildTarget): File { + val outputDir = target.outputDir ?: throw ProjectBuildException("No output directory found for " + target) + return outputDir } - @Nullable - private static File getFriendDirSafe(@NotNull ModuleBuildTarget target) throws ProjectBuildException { - if (!target.isTests()) return null; + @Throws(ProjectBuildException::class) + private fun getFriendDirSafe(target: ModuleBuildTarget): File? { + if (!target.isTests) return null - File outputDirForProduction = JpsJavaExtensionService.getInstance().getOutputDirectory(target.getModule(), false); - if (outputDirForProduction == null) { - return null; - } - return outputDirForProduction; + val outputDirForProduction = JpsJavaExtensionService.getInstance().getOutputDirectory(target.module, false) ?: return null + return outputDirForProduction } - @NotNull - private static Collection findClassPathRoots(@NotNull ModuleBuildTarget target) { - return ContainerUtil.filter(getAllDependencies(target).classes().getRoots(), new Condition() { - @Override - public boolean value(File file) { - if (!file.exists()) { - String extension = FilesKt.getExtension(file); + private fun findClassPathRoots(target: ModuleBuildTarget): Collection { + return ContainerUtil.filter(getAllDependencies(target).classes().roots, Condition { file -> + if (!file.exists()) { + val extension = file.extension - // Don't filter out files, we want to report warnings about absence through the common place - if (!(extension.equals("class") || extension.equals("jar"))) { - return false; - } + // Don't filter out files, we want to report warnings about absence through the common place + if (!(extension == "class" || extension == "jar")) { + return@Condition false } - - return true; } - }); + + true + }) } - @NotNull - private static List findSourceRoots(@NotNull CompileContext context, @NotNull ModuleBuildTarget target) { - List roots = context.getProjectDescriptor().getBuildRootIndex().getTargetRoots(target, context); - List result = ContainerUtil.newArrayList(); - for (JavaSourceRootDescriptor root : roots) { - File file = root.getRootFile(); - String prefix = root.getPackagePrefix(); + private fun findSourceRoots(context: CompileContext, target: ModuleBuildTarget): List { + val roots = context.projectDescriptor.buildRootIndex.getTargetRoots(target, context) + val result = ContainerUtil.newArrayList() + for (root in roots) { + val file = root.rootFile + val prefix = root.packagePrefix if (file.exists()) { - result.add(new JvmSourceRoot(file, prefix.isEmpty() ? null : prefix)); + result.add(JvmSourceRoot(file, if (prefix.isEmpty()) null else prefix)) } } - return result; + return result } - - private KotlinBuilderModuleScriptGenerator() {} } From 5044e2599bc23ad33ef9f81daee785df83165585 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 3 Feb 2016 20:59:54 +0300 Subject: [PATCH 0788/1557] J2K KotlinBuilderModuleScriptGenerator: cleanup Original commit: e328c24857ebab94cfd43cb6750080f39e5d89d1 --- .../KotlinBuilderModuleScriptGenerator.kt | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt index 8b05744bf0c..a3ef520056a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt @@ -16,7 +16,6 @@ package org.jetbrains.kotlin.jps.build -import com.intellij.openapi.util.Condition import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil import com.intellij.util.containers.ContainerUtil @@ -32,17 +31,16 @@ import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder import java.io.File -import java.io.IOException import java.util.* object KotlinBuilderModuleScriptGenerator { - @Throws(IOException::class, ProjectBuildException::class) fun generateModuleDescription( context: CompileContext, chunk: ModuleChunk, sourceFiles: MultiMap, // ignored for non-incremental compilation - hasRemovedFiles: Boolean): File? { + hasRemovedFiles: Boolean + ): File? { val builder = KotlinModuleXmlBuilder() var noSources = true @@ -51,6 +49,7 @@ object KotlinBuilderModuleScriptGenerator { for (target in chunk.targets) { outputDirs.add(getOutputDirSafe(target)) } + val logger = context.loggingManager.projectBuilderLogger for (target in chunk.targets) { val outputDir = getOutputDirSafe(target) @@ -98,13 +97,9 @@ object KotlinBuilderModuleScriptGenerator { return scriptFile } - @Throws(ProjectBuildException::class) - fun getOutputDirSafe(target: ModuleBuildTarget): File { - val outputDir = target.outputDir ?: throw ProjectBuildException("No output directory found for " + target) - return outputDir - } + fun getOutputDirSafe(target: ModuleBuildTarget): File = + target.outputDir ?: throw ProjectBuildException("No output directory found for " + target) - @Throws(ProjectBuildException::class) private fun getFriendDirSafe(target: ModuleBuildTarget): File? { if (!target.isTests) return null @@ -113,18 +108,18 @@ object KotlinBuilderModuleScriptGenerator { } private fun findClassPathRoots(target: ModuleBuildTarget): Collection { - return ContainerUtil.filter(getAllDependencies(target).classes().roots, Condition { file -> + return getAllDependencies(target).classes().roots.filter { file -> if (!file.exists()) { val extension = file.extension // Don't filter out files, we want to report warnings about absence through the common place if (!(extension == "class" || extension == "jar")) { - return@Condition false + return@filter false } } true - }) + } } private fun findSourceRoots(context: CompileContext, target: ModuleBuildTarget): List { From 964db8404228a4de6c0f66d5feb2fdad7478de9a Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 3 Feb 2016 22:18:09 +0300 Subject: [PATCH 0789/1557] Allow to use internal declarations from special modules in compiler (JPS) (e.g. IDEA 16 gradle tests loaded in separate module) #KT-10595 Fixed Original commit: 3c4cb545738e793f33406606063374f7d9ff9607 --- .../KotlinBuilderModuleScriptGenerator.kt | 54 +++++++++++++++---- 1 file changed, 45 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt index a3ef520056a..a87bb0a6f92 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.text.StringUtil +import com.intellij.util.SmartList import com.intellij.util.containers.ContainerUtil import com.intellij.util.containers.MultiMap import org.jetbrains.jps.ModuleChunk @@ -26,15 +27,47 @@ import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.incremental.ModuleBuildTarget import org.jetbrains.jps.incremental.ProjectBuildException import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.kotlin.build.JvmSourceRoot import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder +import org.jetbrains.kotlin.utils.addIfNotNull +import org.jetbrains.kotlin.utils.alwaysNull import java.io.File +import java.lang.reflect.Method import java.util.* object KotlinBuilderModuleScriptGenerator { + // TODO used reflection to be compatible with IDEA from both 143 and 144 branches, + // TODO switch to directly using when "since-build" will be >= 144.3357.4 + private val getRelatedProductionModule: (JpsModule) -> JpsModule? = run { + val klass = + try { + Class.forName("org.jetbrains.jps.model.module.JpsTestModuleProperties") + } catch (e: ClassNotFoundException) { + return@run alwaysNull() + } + + + val getTestModulePropertiesMethod: Method + val getProductionModuleMethod: Method + + try { + getTestModulePropertiesMethod = JpsJavaExtensionService::class.java.getDeclaredMethod("getTestModuleProperties", JpsModule::class.java) + getProductionModuleMethod = klass.getDeclaredMethod("getProductionModule") + } + catch (e: NoSuchMethodException) { + return@run alwaysNull() + } + + return@run { module -> + val instance = getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module) + getProductionModuleMethod(instance) as JpsModule? + } + } + fun generateModuleDescription( context: CompileContext, chunk: ModuleChunk, @@ -53,11 +86,7 @@ object KotlinBuilderModuleScriptGenerator { val logger = context.loggingManager.projectBuilderLogger for (target in chunk.targets) { val outputDir = getOutputDirSafe(target) - val friendDirs = ArrayList() - val friendDir = getFriendDirSafe(target) - if (friendDir != null) { - friendDirs.add(friendDir) - } + val friendDirs = getAdditionalOutputDirsWhereInternalsAreVisible(target) val moduleSources = ArrayList( if (IncrementalCompilation.isEnabled()) @@ -100,11 +129,18 @@ object KotlinBuilderModuleScriptGenerator { fun getOutputDirSafe(target: ModuleBuildTarget): File = target.outputDir ?: throw ProjectBuildException("No output directory found for " + target) - private fun getFriendDirSafe(target: ModuleBuildTarget): File? { - if (!target.isTests) return null + private fun getAdditionalOutputDirsWhereInternalsAreVisible(target: ModuleBuildTarget): List { + if (!target.isTests) return emptyList() - val outputDirForProduction = JpsJavaExtensionService.getInstance().getOutputDirectory(target.module, false) ?: return null - return outputDirForProduction + val result = SmartList() + + result.addIfNotNull(JpsJavaExtensionService.getInstance().getOutputDirectory(target.module, false)) + + getRelatedProductionModule(target.module)?.let { + result.addIfNotNull(JpsJavaExtensionService.getInstance().getOutputDirectory(it, false)) + } + + return result } private fun findClassPathRoots(target: ModuleBuildTarget): Collection { From ba8c35ce23764eea928e3437477eaf383c00c26f Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 9 Feb 2016 15:08:26 +0300 Subject: [PATCH 0790/1557] FIx possible NPEs when try to use TestModuleProperties in IDEA 144.x #EA-78931 Fixed Original commit: eacd50c4dc3684f9e99eacfff56cf5dc0ec888f8 --- .../kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt index a87bb0a6f92..e4089a34907 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt @@ -63,8 +63,9 @@ object KotlinBuilderModuleScriptGenerator { } return@run { module -> - val instance = getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module) - getProductionModuleMethod(instance) as JpsModule? + getTestModulePropertiesMethod(JpsJavaExtensionService.getInstance(), module)?.let { + getProductionModuleMethod(it) as JpsModule? + } } } From d55fafae93315f7acaffc0046c4b83eb612a5359 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 17 Dec 2015 21:43:48 +0300 Subject: [PATCH 0791/1557] Log final exit code instead of intermediate; change log level for build result to INFO Original commit: 4ec3865830087059b92ce11b9e24848abcb02dc6 --- .../org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 34464c46c5c..e4f8db4a054 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -134,19 +134,19 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val fsOperations = FSOperationsHelper(context, chunk, LOG) try { - val exitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, fsOperations) - LOG.debug("Build result: " + exitCode) + val proposedExitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, fsOperations) - if (exitCode == OK && fsOperations.hasMarkedDirty()) return ADDITIONAL_PASS_REQUIRED + val actualExitCode = if (proposedExitCode == OK && fsOperations.hasMarkedDirty()) ADDITIONAL_PASS_REQUIRED else proposedExitCode - return exitCode + LOG.info("Build result: " + actualExitCode) + return actualExitCode } catch (e: StopBuildException) { - LOG.debug("Caught exception: " + e) + LOG.info("Caught exception: " + e) throw e } catch (e: Throwable) { - LOG.debug("Caught exception: " + e) + LOG.info("Caught exception: " + e) messageCollector.report( CompilerMessageSeverity.EXCEPTION, From e7dcf02ffee88ed0e222075158593166cfa2f497 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 25 Jan 2016 22:34:10 +0300 Subject: [PATCH 0792/1557] Introduce TestingContext to pass data between tests and KotlinBuilder; introduce BuildLogger to log build events (build finished, files marked as dirty) in KotlinBuilder Original commit: f6e7f8c3c003182ff718a08e58afe102700afb6c --- .../jetbrains/kotlin/jps/build/BuildLogger.kt | 35 ++++ .../kotlin/jps/build/FSOperationsHelper.kt | 4 + .../kotlin/jps/build/KotlinBuilder.kt | 30 ++-- .../kotlin/jps/build/TestingContext.kt | 44 +++++ .../jps/build/AbstractIncrementalJpsTest.kt | 43 +++-- ...experimentalIncrementalCompilationTests.kt | 5 +- .../clearedHasKotlin/build.log | 43 +++-- .../exportedModule/build.log | 28 ++- .../data-container-version-build.log | 39 +++++ .../javaOnlyModulesAreNotAffected/build.log | 35 ++-- .../module1Modified/build.log | 38 ++-- .../data-container-version-build.log | 45 +++++ .../module2Modified/build.log | 22 ++- .../data-container-version-build.log | 24 +++ .../moduleWithConstantModified/build.log | 18 +- .../data-container-version-build.log | 22 +++ .../moduleWithInlineModified/build.log | 20 ++- .../data-container-version-build.log | 23 +++ .../cacheVersionChanged/touchedFile/build.log | 20 ++- .../data-container-version-build.log | 19 ++ .../touchedOnlyJavaFile/build.log | 24 +-- .../data-container-version-build.log | 23 +++ .../untouchedFiles/build.log | 16 +- .../data-container-version-build.log | 16 ++ .../cacheVersionChanged/withError/build.log | 53 ++++-- .../data-container-version-build.log | 63 +++++++ .../experimentalOn/build.log | 102 +++++++---- .../experimentalOnJavaChanged/build.log | 46 +++-- .../experimentalOnJavaOnly/build.log | 8 +- .../experimentalOnOff/build.log | 143 +++++++++------ .../incrementalOff/build.log | 41 +++-- .../incrementalOffOn/build.log | 84 ++++++--- .../annotationFlagRemoved/build.log | 45 +++-- .../annotationListChanged/build.log | 163 +++++++++++------- .../bridgeGenerated/build.log | 22 ++- .../classBecameFinal/build.log | 104 ++++++----- .../classBecameInterface/build.log | 106 +++++++----- .../classBecamePrivate/build.log | 104 ++++++----- .../classToPackageFacade/build.log | 77 +++++---- .../build.log | 61 ++++--- .../companionObjectMemberChanged/build.log | 56 +++--- .../companionObjectNameChanged/build.log | 49 ++++-- .../companionObjectToSimpleObject/build.log | 48 ++++-- .../constructorVisibilityChanged/build.log | 38 ++-- .../enumEntryAdded/build.log | 45 +++-- .../enumMemberChanged/build.log | 31 +++- .../build.log | 39 +++-- .../build.log | 74 +++++--- .../implcitUpcast/build.log | 59 ++++--- .../inferredTypeArgumentChanged/build.log | 65 ++++--- .../inferredTypeChanged/build.log | 45 +++-- .../jvmNameChanged/build.log | 25 ++- .../lambdaParameterAffected/build.log | 56 +++--- .../methodAdded/build.log | 27 ++- .../methodAnnotationAdded/build.log | 27 ++- .../methodNullabilityChanged/build.log | 38 ++-- .../build.log | 27 ++- .../methodRemoved/build.log | 29 +++- .../multiModuleCircular/build.log | 64 +++++-- .../multiModuleExported/build.log | 59 +++++-- .../multiModuleSimple/build.log | 51 ++++-- .../multifilePackagePartMethodAdded/build.log | 38 ++-- .../overrideExplicit/build.log | 29 +++- .../overrideImplicit/build.log | 29 +++- .../packageFacadeToClass/build.log | 50 ++++-- .../propertyNullabilityChanged/build.log | 40 +++-- .../sealedClassImplAdded/build.log | 41 +++-- .../secondaryConstructorAdded/build.log | 46 +++-- .../starProjectionUpperBoundChanged/build.log | 32 ++-- .../supertypesListChanged/build.log | 163 +++++++++++------- .../typeParameterListChanged/build.log | 104 ++++++----- .../varianceChanged/build.log | 47 +++-- .../javaConstantChangedUsedInKotlin/build.log | 18 +- .../build.log | 10 +- .../kotlinConstantChangedUsedInJava/build.log | 18 +- .../build.log | 14 +- .../kotlinJvmFieldChangedUsedInJava/build.log | 18 +- .../build.log | 14 +- .../custom/projectPathCaseChanged/build.log | 12 +- .../projectPathCaseChangedMultiFile/build.log | 12 +- .../inlineFunCallSite/classProperty/build.log | 22 ++- .../companionObjectProperty/build.log | 24 ++- .../inlineFunCallSite/function/build.log | 24 ++- .../inlineFunCallSite/getter/build.log | 29 +++- .../inlineFunCallSite/lambda/build.log | 26 ++- .../inlineFunCallSite/localFun/build.log | 26 ++- .../inlineFunCallSite/method/build.log | 22 ++- .../parameterDefaultValue/build.log | 24 ++- .../build.log | 22 ++- .../inlineFunCallSite/superCall/build.log | 22 ++- .../inlineFunCallSite/thisCall/build.log | 22 ++- .../topLevelObjectProperty/build.log | 22 ++- .../topLevelProperty/build.log | 24 ++- .../lazyKotlinCaches/class/build.log | 10 +- .../classInheritance/build.log | 14 +- .../lazyKotlinCaches/constant/build.log | 26 ++- .../lazyKotlinCaches/function/build.log | 14 +- .../inlineFunctionWithUsage/build.log | 24 ++- .../inlineFunctionWithoutUsage/build.log | 14 +- .../lazyKotlinCaches/noKotlin/build.log | 8 +- .../topLevelPropertyAccess/build.log | 14 +- .../classifierMembers/init-build.log | 10 +- .../lookupTracker/java/init-build.log | 4 +- .../syntheticProperties/init-build.log | 6 +- .../circularDependencyClasses/build.log | 22 ++- .../experimental-ic-build.log | 24 ++- .../build.log | 14 +- .../build.log | 24 ++- .../experimental-ic-build.log | 12 +- .../build.log | 34 ++-- .../experimental-ic-build.log | 18 +- .../constantValueChanged/build.log | 30 +++- .../defaultParameterAdded/build.log | 22 ++- .../experimental-ic-build.log | 25 +++ .../build.log | 24 ++- .../experimental-ic-build.log | 26 +++ .../defaultParameterRemoved/build.log | 22 ++- .../experimental-ic-build.log | 25 +++ .../build.log | 24 ++- .../experimental-ic-build.log | 26 +++ .../inlineFunctionInlined/build.log | 26 ++- .../inlineFunctionTwoPackageParts/build.log | 67 ++++--- .../multiModule/simpleDependency/build.log | 26 ++- .../experimental-ic-build.log | 27 +++ .../build.log | 30 ++-- .../experimental-ic-build.log | 37 ++++ .../build.log | 32 ++-- .../simpleDependencyUnchanged/build.log | 18 +- .../transitiveDependency/build.log | 28 ++- .../experimental-ic-build.log | 29 ++++ .../multiModule/transitiveInlining/build.log | 38 ++-- .../multiModule/twoDependants/build.log | 36 ++-- .../twoDependants/experimental-ic-build.log | 39 +++++ .../build.log | 18 +- .../build.log | 28 +-- .../experimental-ic-build.log | 22 ++- .../accessingPropertiesViaField/build.log | 18 +- .../pureKotlin/allConstants/build.log | 47 +++-- .../pureKotlin/annotations/build.log | 14 +- .../anonymousObjectChanged/build.log | 16 +- .../build.log | 20 ++- .../experimental-ic-build.log | 32 ++-- .../changeWithRemovingUsage/build.log | 14 +- .../experimental-ic-build.log | 14 +- .../classInlineFunctionChanged/build.log | 22 ++- .../classObjectConstantChanged/build.log | 24 ++- .../pureKotlin/classRecreated/build.log | 49 ++++-- .../classRecreated/experimental-ic-build.log | 16 +- .../pureKotlin/classRedeclaration/build.log | 16 +- .../classSignatureChanged/build.log | 20 ++- .../experimental-ic-build.log | 23 +++ .../classSignatureUnchanged/build.log | 10 +- .../build.log | 19 +- .../build.log | 19 +- .../build.log | 29 +++- .../experimental-ic-build.log | 20 ++- .../build.log | 33 ++-- .../experimental-ic-build.log | 24 ++- .../build.log | 41 +++-- .../experimental-ic-build.log | 32 ++-- .../conflictingPlatformDeclarations/build.log | 14 +- .../pureKotlin/constantRemoved/build.log | 14 +- .../pureKotlin/constantsUnchanged/build.log | 18 +- .../pureKotlin/defaultArguments/build.log | 14 +- .../build.log | 64 ++++--- .../build.log | 60 ++++--- .../dependencyClassReferenced/build.log | 14 +- .../fileWithConstantRemoved/build.log | 18 +- .../experimental-ic-build.log | 18 +- .../fileWithInlineFunctionRemoved/build.log | 18 +- .../experimental-ic-build.log | 18 +- .../filesExchangePackages/build.log | 26 ++- .../experimental-ic-build.log | 16 +- .../pureKotlin/funRedeclaration/build.log | 12 +- .../build.log | 12 +- .../pureKotlin/functionBecameInline/build.log | 20 ++- .../experimental-ic-build.log | 20 ++- .../pureKotlin/independentClasses/build.log | 10 +- .../inlinFunctionUsageAdded/build.log | 12 +- .../inlineFunctionRemoved/build.log | 14 +- .../build.log | 34 ++-- .../inlineFunctionsUnchanged/build.log | 16 +- .../pureKotlin/inlineLinesChanged/build.log | 24 ++- .../inlineModifiedWithUsage/build.log | 18 +- .../inlineTwoFunctionsOneChanged/build.log | 24 ++- .../inlineUsedWhereDeclared/build.log | 35 ++-- .../pureKotlin/internalClassChanged/build.log | 18 +- .../experimental-ic-build.log | 10 +- .../internalMemberInClassChanged/build.log | 18 +- .../experimental-ic-build.log | 10 +- .../pureKotlin/localClassChanged/build.log | 16 +- .../pureKotlin/mainRedeclaration/build.log | 14 +- .../pureKotlin/moveClass/build.log | 17 +- .../multifileClassFileAdded/build.log | 20 ++- .../experimental-ic-build.log | 10 +- .../multifileClassFileChanged/build.log | 16 +- .../build.log | 26 ++- .../multifileClassInlineFunction/build.log | 14 +- .../build.log | 14 +- .../multifileClassRecreated/build.log | 21 ++- .../build.log | 33 ++-- .../experimental-ic-build.log | 22 ++- .../multifileClassRemoved/build.log | 16 +- .../multiplePackagesModified/build.log | 26 ++- .../experimental-ic-build.log | 12 +- .../objectConstantChanged/build.log | 22 ++- .../pureKotlin/optionalParameter/build.log | 14 +- .../pureKotlin/ourClassReferenced/build.log | 39 +++-- .../packageConstantChanged/build.log | 26 ++- .../pureKotlin/packageFileAdded/build.log | 18 +- .../experimental-ic-build.log | 8 +- .../packageFileChangedPackage/build.log | 22 ++- .../experimental-ic-build.log | 12 +- .../build.log | 41 +++-- .../experimental-ic-build.log | 22 ++- .../pureKotlin/packageFileRemoved/build.log | 53 +++--- .../experimental-ic-build.log | 22 ++- .../packageFilesChangedInTurn/build.log | 46 +++-- .../build.log | 14 +- .../build.log | 14 +- .../build.log | 26 ++- .../experimental-ic-build.log | 18 +- .../build.log | 20 ++- .../packagePrivateOnlyChanged/build.log | 14 +- .../pureKotlin/packageRecreated/build.log | 19 +- .../packageRecreatedAfterRenaming/build.log | 29 +++- .../experimental-ic-build.log | 20 ++- .../pureKotlin/packageRemoved/build.log | 14 +- .../privateConstantsChanged/build.log | 20 ++- .../pureKotlin/privateMethodAdded/build.log | 12 +- .../pureKotlin/privateMethodDeleted/build.log | 12 +- .../privateMethodSignatureChanged/build.log | 12 +- .../build.log | 12 +- .../build.log | 12 +- .../privateValAccessorChanged/build.log | 12 +- .../pureKotlin/privateValAdded/build.log | 12 +- .../pureKotlin/privateValDeleted/build.log | 12 +- .../privateValSignatureChanged/build.log | 12 +- .../pureKotlin/privateVarAdded/build.log | 12 +- .../pureKotlin/privateVarDeleted/build.log | 12 +- .../privateVarSignatureChanged/build.log | 12 +- .../propertyRedeclaration/build.log | 12 +- .../pureKotlin/returnTypeChanged/build.log | 22 ++- .../experimental-ic-build.log | 24 +++ .../simpleClassDependency/build.log | 12 +- .../soleFileChangesPackage/build.log | 14 +- .../pureKotlin/subpackage/build.log | 16 +- .../topLevelFunctionSameSignature/build.log | 14 +- .../topLevelMembersInTwoFiles/build.log | 14 +- .../topLevelPrivateValUsageAdded/build.log | 19 +- .../traitClassObjectConstantChanged/build.log | 26 ++- .../pureKotlin/valAddCustomAccessor/build.log | 18 +- .../experimental-ic-build.log | 23 +++ .../valRemoveCustomAccessor/build.log | 23 ++- .../javaToKotlin/build.log | 24 ++- .../javaToKotlinAndBack/build.log | 63 ++++--- .../javaToKotlinAndRemove/build.log | 17 +- .../kotlinToJava/build.log | 24 ++- .../kotlinToJava/experimental-ic-build.log | 29 ++++ .../changeNotUsedSignature/build.log | 8 +- .../changeSignature/build.log | 20 ++- .../constantChanged/build.log | 22 ++- .../constantUnchanged/build.log | 10 +- .../build.log | 18 +- .../methodAddedInSuper/build.log | 16 +- .../javaUsedInKotlin/methodRenamed/build.log | 24 ++- .../notChangeSignature/build.log | 8 +- .../samConversions/methodAdded/build.log | 28 +-- .../methodSignatureChanged/build.log | 30 ++-- .../addOptionalParameter/build.log | 26 ++- .../experimental-ic-build.log | 16 +- .../changeNotUsedSignature/build.log | 14 +- .../changeSignature/build.log | 18 +- .../constantChanged/build.log | 24 ++- .../constantUnchanged/build.log | 14 +- .../kotlinUsedInJava/funRenamed/build.log | 18 +- .../jvmFieldChanged/build.log | 24 ++- .../jvmFieldUnchanged/build.log | 14 +- .../methodAddedInSuper/build.log | 16 +- .../notChangeSignature/build.log | 14 +- .../build.log | 22 ++- .../experimental-ic-build.log | 12 +- .../packageFileAdded/build.log | 22 ++- .../experimental-ic-build.log | 12 +- .../kotlinUsedInJava/privateChanges/build.log | 12 +- .../propertyRenamed/build.log | 18 +- 286 files changed, 5556 insertions(+), 2354 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/BuildLogger.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingContext.kt create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/BuildLogger.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/BuildLogger.kt new file mode 100644 index 00000000000..6b93c151f52 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/BuildLogger.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.build + +import org.jetbrains.jps.incremental.ModuleLevelBuilder +import java.io.File + +interface BuildLogger { + fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) + fun markedAsDirty(files: Iterable) + + companion object { + val DO_NOTHING = object : BuildLogger { + override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) { + } + + override fun markedAsDirty(files: Iterable) { + } + } + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt index 64b06dd97d3..3e840ae2c98 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt @@ -32,6 +32,8 @@ class FSOperationsHelper( fun hasMarkedDirty(): Boolean = markedDirty + private val buildLogger = compileContext.testingContext?.buildLogger ?: BuildLogger.DO_NOTHING + fun markChunk(recursively: Boolean, kotlinOnly: Boolean, excludeFiles: Set = setOf()) { fun shouldMark(file: File): Boolean { if (kotlinOnly && !KotlinSourceFileCollector.isKotlinSourceFile(file)) return false @@ -53,7 +55,9 @@ class FSOperationsHelper( fun markFiles(files: Iterable, excludeFiles: Set = setOf()) { val filesToMark = files.toMutableSet() filesToMark.removeAll(excludeFiles) + log.debug("Mark dirty: $filesToMark") + buildLogger.markedAsDirty(filesToMark) for (file in filesToMark) { if (!file.exists()) continue diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e4f8db4a054..e03396e9357 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -34,8 +34,6 @@ import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.model.JpsProject -import org.jetbrains.jps.model.JpsSimpleElement -import org.jetbrains.jps.model.ex.JpsElementChildRoleBase import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule @@ -78,7 +76,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { companion object { @JvmField val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" - val LOOKUP_TRACKER: JpsElementChildRoleBase> = JpsElementChildRoleBase.create("lookup tracker") val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") } @@ -123,13 +120,19 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { applyActionsOnCacheVersionChange(actions, cacheVersionsProvider, context, dataManager, targets, fsOperations) } + + override fun chunkBuildFinished(context: CompileContext?, chunk: ModuleChunk?) { + super.chunkBuildFinished(context, chunk) + + LOG.debug("------------------------------------------") + } + override fun build( context: CompileContext, chunk: ModuleChunk, dirtyFilesHolder: DirtyFilesHolder, outputConsumer: ModuleLevelBuilder.OutputConsumer ): ModuleLevelBuilder.ExitCode { - LOG.debug("------------------------------------------") val messageCollector = MessageCollectorAdapter(context) val fsOperations = FSOperationsHelper(context, chunk, LOG) @@ -139,6 +142,11 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val actualExitCode = if (proposedExitCode == OK && fsOperations.hasMarkedDirty()) ADDITIONAL_PASS_REQUIRED else proposedExitCode LOG.info("Build result: " + actualExitCode) + + context.testingContext?.run { + buildLogger.buildFinished(actualExitCode) + } + return actualExitCode } catch (e: StopBuildException) { @@ -847,19 +855,11 @@ private fun withSubtypes( } private fun getLookupTracker(project: JpsProject): LookupTracker { - var lookupTracker = LookupTracker.DO_NOTHING + val testLookupTracker = project.testingContext?.lookupTracker ?: LookupTracker.DO_NOTHING - if ("true".equals(System.getProperty("kotlin.jps.tests"), ignoreCase = true)) { - val testTracker = project.container.getChild(KotlinBuilder.LOOKUP_TRACKER)?.data + if (IncrementalCompilation.isExperimental()) return LookupTrackerImpl(testLookupTracker) - if (testTracker != null) { - lookupTracker = testTracker - } - } - - if (IncrementalCompilation.isExperimental()) return LookupTrackerImpl(lookupTracker) - - return lookupTracker + return testLookupTracker } private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): Map { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingContext.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingContext.kt new file mode 100644 index 00000000000..3f735bdf2c6 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingContext.kt @@ -0,0 +1,44 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.build + +import org.jetbrains.annotations.TestOnly +import org.jetbrains.jps.incremental.CompileContext +import org.jetbrains.jps.model.JpsElementFactory +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jps.model.JpsSimpleElement +import org.jetbrains.jps.model.ex.JpsElementChildRoleBase +import org.jetbrains.kotlin.incremental.components.LookupTracker + +private val TESTING_CONTEXT = JpsElementChildRoleBase.create>("Testing context") + +@TestOnly +fun JpsProject.setTestingContext(context: TestingContext) { + val dataContainer = JpsElementFactory.getInstance().createSimpleElement(context) + container.setChild(TESTING_CONTEXT, dataContainer) +} + +val JpsProject.testingContext: TestingContext? + get() = container.getChild(TESTING_CONTEXT)?.data + +val CompileContext.testingContext: TestingContext? + get() = projectDescriptor?.project?.testingContext + +class TestingContext( + val lookupTracker: LookupTracker, + val buildLogger: BuildLogger +) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 744871793e7..1e27566a945 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -37,8 +37,8 @@ import org.jetbrains.jps.cmdline.ProjectDescriptor import org.jetbrains.jps.incremental.BuilderRegistry import org.jetbrains.jps.incremental.IncProjectBuilder import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.jps.incremental.ModuleLevelBuilder import org.jetbrains.jps.incremental.messages.BuildMessage -import org.jetbrains.jps.model.JpsElementFactory import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService @@ -151,8 +151,7 @@ abstract class AbstractIncrementalJpsTest( projectDescriptor = createProjectDescriptor(BuildLoggingManager(logger)) val lookupTracker = createLookupTracker() - val dataContainer = JpsElementFactory.getInstance().createSimpleElement(lookupTracker) - projectDescriptor.project.container.setChild(KotlinBuilder.LOOKUP_TRACKER, dataContainer) + projectDescriptor.project.setTestingContext(TestingContext(lookupTracker, logger)) try { val builder = IncProjectBuilder(projectDescriptor, BuilderRegistry.getInstance(), myBuildParams, CanceledStatus.NULL, mockConstantSearch, true) @@ -323,13 +322,11 @@ abstract class AbstractIncrementalJpsTest( return result } - protected fun createDefaultBuildLog(incrementalMakeResults: List): String = - incrementalMakeResults.joinToString("\n\n") { it.log } - - protected open fun createExperimentalBuildLog(incrementalMakeResults: List): String = + protected open fun createBuildLog(incrementalMakeResults: List): String = buildString { incrementalMakeResults.forEachIndexed { i, makeResult -> - append("\n========== Step #${i + 1} ============\n\n") + if (i > 0) append("\n") + append("================ Step #${i + 1} =================\n\n") append(makeResult.log) } } @@ -346,12 +343,12 @@ abstract class AbstractIncrementalJpsTest( val buildLogFile = File(testDataDir, BUILD_LOG_FILE_NAME) val experimentalBuildLog = File(testDataDir, experimentalBuildLogFileName) + val logs = createBuildLog(otherMakeResults) + if (enableExperimentalIncrementalCompilation && experimentalBuildLog.exists()) { - val logs = createExperimentalBuildLog(otherMakeResults) UsefulTestCase.assertSameLinesWithFile(experimentalBuildLog.absolutePath, logs) } else if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) { - val logs = createDefaultBuildLog(otherMakeResults) UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs) } @@ -509,8 +506,28 @@ abstract class AbstractIncrementalJpsTest( override fun doGetProjectDir(): File? = workDir - // TODO replace with org.jetbrains.jps.builders.TestProjectBuilderLogger - private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase() { + private class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase(), BuildLogger { + + private val dirtyFiles = ArrayList() + + override fun markedAsDirty(files: Iterable) { + dirtyFiles.addAll(files) + } + + override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) { + + if (dirtyFiles.isNotEmpty()) { + logLine("Marked as dirty by Kotlin:") + dirtyFiles + .map { FileUtil.toSystemIndependentName(it.path) } + .sorted() + .forEach { logLine(it) } + dirtyFiles.clear() + } + logLine("Exit code: $exitCode") + logLine("------------------------------------------") + } + private val logBuf = StringBuilder() val log: String get() = logBuf.toString() @@ -528,7 +545,7 @@ abstract class AbstractIncrementalJpsTest( } override fun logLine(message: String?) { - logBuf.append(KotlinTestUtils.replaceHashWithStar(message!!.removePrefix("$rootPath/"))).append('\n') + logBuf.append(KotlinTestUtils.replaceHashWithStar(message!!.replace("^$rootPath/".toRegex(), " "))).append('\n') } } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 66ec7f7d1b2..8dae89c9540 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -42,9 +42,6 @@ abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : Abstract abstract class AbstractDataContainerVersionChangedTest : AbstractExperimentalIncrementalCacheVersionChangedTest() { override val experimentalBuildLogFileName = "data-container-version-build.log" - override fun createExperimentalBuildLog(incrementalMakeResults: List) = - createDefaultBuildLog(incrementalMakeResults) - override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = listOf(cacheVersionProvider.dataContainerVersion()) -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log index 5fdce9ad8e7..4b2ab8d5d6a 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -1,20 +1,39 @@ -Cleaning output files: -out/production/module1/C.class -End of files -Compiling files: -module1/src/module1_C.java -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module1/A.class + out/production/module1/C.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -module1/src/module1_A.kt + module1/src/module1_C.java End of files +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + Cleaning output files: -out/production/module1/B.class + out/production/module1/A.class End of files Compiling files: -module1/src/module1_B.kt -End of files \ No newline at end of file + module1/src/module1_A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module1/B.class +End of files +Compiling files: + module1/src/module1_B.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log index f3a965ea35b..d02fea7e638 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log @@ -1,24 +1,34 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/a/A.class + out/production/module1/a/A.class End of files Compiling files: -module1/src/module1_A.kt + module1/src/module1_A.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/b/B.class + out/production/module2/b/B.class End of files Compiling files: -module2/src/module2_B.kt + module2/src/module2_B.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module3/c/C.class + out/production/module3/c/C.class End of files Compiling files: -module3/src/module3_C.kt + module3/src/module3_C.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module4/D/D.class + out/production/module4/D/D.class End of files Compiling files: -module4/src/module4_D.kt -End of files \ No newline at end of file + module4/src/module4_D.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log new file mode 100644 index 00000000000..1a8d7b0695f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log @@ -0,0 +1,39 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/a/A.class +End of files +Compiling files: + module1/src/module1_A.kt +End of files +Marked as dirty by Kotlin: + module1/src/module1_A.kt + module2/src/module2_B.kt + module3/src/module3_C.kt + module4/src/module4_D.kt +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/b/B.class +End of files +Compiling files: + module2/src/module2_B.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module3/c/C.class +End of files +Compiling files: + module3/src/module3_C.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module4/D/D.class +End of files +Compiling files: + module4/src/module4_D.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log index fcbc03b2b32..b7b0767477c 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log @@ -1,14 +1,29 @@ -Cleaning output files: -out/production/module1/A.class -End of files -Compiling files: -module1/src/module1_A.java -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module1/B.class + out/production/module1/A.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -module1/src/module1_B.java -End of files \ No newline at end of file + module1/src/module1_A.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module1/B.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + module1/src/module1_B.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index ae0d40bb5e6..2894338355f 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -1,28 +1,40 @@ +================ Step #1 ================= + +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module4/module4/D.class + out/production/module4/module4/D.class End of files Compiling files: -module4/src/module4_d.kt + module4/src/module4_d.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/module1/A.class + out/production/module1/module1/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/module2/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/module2/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3_cKt.class + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/module3/Module3_cKt.class End of files Compiling files: -module3/src/module3_c.kt -End of files \ No newline at end of file + module3/src/module3_c.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log new file mode 100644 index 00000000000..2b342e3b58b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -0,0 +1,45 @@ +================ Step #1 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/module4_d.kt +End of files +Marked as dirty by Kotlin: + module1/src/module1_a.kt + module2/src/module2_b.kt + module3/src/module3_c.kt + module4/src/module4_d.kt +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/module1/A.class + out/production/module1/module1/Module1_aKt.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/module2/Module2_bKt.class +End of files +Compiling files: + module2/src/module2_b.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/module3/Module3_cKt.class +End of files +Compiling files: + module3/src/module3_c.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log index c1dd95e8e3a..9365c3e7817 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log @@ -1,15 +1,21 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/module1/A.class + out/production/module1/module1/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/module2/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/module2/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt -End of files \ No newline at end of file + module2/src/module2_b.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log new file mode 100644 index 00000000000..da85b77b110 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/module1/A.class + out/production/module1/module1/Module1_aKt.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module1/src/module1_a.kt + module2/src/module2_b.kt +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/module2/Module2_bKt.class +End of files +Compiling files: + module2/src/module2_b.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index d9e25129990..840832f2d80 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -1,13 +1,19 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/Module1_AKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_AKt.class End of files Compiling files: -module1/src/module1_A.kt + module1/src/module1_A.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/b/B.class + out/production/module2/b/B.class End of files Compiling files: -module2/src/module2_B.kt -End of files \ No newline at end of file + module2/src/module2_B.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log new file mode 100644 index 00000000000..e91ca18b7e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_AKt.class +End of files +Compiling files: + module1/src/module1_A.kt +End of files +Marked as dirty by Kotlin: + module1/src/module1_A.kt + module2/src/module2_B.kt +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/b/B.class +End of files +Compiling files: + module2/src/module2_B.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index 2883783148a..b09b8be9b22 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -1,14 +1,20 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/Module1_AKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_AKt.class End of files Compiling files: -module1/src/module1_A.kt + module1/src/module1_A.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/b/B.class + out/production/module2/b/B.class End of files Compiling files: -module2/src/module2_B.kt -End of files \ No newline at end of file + module2/src/module2_B.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log new file mode 100644 index 00000000000..0fc485c9e08 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_AKt.class +End of files +Compiling files: + module1/src/module1_A.kt +End of files +Marked as dirty by Kotlin: + module1/src/module1_A.kt + module2/src/module2_B.kt +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/b/B.class +End of files +Compiling files: + module2/src/module2_B.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log index 241969e6b52..a16e3571f3f 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log @@ -1,11 +1,15 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/other/OtherKt.class -out/production/module/test/AKt.class -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/AKt.class + out/production/module/test/BKt.class End of files Compiling files: -src/a.kt -src/b.kt -src/other.kt -End of files \ No newline at end of file + src/a.kt + src/b.kt + src/other.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log new file mode 100644 index 00000000000..0fcf8fc80ca --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log @@ -0,0 +1,19 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/AKt.class + out/production/module/test/BKt.class +End of files +Compiling files: + src/a.kt + src/b.kt + src/other.kt +End of files +Marked as dirty by Kotlin: + src/a.kt + src/b.kt + src/other.kt +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log index 4c18d5c71da..b5344359ac6 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log @@ -1,15 +1,19 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class -out/production/module/META-INF/module.kotlin_module -out/production/module/other/OtherKt.class -out/production/module/test/AKt.class -out/production/module/test/BKt.class + out/production/module/A.class + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/AKt.class + out/production/module/test/BKt.class End of files Compiling files: -src/a.kt -src/b.kt -src/other.kt + src/a.kt + src/b.kt + src/other.kt End of files +Exit code: OK +------------------------------------------ Compiling files: -src/A.java -End of files \ No newline at end of file + src/A.java +End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log new file mode 100644 index 00000000000..cac3f45aa51 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/A.class + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/AKt.class + out/production/module/test/BKt.class +End of files +Compiling files: + src/a.kt + src/b.kt + src/other.kt +End of files +Marked as dirty by Kotlin: + src/a.kt + src/b.kt + src/other.kt +Exit code: OK +------------------------------------------ +Compiling files: + src/A.java +End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log index 47ee1d1126c..63704f89c81 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log @@ -1,9 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class + out/production/module/test/BKt.class End of files Compiling files: -src/a.kt -src/b.kt -End of files \ No newline at end of file + src/a.kt + src/b.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log new file mode 100644 index 00000000000..bc8ec716cf9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log @@ -0,0 +1,16 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class + out/production/module/test/BKt.class +End of files +Compiling files: + src/a.kt + src/b.kt +End of files +Marked as dirty by Kotlin: + src/a.kt + src/b.kt +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log index e066711ad3f..a6ea3e076ec 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -1,38 +1,57 @@ +================ Step #1 ================= + +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module4/module4/D.class + out/production/module4/module4/D.class End of files Compiling files: -module4/src/module4_d.kt + module4/src/module4_d.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/module1/A.class -out/production/module1/module1/Module1_aKt.class -out/production/module1/module1/Module1_fKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/module1/A.class + out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/Module1_fKt.class End of files Compiling files: -module1/src/module1_a.kt -module1/src/module1_f.kt + module1/src/module1_a.kt + module1/src/module1_f.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Name expected +================ Step #2 ================= +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -module1/src/module1_a.kt -module1/src/module1_f.kt + module1/src/module1_a.kt + module1/src/module1_f.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/module2/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/module2/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/module3/Module3_cKt.class + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/module3/Module3_cKt.class End of files Compiling files: -module3/src/module3_c.kt -End of files \ No newline at end of file + module3/src/module3_c.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log new file mode 100644 index 00000000000..1a89d780789 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log @@ -0,0 +1,63 @@ +================ Step #1 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/module4_d.kt +End of files +Marked as dirty by Kotlin: + module1/src/module1_a.kt + module1/src/module1_f.kt + module2/src/module2_b.kt + module3/src/module3_c.kt + module4/src/module4_d.kt +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/module1/A.class + out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/Module1_fKt.class +End of files +Compiling files: + module1/src/module1_a.kt + module1/src/module1_f.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Name expected + +================ Step #2 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + module1/src/module1_a.kt + module1/src/module1_f.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/module2/Module2_bKt.class +End of files +Compiling files: + module2/src/module2_b.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/module3/Module3_cKt.class +End of files +Compiling files: + module3/src/module3_c.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log index bf5b1f99921..91109342f98 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log @@ -1,42 +1,70 @@ -Cleaning output files: -out/production/module1/foo/Z.class -End of files -Compiling files: -module1/src/module1_z.kt -End of files -Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/A.class -out/production/module2/foo/B.class -out/production/module2/foo/C.class -out/production/module2/foo/Module2_aKt.class -out/production/module2/foo/Module2_bKt.class -out/production/module2/foo/Module2_cKt.class -End of files -Compiling files: -module2/src/module2_a.kt -module2/src/module2_b.kt -module2/src/module2_c.kt -End of files -Cleaning output files: -out/production/module3/foo/D.class -End of files -Compiling files: -module3/src/module3_d.kt -End of files -Cleaning output files: -out/production/module4/foo/E.class -End of files -Compiling files: -module4/src/module4_e.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/A.class -out/production/module2/foo/Module2_aKt.class + out/production/module1/foo/Z.class End of files Compiling files: -module2/src/module2_a.kt + module1/src/module1_z.kt End of files +Marked as dirty by Kotlin: + module1/src/module1_z.kt + module2/src/module2_a.kt + module2/src/module2_b.kt + module2/src/module2_c.kt + module3/src/module3_d.kt + module4/src/module4_e.kt +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/A.class + out/production/module2/foo/B.class + out/production/module2/foo/C.class + out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/Module2_bKt.class + out/production/module2/foo/Module2_cKt.class +End of files +Compiling files: + module2/src/module2_a.kt + module2/src/module2_b.kt + module2/src/module2_c.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module3/foo/D.class +End of files +Compiling files: + module3/src/module3_d.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module4/foo/E.class +End of files +Compiling files: + module4/src/module4_e.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/A.class + out/production/module2/foo/Module2_aKt.class +End of files +Compiling files: + module2/src/module2_a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log index b81d72e61ad..0f54ba72254 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log @@ -1,25 +1,37 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module1/src/module1_a.kt + module2/src/module2_c.kt + module3/src/module3_d.kt +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/B.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/Module2_cKt.class +End of files +Compiling files: + module2/src/module2_c.kt +End of files +Exit code: OK +------------------------------------------ +Compiling files: + module2/src/module2_B.java End of files Cleaning output files: -out/production/module2/B.class -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/Module2_cKt.class + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/Module3_dKt.class End of files Compiling files: -module2/src/module2_c.kt + module3/src/module3_d.kt End of files -Compiling files: -module2/src/module2_B.java -End of files -Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/Module3_dKt.class -End of files -Compiling files: -module3/src/module3_d.kt -End of files \ No newline at end of file +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log index b97f58152ee..4199fbdec4e 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaOnly/build.log @@ -1,6 +1,10 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/A.java + src/A.java End of files diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log index 6aa1259a392..4f43272ffea 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log @@ -1,63 +1,104 @@ -Cleaning output files: -out/production/module1/foo/Z.class -End of files -Compiling files: -module1/src/module1_z.kt -End of files -Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/A.class -out/production/module2/foo/B.class -out/production/module2/foo/C.class -out/production/module2/foo/Module2_aKt.class -out/production/module2/foo/Module2_bKt.class -out/production/module2/foo/Module2_cKt.class -End of files -Compiling files: -module2/src/module2_a.kt -module2/src/module2_b.kt -module2/src/module2_c.kt -End of files -Cleaning output files: -out/production/module3/foo/D.class -End of files -Compiling files: -module3/src/module3_d.kt -End of files -Cleaning output files: -out/production/module4/foo/E.class -End of files -Compiling files: -module4/src/module4_e.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/A.class -out/production/module2/foo/Module2_aKt.class + out/production/module1/foo/Z.class End of files Compiling files: -module2/src/module2_a.kt + module1/src/module1_z.kt End of files - - +Marked as dirty by Kotlin: + module1/src/module1_z.kt + module2/src/module2_a.kt + module2/src/module2_b.kt + module2/src/module2_c.kt + module3/src/module3_d.kt + module4/src/module4_e.kt +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/A.class -out/production/module2/foo/Module2_aKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/A.class + out/production/module2/foo/B.class + out/production/module2/foo/C.class + out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/Module2_bKt.class + out/production/module2/foo/Module2_cKt.class End of files Compiling files: -module2/src/module2_a.kt + module2/src/module2_a.kt + module2/src/module2_b.kt + module2/src/module2_c.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/B.class -out/production/module2/foo/C.class -out/production/module2/foo/Module2_bKt.class -out/production/module2/foo/Module2_cKt.class + out/production/module3/foo/D.class End of files Compiling files: -module2/src/module2_b.kt -module2/src/module2_c.kt -End of files \ No newline at end of file + module3/src/module3_d.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module4/foo/E.class +End of files +Compiling files: + module4/src/module4_e.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/A.class + out/production/module2/foo/Module2_aKt.class +End of files +Compiling files: + module2/src/module2_a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #3 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/A.class + out/production/module2/foo/Module2_aKt.class +End of files +Compiling files: + module2/src/module2_a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/B.class + out/production/module2/foo/C.class + out/production/module2/foo/Module2_bKt.class + out/production/module2/foo/Module2_cKt.class +End of files +Compiling files: + module2/src/module2_b.kt + module2/src/module2_c.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log index 541295aab83..551992f4603 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log @@ -1,20 +1,39 @@ +================ Step #1 ================= + +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/Module2_aKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_aKt.class End of files Compiling files: -module2/src/module2_a.kt -module2/src/module2_b.kt -module2/src/module2_c.kt + module2/src/module2_a.kt + module2/src/module2_b.kt + module2/src/module2_c.kt End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/Module2_aKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_aKt.class End of files Compiling files: -module2/src/module2_a.kt -module2/src/module2_b.kt -module2/src/module2_c.kt -End of files \ No newline at end of file + module2/src/module2_a.kt + module2/src/module2_b.kt + module2/src/module2_c.kt +End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index d9957c7d841..433cdf6c074 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -1,56 +1,90 @@ +================ Step #1 ================= + +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/Module2_aKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_aKt.class End of files Compiling files: -module2/src/module2_a.kt -module2/src/module2_b.kt -module2/src/module2_c.kt + module2/src/module2_a.kt + module2/src/module2_b.kt + module2/src/module2_c.kt End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= Cleaning output files: -out/production/module1/foo/Z.class + out/production/module1/foo/Z.class End of files Compiling files: -module1/src/module1_z.kt + module1/src/module1_z.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/Module2_aKt.class -out/production/module2/foo/Module2_bKt.class -out/production/module2/foo/Module2_cKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/Module2_bKt.class + out/production/module2/foo/Module2_cKt.class End of files Compiling files: -module2/src/module2_a.kt -module2/src/module2_b.kt -module2/src/module2_c.kt + module2/src/module2_a.kt + module2/src/module2_b.kt + module2/src/module2_c.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module3/foo/D.class + out/production/module3/foo/D.class End of files Compiling files: -module3/src/module3_d.kt + module3/src/module3_d.kt End of files +Exit code: OK +------------------------------------------ Cleaning output files: -out/production/module4/foo/E.class + out/production/module4/foo/E.class End of files Compiling files: -module4/src/module4_e.kt + module4/src/module4_e.kt End of files +Exit code: OK +------------------------------------------ +================ Step #3 ================= +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/Module2_aKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_aKt.class End of files Compiling files: -module2/src/module2_a.kt + module2/src/module2_a.kt End of files +Marked as dirty by Kotlin: + module2/src/module2_b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/foo/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt -End of files \ No newline at end of file + module2/src/module2_b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log index f72a87fbfa2..e2668c90752 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log @@ -1,32 +1,47 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Ann1.class + out/production/module/Ann1.class End of files Compiling files: -src/Ann1.kt + src/Ann1.kt End of files +Marked as dirty by Kotlin: + src/UseAnn1Class.kt + src/useAnn1Fun.kt + src/useAnn1Val.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UseAnn1.class -out/production/module/UseAnn1FunKt.class -out/production/module/UseAnn1ValKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseAnn1.class + out/production/module/UseAnn1FunKt.class + out/production/module/UseAnn1ValKt.class End of files Compiling files: -src/UseAnn1Class.kt -src/useAnn1Fun.kt -src/useAnn1Val.kt + src/UseAnn1Class.kt + src/useAnn1Fun.kt + src/useAnn1Val.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED 'Ann1' is not an annotation class 'Ann1' is not an annotation class 'Ann1' is not an annotation class +================ Step #2 ================= Cleaning output files: -out/production/module/Ann1.class + out/production/module/Ann1.class End of files Compiling files: -src/Ann1.kt -src/UseAnn1Class.kt -src/useAnn1Fun.kt -src/useAnn1Val.kt -End of files \ No newline at end of file + src/Ann1.kt + src/UseAnn1Class.kt + src/useAnn1Fun.kt + src/useAnn1Val.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log index fa8b4a82368..09d2eba3775 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log @@ -1,69 +1,110 @@ -Cleaning output files: -out/production/module/foo/A.class -End of files -Compiling files: -src/A.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/ImportStarKt.class -out/production/module/bar/ReferencedByFqNameKt.class -out/production/module/foo/AChild.class -out/production/module/foo/AGrandChild.class -out/production/module/foo/ATypeParameter.class -out/production/module/foo/ClassLiteralKt.class -out/production/module/foo/FunctionParameterKt.class -out/production/module/foo/GetAKt.class -out/production/module/foo/ReturnTypeImplicitKt.class -out/production/module/foo/ReturnTypeKt.class -End of files -Compiling files: -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/foo/A.class -out/production/module/foo/Ann.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/ImportStarKt.class -out/production/module/bar/ReferencedByFqNameKt.class -out/production/module/foo/AChild.class -out/production/module/foo/AGrandChild.class -out/production/module/foo/ATypeParameter.class -out/production/module/foo/ClassLiteralKt.class -out/production/module/foo/FunctionParameterKt.class -out/production/module/foo/GetAKt.class -out/production/module/foo/ReturnTypeImplicitKt.class -out/production/module/foo/ReturnTypeKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/ImportStarKt.class + out/production/module/bar/ReferencedByFqNameKt.class + out/production/module/foo/AChild.class + out/production/module/foo/AGrandChild.class + out/production/module/foo/ATypeParameter.class + out/production/module/foo/ClassLiteralKt.class + out/production/module/foo/FunctionParameterKt.class + out/production/module/foo/GetAKt.class + out/production/module/foo/ReturnTypeImplicitKt.class + out/production/module/foo/ReturnTypeKt.class End of files Compiling files: -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt -End of files \ No newline at end of file + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class + out/production/module/foo/Ann.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/ImportStarKt.class + out/production/module/bar/ReferencedByFqNameKt.class + out/production/module/foo/AChild.class + out/production/module/foo/AGrandChild.class + out/production/module/foo/ATypeParameter.class + out/production/module/foo/ClassLiteralKt.class + out/production/module/foo/FunctionParameterKt.class + out/production/module/foo/GetAKt.class + out/production/module/foo/ReturnTypeImplicitKt.class + out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log index 48f4127779c..4e76ee1ee21 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/AChild.class + out/production/module/foo/AChild.class End of files Compiling files: -src/AChild.kt + src/AChild.kt End of files +Marked as dirty by Kotlin: + src/useAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/UseAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/UseAChildKt.class End of files Compiling files: -src/useAChild.kt -End of files \ No newline at end of file + src/useAChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log index 25fd00fe12e..9391232af5c 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log @@ -1,55 +1,79 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/ImportStarKt.class -out/production/module/bar/ReferencedByFqNameKt.class -out/production/module/foo/AChild.class -out/production/module/foo/AGrandChild.class -out/production/module/foo/ATypeParameter.class -out/production/module/foo/ClassLiteralKt.class -out/production/module/foo/FunctionParameterKt.class -out/production/module/foo/GetAKt.class -out/production/module/foo/ReturnTypeImplicitKt.class -out/production/module/foo/ReturnTypeKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/ImportStarKt.class + out/production/module/bar/ReferencedByFqNameKt.class + out/production/module/foo/AChild.class + out/production/module/foo/AGrandChild.class + out/production/module/foo/ATypeParameter.class + out/production/module/foo/ClassLiteralKt.class + out/production/module/foo/FunctionParameterKt.class + out/production/module/foo/GetAKt.class + out/production/module/foo/ReturnTypeImplicitKt.class + out/production/module/foo/ReturnTypeKt.class End of files Compiling files: -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED This type is final, so it cannot be inherited from +================ Step #2 ================= Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt -End of files \ No newline at end of file + src/A.kt + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log index 7fef745d9de..a25bda3a216 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log @@ -1,36 +1,55 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/ImportStarKt.class -out/production/module/bar/ReferencedByFqNameKt.class -out/production/module/foo/AChild.class -out/production/module/foo/AGrandChild.class -out/production/module/foo/ATypeParameter.class -out/production/module/foo/ClassLiteralKt.class -out/production/module/foo/FunctionParameterKt.class -out/production/module/foo/GetAKt.class -out/production/module/foo/ReturnTypeImplicitKt.class -out/production/module/foo/ReturnTypeKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/ImportStarKt.class + out/production/module/bar/ReferencedByFqNameKt.class + out/production/module/foo/AChild.class + out/production/module/foo/AGrandChild.class + out/production/module/foo/ATypeParameter.class + out/production/module/foo/ClassLiteralKt.class + out/production/module/foo/FunctionParameterKt.class + out/production/module/foo/GetAKt.class + out/production/module/foo/ReturnTypeImplicitKt.class + out/production/module/foo/ReturnTypeKt.class End of files Compiling files: -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED This class does not have a constructor Unresolved reference: A @@ -38,23 +57,28 @@ Unresolved reference: A Unresolved reference: A Unresolved reference: A +================ Step #2 ================= Cleaning output files: -out/production/module/foo/A$DefaultImpls.class -out/production/module/foo/A.class + out/production/module/foo/A$DefaultImpls.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt -End of files \ No newline at end of file + src/A.kt + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log index e6ef1c22e73..9f7a1fba93d 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -1,36 +1,55 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/ImportStarKt.class -out/production/module/bar/ReferencedByFqNameKt.class -out/production/module/foo/AChild.class -out/production/module/foo/AGrandChild.class -out/production/module/foo/ATypeParameter.class -out/production/module/foo/ClassLiteralKt.class -out/production/module/foo/FunctionParameterKt.class -out/production/module/foo/GetAKt.class -out/production/module/foo/ReturnTypeImplicitKt.class -out/production/module/foo/ReturnTypeKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/ImportStarKt.class + out/production/module/bar/ReferencedByFqNameKt.class + out/production/module/foo/AChild.class + out/production/module/foo/AGrandChild.class + out/production/module/foo/ATypeParameter.class + out/production/module/foo/ClassLiteralKt.class + out/production/module/foo/FunctionParameterKt.class + out/production/module/foo/GetAKt.class + out/production/module/foo/ReturnTypeImplicitKt.class + out/production/module/foo/ReturnTypeKt.class End of files Compiling files: -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot access 'A': it is 'private' in file Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' @@ -50,22 +69,27 @@ Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' +================ Step #2 ================= Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt -End of files \ No newline at end of file + src/A.kt + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log index 11859745d3f..a44d8a257f7 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log @@ -1,53 +1,72 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A$Companion.class -out/production/module/A.class + out/production/module/A$Companion.class + out/production/module/A.class End of files Compiling files: -src/APartF.kt -src/APartG.kt + src/APartF.kt + src/APartG.kt End of files +Marked as dirty by Kotlin: + src/useF.kt + src/useG.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/AChild.class -out/production/module/GetAKt.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UseFKt.class -out/production/module/UseGKt.class -out/production/module/UseHKt.class + out/production/module/AChild.class + out/production/module/GetAKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseFKt.class + out/production/module/UseGKt.class + out/production/module/UseHKt.class End of files Compiling files: -src/AChild.kt -src/getA.kt -src/useF.kt -src/useG.kt -src/useH.kt + src/AChild.kt + src/getA.kt + src/useF.kt + src/useG.kt + src/useH.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: A Unresolved reference: A Unresolved reference: A Unresolved reference: A +================ Step #2 ================= Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Cleaning output files: -out/production/module/A__APartFKt.class -out/production/module/A__APartGKt.class + out/production/module/A__APartFKt.class + out/production/module/A__APartGKt.class End of files Compiling files: -src/AChild.kt -src/APartF.kt -src/APartG.kt -src/useF.kt -src/useG.kt + src/AChild.kt + src/APartF.kt + src/APartG.kt + src/useF.kt + src/useG.kt End of files +Marked as dirty by Kotlin: + src/getAChild.kt + src/useJ.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/GetAChildKt.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UseJKt.class + out/production/module/GetAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseJKt.class End of files Compiling files: -src/getAChild.kt -src/useJ.kt -End of files \ No newline at end of file + src/getAChild.kt + src/useJ.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log index 6fdf4fc4dbc..d9f69df7d35 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log @@ -1,40 +1,57 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt + src/B.kt End of files +Marked as dirty by Kotlin: + src/A.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt + src/importedMember.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/A$AA.class -out/production/module/A.class -out/production/module/CompanionExtensionKt.class -out/production/module/CompanionReferenceExplicitKt.class -out/production/module/CompanionReferenceImplicitKt.class -out/production/module/ImportedMemberKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/A$AA.class + out/production/module/A.class + out/production/module/CompanionExtensionKt.class + out/production/module/CompanionReferenceExplicitKt.class + out/production/module/CompanionReferenceImplicitKt.class + out/production/module/ImportedMemberKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/A.kt -src/companionExtension.kt -src/companionReferenceExplicit.kt -src/companionReferenceImplicit.kt -src/importedMember.kt + src/A.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt + src/importedMember.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +================ Step #2 ================= Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/A.kt -src/B.kt -src/companionExtension.kt -src/companionReferenceExplicit.kt -src/companionReferenceImplicit.kt -src/importedMember.kt -End of files \ No newline at end of file + src/A.kt + src/B.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt + src/importedMember.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log index 7c6f3bca8d8..f2469043cb1 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log @@ -1,38 +1,54 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A$AA.class -out/production/module/A.class + out/production/module/A$AA.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt + src/importedMember.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/CompanionExtensionKt.class -out/production/module/CompanionReferenceExplicitKt.class -out/production/module/CompanionReferenceImplicitKt.class -out/production/module/ImportedMemberKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/CompanionExtensionKt.class + out/production/module/CompanionReferenceExplicitKt.class + out/production/module/CompanionReferenceImplicitKt.class + out/production/module/ImportedMemberKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/companionExtension.kt -src/companionReferenceExplicit.kt -src/companionReferenceImplicit.kt -src/importedMember.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt + src/importedMember.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +================ Step #2 ================= Cleaning output files: -out/production/module/A$AA.class -out/production/module/A.class + out/production/module/A$AA.class + out/production/module/A.class End of files Compiling files: -src/A.kt -src/companionExtension.kt -src/companionReferenceExplicit.kt -src/companionReferenceImplicit.kt -src/importedMember.kt -End of files \ No newline at end of file + src/A.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt + src/importedMember.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log index 1787756a360..9c7ada70a86 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log @@ -1,33 +1,48 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A$Companion.class -out/production/module/A.class + out/production/module/A$Companion.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/CompanionExtensionKt.class -out/production/module/CompanionReferenceExplicitKt.class -out/production/module/CompanionReferenceImplicitKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/CompanionExtensionKt.class + out/production/module/CompanionReferenceExplicitKt.class + out/production/module/CompanionReferenceImplicitKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/companionExtension.kt -src/companionReferenceExplicit.kt -src/companionReferenceImplicit.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: Companion Unresolved reference: Companion +================ Step #2 ================= Cleaning output files: -out/production/module/A$AA.class -out/production/module/A.class + out/production/module/A$AA.class + out/production/module/A.class End of files Compiling files: -src/A.kt -src/companionExtension.kt -src/companionReferenceExplicit.kt -src/companionReferenceImplicit.kt -End of files \ No newline at end of file + src/A.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log index 2d1c1668c52..423183272e3 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log @@ -1,32 +1,46 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A$AA.class -out/production/module/A.class + out/production/module/A$AA.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/companionExtension.kt + src/companionReferenceExplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/CompanionExtensionKt.class -out/production/module/CompanionReferenceExplicitKt.class -out/production/module/CompanionReferenceImplicitKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/CompanionExtensionKt.class + out/production/module/CompanionReferenceExplicitKt.class + out/production/module/CompanionReferenceImplicitKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/companionExtension.kt -src/companionReferenceExplicit.kt -src/companionReferenceImplicit.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: x +================ Step #2 ================= Cleaning output files: -out/production/module/A$AA.class -out/production/module/A.class + out/production/module/A$AA.class + out/production/module/A.class End of files Compiling files: -src/A.kt -src/companionExtension.kt -src/companionReferenceExplicit.kt -src/companionReferenceImplicit.kt -End of files \ No newline at end of file + src/A.kt + src/companionExtension.kt + src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log index 7bd1b019759..91327dbb087 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log @@ -1,28 +1,42 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/createA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AChild.class -out/production/module/foo/CreateAKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AChild.class + out/production/module/foo/CreateAKt.class End of files Compiling files: -src/AChild.kt -src/createA.kt + src/AChild.kt + src/createA.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot access '': it is 'private' in 'A' Cannot access '': it is 'private' in 'A' +================ Step #2 ================= Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt -src/AChild.kt -src/createA.kt -End of files \ No newline at end of file + src/A.kt + src/AChild.kt + src/createA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log index 99ebd362fb5..2a0e33757db 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -1,30 +1,45 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Enum.class + out/production/module/Enum.class End of files Compiling files: -src/Enum.kt + src/Enum.kt End of files +Marked as dirty by Kotlin: + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/GetRandomEnumEntryKt.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UseEnumImplicitlyKt.class -out/production/module/UseKt.class + out/production/module/GetRandomEnumEntryKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseEnumImplicitlyKt.class + out/production/module/UseKt.class End of files Compiling files: -src/getRandomEnumEntry.kt -src/use.kt -src/useEnumImplicitly.kt + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED when expression must be exhaustive, add necessary 'C' branch or 'else' branch instead +================ Step #2 ================= Cleaning output files: -out/production/module/Enum.class + out/production/module/Enum.class End of files Compiling files: -src/Enum.kt -src/getRandomEnumEntry.kt -src/use.kt -src/useEnumImplicitly.kt -End of files \ No newline at end of file + src/Enum.kt + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log index 77c41dc180d..d78d7348f36 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log @@ -1,24 +1,37 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Enum.class + out/production/module/Enum.class End of files Compiling files: -src/Enum.kt + src/Enum.kt End of files +Marked as dirty by Kotlin: + src/useBecameNullable.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UseBecameNullableKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseBecameNullableKt.class End of files Compiling files: -src/useBecameNullable.kt + src/useBecameNullable.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +================ Step #2 ================= Cleaning output files: -out/production/module/Enum.class + out/production/module/Enum.class End of files Compiling files: -src/Enum.kt -src/useBecameNullable.kt -End of files \ No newline at end of file + src/Enum.kt + src/useBecameNullable.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log index 0fab1b73d54..92e70b17f06 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log @@ -1,20 +1,33 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class -out/production/module/foo/B.class + out/production/module/foo/A.class + out/production/module/foo/B.class End of files Compiling files: -src/A.kt -src/AParent.kt -src/B.kt + src/A.kt + src/AParent.kt + src/B.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/importA.kt + src/importAChild.kt + src/useB.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/UseBKt.class -out/production/module/foo/AChild.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/UseBKt.class + out/production/module/foo/AChild.class End of files Compiling files: -src/AChild.kt -src/importA.kt -src/importAChild.kt -src/useB.kt -End of files \ No newline at end of file + src/AChild.kt + src/importA.kt + src/importAChild.kt + src/useB.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index 75a4ae57b32..e8d2e5aae66 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -1,24 +1,36 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/B.kt + src/getA.kt + src/getB.kt + src/useA.kt + src/useB.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/B.class -out/production/module/GetAKt.class -out/production/module/GetBKt.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UseAKt.class -out/production/module/UseBKt.class + out/production/module/B.class + out/production/module/GetAKt.class + out/production/module/GetBKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseAKt.class + out/production/module/UseBKt.class End of files Compiling files: -src/B.kt -src/getA.kt -src/getB.kt -src/useA.kt -src/useB.kt + src/B.kt + src/getA.kt + src/getB.kt + src/useA.kt + src/useB.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot access 'A': it is 'private' in file Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' @@ -29,28 +41,36 @@ Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiv Cannot access 'x': it is 'invisible_fake' in 'B' Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +================ Step #2 ================= Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt -src/B.kt -src/getA.kt -src/getB.kt -src/useA.kt -src/useB.kt + src/A.kt + src/B.kt + src/getA.kt + src/getB.kt + src/useA.kt + src/useB.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +================ Step #3 ================= Compiling files: -src/A.kt -src/B.kt -src/getA.kt -src/getB.kt -src/useA.kt -src/useB.kt -End of files \ No newline at end of file + src/A.kt + src/B.kt + src/getA.kt + src/getB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log index d70203b60b6..6d19b918639 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log @@ -1,37 +1,54 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt + src/B.kt End of files +Marked as dirty by Kotlin: + src/C.kt + src/callUseAWithB.kt + src/callUseAWithC.kt + src/getB.kt + src/getC.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/C.class -out/production/module/CallUseAWithBKt.class -out/production/module/CallUseAWithCKt.class -out/production/module/GetBKt.class -out/production/module/GetCKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/C.class + out/production/module/CallUseAWithBKt.class + out/production/module/CallUseAWithCKt.class + out/production/module/GetBKt.class + out/production/module/GetCKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/C.kt -src/callUseAWithB.kt -src/callUseAWithC.kt -src/getB.kt -src/getC.kt + src/C.kt + src/callUseAWithB.kt + src/callUseAWithC.kt + src/getB.kt + src/getC.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Type mismatch: inferred type is B but A was expected Type mismatch: inferred type is C but A was expected +================ Step #2 ================= Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt -src/C.kt -src/callUseAWithB.kt -src/callUseAWithC.kt -src/getB.kt -src/getC.kt -End of files \ No newline at end of file + src/B.kt + src/C.kt + src/callUseAWithB.kt + src/callUseAWithC.kt + src/getB.kt + src/getC.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log index 86aedaab86f..ab98f3636ab 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log @@ -1,40 +1,57 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt + src/B.kt End of files +Marked as dirty by Kotlin: + src/C.kt + src/getListOfB.kt + src/getListOfC.kt + src/useListOfAWithListOfB.kt + src/useListOfAWithListOfC.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/C.class -out/production/module/GetListOfBKt.class -out/production/module/GetListOfCKt.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UseListOfAKt.class -out/production/module/UseListOfAWithListOfBKt.class -out/production/module/UseListOfAWithListOfCKt.class + out/production/module/C.class + out/production/module/GetListOfBKt.class + out/production/module/GetListOfCKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseListOfAKt.class + out/production/module/UseListOfAWithListOfBKt.class + out/production/module/UseListOfAWithListOfCKt.class End of files Compiling files: -src/C.kt -src/getListOfB.kt -src/getListOfC.kt -src/useListOfA.kt -src/useListOfAWithListOfB.kt -src/useListOfAWithListOfC.kt + src/C.kt + src/getListOfB.kt + src/getListOfC.kt + src/useListOfA.kt + src/useListOfAWithListOfB.kt + src/useListOfAWithListOfC.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected +================ Step #2 ================= Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt -src/C.kt -src/getListOfB.kt -src/getListOfC.kt -src/useListOfA.kt -src/useListOfAWithListOfB.kt -src/useListOfAWithListOfC.kt -End of files \ No newline at end of file + src/B.kt + src/C.kt + src/getListOfB.kt + src/getListOfC.kt + src/useListOfA.kt + src/useListOfAWithListOfB.kt + src/useListOfAWithListOfC.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log index fc7b9a6b3b0..ae6300b6b77 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log @@ -1,23 +1,38 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt + src/B.kt End of files +Marked as dirty by Kotlin: + src/C.kt + src/getB.kt + src/getBorC.kt + src/getBorD.kt + src/getC.kt + src/getCorD.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/C.class -out/production/module/GetBKt.class -out/production/module/GetBorCKt.class -out/production/module/GetBorDKt.class -out/production/module/GetCKt.class -out/production/module/GetCorDKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/C.class + out/production/module/GetBKt.class + out/production/module/GetBorCKt.class + out/production/module/GetBorDKt.class + out/production/module/GetCKt.class + out/production/module/GetCorDKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/C.kt -src/getB.kt -src/getBorC.kt -src/getBorD.kt -src/getC.kt -src/getCorD.kt + src/C.kt + src/getB.kt + src/getBorC.kt + src/getBorD.kt + src/getC.kt + src/getCorD.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log index ba820f85000..889c979f9de 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log @@ -1,15 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/useAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AChild.class -out/production/module/foo/UseAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AChild.class + out/production/module/foo/UseAChildKt.class End of files Compiling files: -src/AChild.kt -src/useAChild.kt + src/AChild.kt + src/useAChild.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log index 37a3baf1fcf..beed6e444e4 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log @@ -1,36 +1,52 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt + src/B.kt End of files +Marked as dirty by Kotlin: + src/consumeBExtLambda.kt + src/consumeBLambda.kt + src/useConsumeBExtLambda.kt + src/useConsumeBLambda.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/ConsumeBExtLambdaKt.class -out/production/module/ConsumeBLambdaKt.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UseConsumeBExtLambdaKt$useConsumeBExtLambda$1.class -out/production/module/UseConsumeBExtLambdaKt.class -out/production/module/UseConsumeBLambdaKt$useConsumeBLambda$1.class -out/production/module/UseConsumeBLambdaKt.class + out/production/module/ConsumeBExtLambdaKt.class + out/production/module/ConsumeBLambdaKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseConsumeBExtLambdaKt$useConsumeBExtLambda$1.class + out/production/module/UseConsumeBExtLambdaKt.class + out/production/module/UseConsumeBLambdaKt$useConsumeBLambda$1.class + out/production/module/UseConsumeBLambdaKt.class End of files Compiling files: -src/consumeBExtLambda.kt -src/consumeBLambda.kt -src/useConsumeBExtLambda.kt -src/useConsumeBLambda.kt + src/consumeBExtLambda.kt + src/consumeBLambda.kt + src/useConsumeBExtLambda.kt + src/useConsumeBLambda.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Type mismatch: inferred type is B but A was expected Type mismatch: inferred type is B but A was expected +================ Step #2 ================= Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt -src/consumeBExtLambda.kt -src/consumeBLambda.kt -src/useConsumeBExtLambda.kt -src/useConsumeBLambda.kt -End of files \ No newline at end of file + src/B.kt + src/consumeBExtLambda.kt + src/consumeBLambda.kt + src/useConsumeBExtLambda.kt + src/useConsumeBLambda.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log index b450c2880fc..889c979f9de 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log @@ -1,15 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/useAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AChild.class -out/production/module/foo/UseAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AChild.class + out/production/module/foo/UseAChildKt.class End of files Compiling files: -src/AChild.kt -src/useAChild.kt -End of files \ No newline at end of file + src/AChild.kt + src/useAChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log index b450c2880fc..889c979f9de 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log @@ -1,15 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/useAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AChild.class -out/production/module/foo/UseAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AChild.class + out/production/module/foo/UseAChildKt.class End of files Compiling files: -src/AChild.kt -src/useAChild.kt -End of files \ No newline at end of file + src/AChild.kt + src/useAChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log index 534d69f15e7..994c844f101 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log @@ -1,27 +1,41 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/useAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AChild.class -out/production/module/foo/UseAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AChild.class + out/production/module/foo/UseAChildKt.class End of files Compiling files: -src/AChild.kt -src/useAChild.kt + src/AChild.kt + src/useAChild.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Null can not be a value of a non-null type kotlin.Any +================ Step #2 ================= Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt -src/AChild.kt -src/useAChild.kt -End of files \ No newline at end of file + src/A.kt + src/AChild.kt + src/useAChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log index b450c2880fc..889c979f9de 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log @@ -1,15 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/useAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AChild.class -out/production/module/foo/UseAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AChild.class + out/production/module/foo/UseAChildKt.class End of files Compiling files: -src/AChild.kt -src/useAChild.kt -End of files \ No newline at end of file + src/AChild.kt + src/useAChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log index 2dc893eb74c..425add15df3 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log @@ -1,16 +1,27 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt -src/utils.kt + src/A.kt + src/utils.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/useAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AChild.class -out/production/module/foo/UseAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AChild.class + out/production/module/foo/UseAChildKt.class End of files Compiling files: -src/AChild.kt -src/useAChild.kt -End of files \ No newline at end of file + src/AChild.kt + src/useAChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log index 9272eb1ea31..0fb83223d2a 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -1,49 +1,77 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/foo/A.class + out/production/module1/foo/A.class End of files Compiling files: -module1/src/module1_A.kt + module1/src/module1_A.kt End of files +Marked as dirty by Kotlin: + module1/src/module1_D.kt + module2/src/module2_B.kt + module3/src/module3_C.kt + module4/src/module4_E.kt + module5/src/module5_F.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module1/foo/D.class -out/production/module2/foo/B.class -out/production/module3/foo/C.class + out/production/module1/foo/D.class + out/production/module2/foo/B.class + out/production/module3/foo/C.class End of files Compiling files: -module2/src/module2_B.kt + module2/src/module2_B.kt End of files Compiling files: -module3/src/module3_C.kt + module3/src/module3_C.kt End of files Compiling files: -module1/src/module1_D.kt + module1/src/module1_D.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED This type is final, so it cannot be inherited from +================ Step #2 ================= Cleaning output files: -out/production/module1/foo/A.class + out/production/module1/foo/A.class End of files Compiling files: -module2/src/module2_B.kt + module2/src/module2_B.kt End of files Compiling files: -module3/src/module3_C.kt + module3/src/module3_C.kt End of files Compiling files: -module1/src/module1_A.kt -module1/src/module1_D.kt + module1/src/module1_A.kt + module1/src/module1_D.kt End of files +Marked as dirty by Kotlin: + module4/src/module4_E.kt + module5/src/module5_F.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module4/foo/E.class + out/production/module4/foo/E.class End of files Compiling files: -module4/src/module4_E.kt + module4/src/module4_E.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module5/foo/F.class + out/production/module5/foo/F.class End of files Compiling files: -module5/src/module5_F.kt -End of files \ No newline at end of file + module5/src/module5_F.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log index cdaee454b33..5844211fd39 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -1,36 +1,71 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/foo/A.class + out/production/module1/foo/A.class End of files Compiling files: -module1/src/module1_A.kt + module1/src/module1_A.kt End of files +Marked as dirty by Kotlin: + module2/src/module2_AChild.kt + module3/src/module3_AGrandChild.kt + module3/src/module3_importAGrandChild.kt + module4/src/module4_importAGrandChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/foo/AChild.class + out/production/module2/foo/AChild.class End of files Compiling files: -module2/src/module2_AChild.kt + module2/src/module2_AChild.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot access 'A': it is 'private' in file Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' +================ Step #2 ================= Cleaning output files: -out/production/module1/foo/A.class + out/production/module1/foo/A.class End of files Compiling files: -module1/src/module1_A.kt + module1/src/module1_A.kt End of files +Marked as dirty by Kotlin: + module2/src/module2_AChild.kt + module3/src/module3_AGrandChild.kt + module3/src/module3_importAGrandChild.kt + module4/src/module4_importAGrandChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -module2/src/module2_AChild.kt + module2/src/module2_AChild.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module3/foo/AGrandChild.class + out/production/module3/foo/AGrandChild.class End of files Compiling files: -module3/src/module3_AGrandChild.kt -module3/src/module3_importAGrandChild.kt + module3/src/module3_AGrandChild.kt + module3/src/module3_importAGrandChild.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -module4/src/module4_importAGrandChild.kt -End of files \ No newline at end of file + module4/src/module4_importAGrandChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log index 1e03d4107d3..ad91bd5abec 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -1,32 +1,61 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/foo/A.class + out/production/module1/foo/A.class End of files Compiling files: -module1/src/module1_A.kt + module1/src/module1_A.kt End of files +Marked as dirty by Kotlin: + module2/src/module2_AChild.kt + module2/src/module2_importA.kt + module3/src/module3_importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/foo/AChild.class + out/production/module2/foo/AChild.class End of files Compiling files: -module2/src/module2_AChild.kt -module2/src/module2_importA.kt + module2/src/module2_AChild.kt + module2/src/module2_importA.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot access 'A': it is 'private' in file Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' Cannot access 'A': it is 'private' in file +================ Step #2 ================= Cleaning output files: -out/production/module1/foo/A.class + out/production/module1/foo/A.class End of files Compiling files: -module1/src/module1_A.kt + module1/src/module1_A.kt End of files +Marked as dirty by Kotlin: + module2/src/module2_AChild.kt + module2/src/module2_importA.kt + module3/src/module3_importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -module2/src/module2_AChild.kt -module2/src/module2_importA.kt + module2/src/module2_AChild.kt + module2/src/module2_importA.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -module3/src/module3_importAChild.kt -End of files \ No newline at end of file + module3/src/module3_importAChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log index 92e37457353..e1697459857 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log @@ -1,20 +1,32 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/Utils.class -out/production/module/Utils__PartBKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/Utils.class + out/production/module/Utils__PartBKt.class End of files Compiling files: -src/partB.kt + src/partB.kt End of files +Marked as dirty by Kotlin: + src/partA.kt + src/useFooF.kt + src/useFooG.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UseFooFKt.class -out/production/module/UseFooGKt.class -out/production/module/Utils.class -out/production/module/Utils__PartAKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseFooFKt.class + out/production/module/UseFooGKt.class + out/production/module/Utils.class + out/production/module/Utils__PartAKt.class End of files Compiling files: -src/partA.kt -src/useFooF.kt -src/useFooG.kt -End of files \ No newline at end of file + src/partA.kt + src/useFooF.kt + src/useFooG.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log index 334e8d99380..2e8beb3d729 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log @@ -1,23 +1,36 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/B.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt + src/B.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED 'f' overrides nothing +================ Step #2 ================= Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt -src/B.kt -End of files \ No newline at end of file + src/A.kt + src/B.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log index de3e633548e..36d30493ebe 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log @@ -1,23 +1,36 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt + src/B.kt End of files +Marked as dirty by Kotlin: + src/BA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/BA.class + out/production/module/BA.class End of files Compiling files: -src/BA.kt + src/BA.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C): kotlin.Unit defined in A +================ Step #2 ================= Cleaning output files: -out/production/module/B.class + out/production/module/B.class End of files Compiling files: -src/B.kt -src/BA.kt -End of files \ No newline at end of file + src/B.kt + src/BA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log index 3b8d85ae468..efc79dc6100 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log @@ -1,40 +1,54 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class -out/production/module/A__APartFKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/A.class + out/production/module/A__APartFKt.class + out/production/module/META-INF/module.kotlin_module End of files Cleaning output files: -out/production/module/A__APartGKt.class + out/production/module/A__APartGKt.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/useF.kt + src/useG.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UseFJava.class -out/production/module/UseFKt.class -out/production/module/UseGKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseFJava.class + out/production/module/UseFKt.class + out/production/module/UseGKt.class End of files Compiling files: -src/useF.kt -src/useG.kt + src/useF.kt + src/useG.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: f Unresolved reference: g +================ Step #2 ================= Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Cleaning output files: -out/production/module/A$Companion.class + out/production/module/A$Companion.class End of files Compiling files: -src/A.kt -src/useF.kt -src/useG.kt + src/A.kt + src/useF.kt + src/useG.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/UseFJava.java -End of files \ No newline at end of file + src/UseFJava.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log index 488756b17ac..36db4e07e4a 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log @@ -1,28 +1,42 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A$x$1.class -out/production/module/foo/A.class + out/production/module/foo/A$x$1.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/useAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AChild.class -out/production/module/foo/UseAChildKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AChild.class + out/production/module/foo/UseAChildKt.class End of files Compiling files: -src/AChild.kt -src/useAChild.kt + src/AChild.kt + src/useAChild.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected +================ Step #2 ================= Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt -src/AChild.kt -src/useAChild.kt -End of files \ No newline at end of file + src/A.kt + src/AChild.kt + src/useAChild.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log index 8048633bbe9..878d67343d0 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log @@ -1,29 +1,42 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Base$A.class -out/production/module/Base$B.class -out/production/module/Base.class + out/production/module/Base$A.class + out/production/module/Base$B.class + out/production/module/Base.class End of files Compiling files: -src/Base.kt + src/Base.kt End of files +Marked as dirty by Kotlin: + src/use.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UseKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseKt.class End of files Compiling files: -src/use.kt + src/use.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED when expression must be exhaustive, add necessary 'is C' branch or 'else' branch instead +================ Step #2 ================= Cleaning output files: -out/production/module/Base$A.class -out/production/module/Base$B.class -out/production/module/Base$C.class -out/production/module/Base.class + out/production/module/Base$A.class + out/production/module/Base$B.class + out/production/module/Base$C.class + out/production/module/Base.class End of files Compiling files: -src/Base.kt -src/use.kt -End of files \ No newline at end of file + src/Base.kt + src/use.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index 977648d6f3f..8c4ff368732 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -1,30 +1,46 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED 'public constructor A(x: kotlin.String)' conflicts with another declaration in package '' +================ Step #2 ================= Cleaning output files: -out/production/module/AConstructorFunctionKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/AConstructorFunctionKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/createAFromInt.kt + src/createAFromString.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/AChild.class -out/production/module/CreateAFromIntKt.class -out/production/module/CreateAFromStringKt.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UseAKt.class + out/production/module/AChild.class + out/production/module/CreateAFromIntKt.class + out/production/module/CreateAFromStringKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseAKt.class End of files Compiling files: -src/AChild.kt -src/createAFromInt.kt -src/createAFromString.kt -src/useA.kt -End of files \ No newline at end of file + src/AChild.kt + src/createAFromInt.kt + src/createAFromString.kt + src/useA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log index d6cbadde7c4..77ceb6655e5 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log @@ -1,17 +1,29 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AStarDeclaration.kt + src/CallGetAStar.kt + src/getAStar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/AStarDeclaration.class -out/production/module/CallGetAStar.class -out/production/module/GetAStarKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/AStarDeclaration.class + out/production/module/CallGetAStar.class + out/production/module/GetAStarKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/AStarDeclaration.kt -src/CallGetAStar.kt -src/getAStar.kt -End of files \ No newline at end of file + src/AStarDeclaration.kt + src/CallGetAStar.kt + src/getAStar.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log index 2dced77d7d7..e8071f62b2b 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log @@ -1,69 +1,110 @@ -Cleaning output files: -out/production/module/foo/A.class -End of files -Compiling files: -src/A.kt -src/AParent.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/ImportStarKt.class -out/production/module/bar/ReferencedByFqNameKt.class -out/production/module/foo/AChild.class -out/production/module/foo/AGrandChild.class -out/production/module/foo/ATypeParameter.class -out/production/module/foo/ClassLiteralKt.class -out/production/module/foo/FunctionParameterKt.class -out/production/module/foo/GetAKt.class -out/production/module/foo/ReturnTypeImplicitKt.class -out/production/module/foo/ReturnTypeKt.class -End of files -Compiling files: -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt + src/AParent.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/ImportStarKt.class -out/production/module/bar/ReferencedByFqNameKt.class -out/production/module/foo/AChild.class -out/production/module/foo/AGrandChild.class -out/production/module/foo/ATypeParameter.class -out/production/module/foo/ClassLiteralKt.class -out/production/module/foo/FunctionParameterKt.class -out/production/module/foo/GetAKt.class -out/production/module/foo/ReturnTypeImplicitKt.class -out/production/module/foo/ReturnTypeKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/ImportStarKt.class + out/production/module/bar/ReferencedByFqNameKt.class + out/production/module/foo/AChild.class + out/production/module/foo/AGrandChild.class + out/production/module/foo/ATypeParameter.class + out/production/module/foo/ClassLiteralKt.class + out/production/module/foo/FunctionParameterKt.class + out/production/module/foo/GetAKt.class + out/production/module/foo/ReturnTypeImplicitKt.class + out/production/module/foo/ReturnTypeKt.class End of files Compiling files: -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt -End of files \ No newline at end of file + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/ImportStarKt.class + out/production/module/bar/ReferencedByFqNameKt.class + out/production/module/foo/AChild.class + out/production/module/foo/AGrandChild.class + out/production/module/foo/ATypeParameter.class + out/production/module/foo/ClassLiteralKt.class + out/production/module/foo/FunctionParameterKt.class + out/production/module/foo/GetAKt.class + out/production/module/foo/ReturnTypeImplicitKt.class + out/production/module/foo/ReturnTypeKt.class +End of files +Compiling files: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log index 8f18e60ad0a..714c14a60a8 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log @@ -1,36 +1,55 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/ImportStarKt.class -out/production/module/bar/ReferencedByFqNameKt.class -out/production/module/foo/AChild.class -out/production/module/foo/AGrandChild.class -out/production/module/foo/ATypeParameter.class -out/production/module/foo/ClassLiteralKt.class -out/production/module/foo/FunctionParameterKt.class -out/production/module/foo/GetAKt.class -out/production/module/foo/ReturnTypeImplicitKt.class -out/production/module/foo/ReturnTypeKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/ImportStarKt.class + out/production/module/bar/ReferencedByFqNameKt.class + out/production/module/foo/AChild.class + out/production/module/foo/AGrandChild.class + out/production/module/foo/ATypeParameter.class + out/production/module/foo/ClassLiteralKt.class + out/production/module/foo/FunctionParameterKt.class + out/production/module/foo/GetAKt.class + out/production/module/foo/ReturnTypeImplicitKt.class + out/production/module/foo/ReturnTypeKt.class End of files Compiling files: -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Type argument expected Type argument expected @@ -43,22 +62,27 @@ Type inference failed: Not enough information to infer parameter T in constructo Please specify it explicitly. Type argument expected +================ Step #2 ================= Cleaning output files: -out/production/module/foo/A.class + out/production/module/foo/A.class End of files Compiling files: -src/A.kt -src/AChild.kt -src/AGrandChild.kt -src/ATypeParameter.kt -src/classLiteral.kt -src/functionParameter.kt -src/getA.kt -src/importA.kt -src/importAGrandChild.kt -src/importStar.kt -src/referencedByFqName.kt -src/returnType.kt -src/returnTypeImplicit.kt -End of files \ No newline at end of file + src/A.kt + src/AChild.kt + src/AGrandChild.kt + src/ATypeParameter.kt + src/classLiteral.kt + src/functionParameter.kt + src/getA.kt + src/importA.kt + src/importAGrandChild.kt + src/importStar.kt + src/referencedByFqName.kt + src/returnType.kt + src/returnTypeImplicit.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log index 95c56aeb94f..14c0ce52c7f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log @@ -1,32 +1,47 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Marked as dirty by Kotlin: + src/D.kt + src/useA.kt + src/useD.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/D$Companion.class -out/production/module/D.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UseAKt.class -out/production/module/UseDKt.class + out/production/module/D$Companion.class + out/production/module/D.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseAKt.class + out/production/module/UseDKt.class End of files Compiling files: -src/D.kt -src/useA.kt -src/useD.kt + src/D.kt + src/useA.kt + src/useD.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Type mismatch: inferred type is A but A was expected Type mismatch: inferred type is A but A was expected +================ Step #2 ================= Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt -src/D.kt -src/useA.kt -src/useD.kt -End of files \ No newline at end of file + src/A.kt + src/D.kt + src/useA.kt + src/useD.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log index 554d1e2cead..f2c35bc9fee 100644 --- a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log @@ -1,12 +1,20 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class + out/production/module/JavaClass.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaClass.java + src/JavaClass.java End of files Cleaning output files: -out/production/module/Usage.class + out/production/module/Usage.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log index 1cefb7c31b1..1b429defcb6 100644 --- a/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantUnchangedUsedInKotlin/build.log @@ -1,6 +1,10 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class + out/production/module/JavaClass.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaClass.java -End of files \ No newline at end of file + src/JavaClass.java +End of files diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log index 29b384519d1..3544758175f 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log @@ -1,13 +1,19 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/Usage.class + out/production/module/Usage.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/Usage.java -End of files \ No newline at end of file + src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log index 8dfe7647a28..9b0defb6ab8 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt -End of files \ No newline at end of file + src/const.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log index 29b384519d1..3544758175f 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log @@ -1,13 +1,19 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/Usage.class + out/production/module/Usage.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/Usage.java -End of files \ No newline at end of file + src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log index 8dfe7647a28..9b0defb6ab8 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt -End of files \ No newline at end of file + src/const.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log index acae21392b6..fca42823651 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/FooKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/FooKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/foo.kt + src/foo.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log index acae21392b6..fca42823651 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/FooKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/FooKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/foo.kt + src/foo.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log index 7c45fecebde..e057a031f08 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/Usage.class + out/production/module/usage/Usage.class End of files Compiling files: -src/Usage.kt -End of files \ No newline at end of file + src/Usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log index 552f2fae39c..756700a0864 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/Usage$Companion.class -out/production/module/usage/Usage.class + out/production/module/usage/Usage$Companion.class + out/production/module/usage/Usage.class End of files Compiling files: -src/Usage.kt -End of files \ No newline at end of file + src/Usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log index 131fc644d33..605fdce7dfa 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log index 7324f24d9d4..a009c693c0c 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log @@ -1,16 +1,27 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/Usage.kt + src/topLevelUsage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/TopLevelUsageKt.class -out/production/module/usage/Usage.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/TopLevelUsageKt.class + out/production/module/usage/Usage.class End of files Compiling files: -src/Usage.kt -src/topLevelUsage.kt -End of files \ No newline at end of file + src/Usage.kt + src/topLevelUsage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log index 81dc8237c58..3adb6d9df8a 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log @@ -1,15 +1,25 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt$usage$use$1.class -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt$usage$use$1.class + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log index 7cfa84f7e3a..f0ba63a008b 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log @@ -1,15 +1,25 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt$usage$1.class -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt$usage$1.class + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log index 7c45fecebde..e057a031f08 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/Usage.class + out/production/module/usage/Usage.class End of files Compiling files: -src/Usage.kt -End of files \ No newline at end of file + src/Usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log index 131fc644d33..605fdce7dfa 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log index 7c45fecebde..e057a031f08 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/Usage.class + out/production/module/usage/Usage.class End of files Compiling files: -src/Usage.kt -End of files \ No newline at end of file + src/Usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log index 7c45fecebde..e057a031f08 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/Usage.class + out/production/module/usage/Usage.class End of files Compiling files: -src/Usage.kt -End of files \ No newline at end of file + src/Usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log index 7c45fecebde..e057a031f08 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/Usage.class + out/production/module/usage/Usage.class End of files Compiling files: -src/Usage.kt -End of files \ No newline at end of file + src/Usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log index 7c45fecebde..e057a031f08 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/Usage.class + out/production/module/usage/Usage.class End of files Compiling files: -src/Usage.kt -End of files \ No newline at end of file + src/Usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log index 131fc644d33..605fdce7dfa 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log index 8c01fa6b2e0..012b093d7f0 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log index 0eb0c755f29..146bfdd4969 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log @@ -1,8 +1,14 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class -out/production/module/B.class -out/production/module/C.class + out/production/module/A.class + out/production/module/B.class + out/production/module/C.class End of files Compiling files: -src/main.kt + src/main.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log index b9269ba28f4..f0e02d57a49 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/constant/ConstantKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/constant/ConstantKt.class End of files Compiling files: -src/constant.kt + src/constant.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/constant/ConstantKt.class -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/constant/ConstantKt.class + out/production/module/usage/UsageKt.class End of files Compiling files: -src/constant.kt -src/usage.kt -End of files \ No newline at end of file + src/constant.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log index a40eeba1a4a..23a4ee54d76 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UtilsKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UtilsKt.class End of files Compiling files: -src/utils.kt -End of files \ No newline at end of file + src/utils.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log index 131fc644d33..605fdce7dfa 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log index 693a52e4076..6546c954a20 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt -End of files \ No newline at end of file + src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log index b97f58152ee..4199fbdec4e 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin/build.log @@ -1,6 +1,10 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/A.class + out/production/module/A.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/A.java + src/A.java End of files diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log index 2914423d765..3ab059e9055 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/constant/ConstantKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/constant/ConstantKt.class End of files Compiling files: -src/constant.kt -End of files \ No newline at end of file + src/constant.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/init-build.log b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/init-build.log index 3aacbd6c97e..0b64c97b5c5 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/init-build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/init-build.log @@ -1,9 +1,11 @@ Compiling files: -src/bar.kt -src/constraints.kt -src/foo.kt -src/usages.kt + src/bar.kt + src/constraints.kt + src/foo.kt + src/usages.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: vala Unresolved reference: vara diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log b/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log index 02fb31f771b..2392cb36ba3 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/init-build.log @@ -1,6 +1,8 @@ Compiling files: -src/usages.kt + src/usages.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: IS Unresolved reference: IS diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/init-build.log b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/init-build.log index 1fa99e08a45..d91bf1dcf21 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/init-build.log +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/init-build.log @@ -1,7 +1,9 @@ Compiling files: -src/KotlinClass.kt -src/usages.kt + src/KotlinClass.kt + src/usages.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: setFoo Val cannot be reassigned diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log index 6d84c7b51a9..a888cb3fb72 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log @@ -1,14 +1,22 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module2/b/B.class -out/production/module2/b/BB.class + out/production/module2/b/B.class + out/production/module2/b/BB.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module1/a/A.class -out/production/module1/a/AA.class + out/production/module1/a/A.class + out/production/module1/a/AA.class End of files Compiling files: -module1/src/module1_a.kt -End of files \ No newline at end of file + module1/src/module1_a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log index d7b2fc49156..b729d063db7 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log @@ -1,16 +1,24 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module2/b/B.class -out/production/module2/b/BB.class + out/production/module2/b/B.class + out/production/module2/b/BB.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Marked as dirty by Kotlin: + module1/src/module1_a.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module1/a/A.class -out/production/module1/a/AA.class + out/production/module1/a/A.class + out/production/module1/a/AA.class End of files Compiling files: -module1/src/module1_a.kt -End of files \ No newline at end of file + module1/src/module1_a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index 3b32ed64b7a..4d6d24a3a93 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/test/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/test/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt -End of files \ No newline at end of file + module1/src/module1_a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index 39074c74d70..b41955ec39b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,15 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt -End of files \ No newline at end of file + module1/src/module1_a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log index add1ba50857..2c7a9936530 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log @@ -1,9 +1,13 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log index 85072d47def..a30af0b8efc 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -1,22 +1,30 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/Module1_aKt.class -out/production/module1/c/Module1_c2Kt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_aKt.class + out/production/module1/c/Module1_c2Kt.class End of files Compiling files: -module1/src/module1_a.kt -module1/src/module1_c2.kt + module1/src/module1_a.kt + module1/src/module1_c2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/c/Module1_c1Kt.class -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/B.class -out/production/module2/b/Module2_bKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/c/Module1_c1Kt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/B.class + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files Compiling files: -module1/src/module1_c1.kt -End of files \ No newline at end of file + module1/src/module1_c1.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log index 22a8eac1519..6958358e437 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log @@ -1,11 +1,15 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/Module1_aKt.class -out/production/module1/c/Module1_c2Kt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_aKt.class + out/production/module1/c/Module1_c2Kt.class End of files Compiling files: -module1/src/module1_a.kt -module1/src/module1_c2.kt -End of files \ No newline at end of file + module1/src/module1_a.kt + module1/src/module1_c2.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 144dd0bb291..c212936485f 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,20 +1,32 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/test/Module1_constKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/test/Module1_constKt.class End of files Compiling files: -module1/src/module1_const.kt + module1/src/module1_const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/test/Module1_constKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/test/Module1_constKt.class End of files Compiling files: -module1/src/module1_const.kt + module1/src/module1_const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/usage/Usage.class + out/production/module2/usage/Usage.class End of files Compiling files: -module2/src/module2_usage.kt -End of files \ No newline at end of file + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log index 16518f5f414..0b03e5add20 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/a/A.class + out/production/module1/a/A.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class End of files Compiling files: -module2/src/module2_usage.kt -End of files \ No newline at end of file + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log new file mode 100644 index 00000000000..e763a6d122f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/a/A.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class +End of files +Compiling files: + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log index b25e93d2f74..62d91cad136 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class End of files Compiling files: -module2/src/module2_usage.kt -End of files \ No newline at end of file + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log new file mode 100644 index 00000000000..e6e83159a7c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log @@ -0,0 +1,26 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_aKt.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class +End of files +Compiling files: + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log index 16518f5f414..0b03e5add20 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/a/A.class + out/production/module1/a/A.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class End of files Compiling files: -module2/src/module2_usage.kt -End of files \ No newline at end of file + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..e763a6d122f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/a/A.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class +End of files +Compiling files: + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log index b25e93d2f74..62d91cad136 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class End of files Compiling files: -module2/src/module2_usage.kt -End of files \ No newline at end of file + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log new file mode 100644 index 00000000000..e6e83159a7c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log @@ -0,0 +1,26 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_aKt.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class +End of files +Compiling files: + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index 791a5274399..66c221387c3 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,14 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/Module1_inlineKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/Module1_inlineKt.class End of files Compiling files: -module1/src/module1_inline.kt + module1/src/module1_inline.kt End of files +Marked as dirty by Kotlin: + module2/src/module2_usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageKt.class End of files Compiling files: -module2/src/module2_usage.kt -End of files \ No newline at end of file + module2/src/module2_usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index a5103f47632..33a02063e39 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -1,30 +1,53 @@ -Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/Module1_inlineFKt.class -End of files -Compiling files: -module1/src/module1_inlineF.kt -End of files -Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageFKt.class -End of files -Compiling files: -module2/src/module2_usageF.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/inline/Module1_inlineGKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/Module1_inlineFKt.class End of files Compiling files: -module1/src/module1_inlineG.kt + module1/src/module1_inlineF.kt End of files +Marked as dirty by Kotlin: + module2/src/module2_usageF.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/usage/Module2_usageGKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageFKt.class End of files Compiling files: -module2/src/module2_usageG.kt -End of files \ No newline at end of file + module2/src/module2_usageF.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/Module1_inlineGKt.class +End of files +Compiling files: + module1/src/module1_inlineG.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_usageG.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/Module2_usageGKt.class +End of files +Compiling files: + module2/src/module2_usageG.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index c1cc4371b80..5619972f123 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,15 +1,25 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt -End of files \ No newline at end of file + module2/src/module2_b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log new file mode 100644 index 00000000000..6904fa0746f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log @@ -0,0 +1,27 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_aKt.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class +End of files +Compiling files: + module2/src/module2_b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index f7e53b09f20..57423092b1c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -1,21 +1,29 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/ClassAnnotation.class -out/production/module1/a/FileAnnotation.class -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/ClassAnnotation.class + out/production/module1/a/FileAnnotation.class + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/B.class -out/production/module2/b/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/B.class + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot access 'FileAnnotation': it is 'internal' in 'a' Cannot access 'A': it is 'internal' in 'a' @@ -24,4 +32,4 @@ Cannot access 'ClassAnnotation': it is 'internal' in 'a' Cannot access 'ClassAnnotation': it is 'internal' in 'a' Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'internal' Cannot access 'A': it is 'internal' in 'a' -Cannot access 'a': it is 'internal' in 'a' \ No newline at end of file +Cannot access 'a': it is 'internal' in 'a' diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log new file mode 100644 index 00000000000..c105d8ab425 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log @@ -0,0 +1,37 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/ClassAnnotation.class + out/production/module1/a/FileAnnotation.class + out/production/module1/a/Module1_aKt.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/B.class + out/production/module2/b/Module2_bKt.class +End of files +Compiling files: + module2/src/module2_b.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'FileAnnotation': it is 'internal' in 'a' +Cannot access 'A': it is 'internal' in 'a' +Cannot access 'FileAnnotation': it is 'internal' in 'a' +Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'internal' +Cannot access 'A': it is 'internal' in 'a' +Cannot access 'a': it is 'internal' in 'a' diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log index 1a5350845e0..b884be2bc90 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log @@ -1,26 +1,34 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/InternalA.class -out/production/module1/a/InternalClassAnnotation.class -out/production/module1/a/InternalFileAnnotation.class -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/InternalA.class + out/production/module1/a/InternalClassAnnotation.class + out/production/module1/a/InternalFileAnnotation.class + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/B.class -out/production/module2/b/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/B.class + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot access 'InternalFileAnnotation': it is 'internal' in 'a' Cannot access 'InternalFileAnnotation': it is 'internal' in 'a' Cannot access 'InternalClassAnnotation': it is 'internal' in 'a' Cannot access 'InternalClassAnnotation': it is 'internal' in 'a' Unresolved reference: InternalA -Unresolved reference: internalA \ No newline at end of file +Unresolved reference: internalA diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index d8abebfacd9..8c075f8eb19 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,8 +1,16 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt -End of files \ No newline at end of file + module1/src/module1_a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index c1cc4371b80..faac8132f41 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,15 +1,27 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt -End of files \ No newline at end of file + module2/src/module2_b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log new file mode 100644 index 00000000000..4974337be4b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log @@ -0,0 +1,29 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_aKt.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class +End of files +Compiling files: + module2/src/module2_b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 1a3419a31d0..1c02e469d07 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,21 +1,39 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Marked as dirty by Kotlin: + module2/src/module2_b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt + module2/src/module2_b.kt End of files +Marked as dirty by Kotlin: + module3/src/module3_c.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/c/Module3_cKt.class + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/c/Module3_cKt.class End of files Compiling files: -module3/src/module3_c.kt -End of files \ No newline at end of file + module3/src/module3_c.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index 231ec872217..2fce90018fd 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,22 +1,36 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module1/META-INF/module1.kotlin_module -out/production/module1/a/A.class -out/production/module1/a/Module1_aKt.class + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_aKt.class End of files Compiling files: -module1/src/module1_a.kt + module1/src/module1_a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module3/META-INF/module3.kotlin_module -out/production/module3/c/Module3_cKt.class + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/c/Module3_cKt.class End of files Compiling files: -module3/src/module3_c.kt + module3/src/module3_c.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ Cleaning output files: -out/production/module2/META-INF/module2.kotlin_module -out/production/module2/b/Module2_bKt.class + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class End of files Compiling files: -module2/src/module2_b.kt -End of files \ No newline at end of file + module2/src/module2_b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log new file mode 100644 index 00000000000..7a2cd1c6685 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log @@ -0,0 +1,39 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/Module1_aKt.class +End of files +Compiling files: + module1/src/module1_a.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_b.kt + module3/src/module3_c.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/c/Module3_cKt.class +End of files +Compiling files: + module3/src/module3_c.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/Module2_bKt.class +End of files +Compiling files: + module2/src/module2_b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index e6382637768..524251631b5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -1,9 +1,15 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class + out/production/module/test/UsageKt.class End of files Compiling files: -src/b.kt -src/usage.kt -End of files \ No newline at end of file + src/b.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log index 594dd4f9802..0d35c519654 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log @@ -1,18 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/other/OtherKt.class -out/production/module/test/AKt.class -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/AKt.class + out/production/module/test/UsageKt.class End of files Compiling files: -src/a.kt -src/other.kt -src/usage.kt + src/a.kt + src/other.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log index 0f09acccc1b..9b27584341c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log @@ -1,16 +1,24 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index e6382637768..524251631b5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -1,9 +1,15 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class + out/production/module/test/UsageKt.class End of files Compiling files: -src/b.kt -src/usage.kt -End of files \ No newline at end of file + src/b.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 46b44cd6dd2..77636324b50 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -1,25 +1,38 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class -End of files -Compiling files: -src/const.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class -out/production/module/test/Usage.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class End of files Compiling files: -src/const.kt -src/usage.kt -End of files \ No newline at end of file + src/const.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class + out/production/module/test/Usage.class +End of files +Compiling files: + src/const.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index 6059154e756..a4737464d9c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/OtherKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/OtherKt.class End of files Compiling files: -src/other.kt -End of files \ No newline at end of file + src/other.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index 05305b4fbc1..b59883cc54e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -1,8 +1,14 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/a/AKt$foo$1.class -out/production/module/a/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/a/AKt$foo$1.class + out/production/module/a/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log index 9dd9067ed02..7274a7f8732 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log @@ -1,14 +1,22 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Usage1Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Usage1Kt.class End of files Compiling files: -src/usage1.kt + src/usage1.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Usage2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Usage2Kt.class End of files Compiling files: -src/usage2.kt + src/usage2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log index 6e1cc4cca29..8b3290c7b7e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log @@ -1,23 +1,35 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Usage1Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Usage1Kt.class End of files Compiling files: -src/usage1.kt + src/usage1.kt End of files +Marked as dirty by Kotlin: + src/usage2.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Usage2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Usage2Kt.class End of files Compiling files: -src/usage2.kt + src/usage2.kt End of files +Marked as dirty by Kotlin: + src/usage1.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Usage1Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Usage1Kt.class End of files Compiling files: -src/usage1.kt + src/usage1.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log index 55e24cd49c0..1eedc32fd9a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log @@ -1,10 +1,16 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BarKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BarKt.class End of files Cleaning output files: -out/production/module/test/FooKt.class + out/production/module/test/FooKt.class End of files Compiling files: -src/foo.kt + src/foo.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log index e738a4a0702..1eedc32fd9a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log @@ -1,12 +1,16 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BarKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BarKt.class End of files Cleaning output files: -out/production/module/test/FooKt.class + out/production/module/test/FooKt.class End of files Compiling files: -src/foo.kt + src/foo.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index d9c7184cdc5..f68d7db9a4b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -1,13 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/inline/Klass.class + out/production/module/inline/Klass.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 0a26a20ac94..e27367a0216 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class -out/production/module/test/Usage.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class + out/production/module/test/Usage.class End of files Compiling files: -src/const.kt -src/usage.kt + src/const.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index e0121953e8d..d308252c746 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -1,24 +1,39 @@ -Cleaning output files: -out/production/module/test/A.class -End of files -Compiling files: -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/OtherKt.class -End of files -Compiling files: -src/other.kt -End of files +================ Step #1 ================= +Cleaning output files: + out/production/module/test/A.class +End of files +Compiling files: +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= Compiling files: -src/A.kt + src/A.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/OtherKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/OtherKt.class End of files Compiling files: -src/other.kt -End of files \ No newline at end of file + src/other.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log index e3586e8ec1b..8f513eb5955 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log @@ -1,13 +1,21 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/test/A.class + out/production/module/test/A.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ -========== Step #2 ============ +================ Step #2 ================= Compiling files: -src/A.kt + src/A.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log index 50b3c2435b7..77153b329f8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log @@ -1,13 +1,19 @@ +================ Step #1 ================= + Compiling files: -src/class2.kt + src/class2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/Klass.class + out/production/module/Klass.class End of files Compiling files: -src/class1.kt -src/class2.kt + src/class1.kt + src/class2.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Redeclaration: Klass -Redeclaration: Klass \ No newline at end of file +Redeclaration: Klass diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 4af27f55f39..0ebc60160da 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -1,13 +1,21 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass.class + out/production/module/test/Klass.class End of files Compiling files: -src/class.kt + src/class.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log new file mode 100644 index 00000000000..02ab1e4dfbe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/test/Klass.class +End of files +Compiling files: + src/class.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log index 5c686f1943a..130aec8bf7d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass.class + out/production/module/test/Klass.class End of files Compiling files: -src/class.kt + src/class.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index b5bba6d6639..af23ce40d8c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -1,14 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Expecting an expression +================ Step #2 ================= Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index a2d97b25cad..426f2bf8734 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -1,14 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Expecting an expression +================ Step #2 ================= Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index c40d007ecf8..54292ca8f44 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -1,24 +1,35 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/OtherKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/OtherKt.class End of files Cleaning output files: -out/production/module/UsageKt.class + out/production/module/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Expecting an expression +================ Step #2 ================= Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/FunKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/FunKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/fun.kt -End of files \ No newline at end of file + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log index ae6bd400db6..d2ed8cd2114 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log @@ -1,20 +1,26 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/OtherKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/OtherKt.class End of files Cleaning output files: -out/production/module/UsageKt.class + out/production/module/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Expecting an expression -========== Step #2 ============ +================ Step #2 ================= Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index 3baa953b9de..2a472b9ed95 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -1,24 +1,35 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/OtherKt.class -out/production/module/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/OtherKt.class + out/production/module/UsageKt.class End of files Compiling files: -src/other.kt -src/usage.kt + src/other.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Expecting an expression +================ Step #2 ================= Compiling files: -src/other.kt -src/usage.kt + src/other.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/FunKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/FunKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/fun.kt -End of files \ No newline at end of file + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log index dad5c23cd2b..706b4bf2f1b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log @@ -1,20 +1,26 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/OtherKt.class -out/production/module/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/OtherKt.class + out/production/module/UsageKt.class End of files Compiling files: -src/other.kt -src/usage.kt + src/other.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Expecting an expression -========== Step #2 ============ +================ Step #2 ================= Compiling files: -src/other.kt -src/usage.kt + src/other.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index 7b1f40c1e02..e088fbc259b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -1,28 +1,39 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/B.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class + out/production/module/B.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/other.kt -src/usage.kt + src/other.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Expecting an expression +================ Step #2 ================= Compiling files: -src/other.kt -src/usage.kt + src/other.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/A.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class -out/production/module/new/LikePartKt.class + out/production/module/A.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class + out/production/module/new/LikePartKt.class End of files Compiling files: -src/fun.kt -src/likePart.kt -src/usage.kt -End of files \ No newline at end of file + src/fun.kt + src/likePart.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log index 874325ec77e..eb447620edc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log @@ -1,27 +1,35 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/B.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class + out/production/module/B.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/other.kt -src/usage.kt + src/other.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Expecting an expression -========== Step #2 ============ +================ Step #2 ================= Compiling files: -src/other.kt -src/usage.kt + src/other.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 33f02d294ad..21ab5180f89 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -1,15 +1,19 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Utils.class -out/production/module/test/Utils__Fun2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Utils.class + out/production/module/test/Utils__Fun2Kt.class End of files Compiling files: -src/fun2.kt + src/fun2.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): fun function(list: kotlin.collections.List): kotlin.Unit fun function(list: kotlin.collections.List): kotlin.Unit Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): fun function(list: kotlin.collections.List): kotlin.Unit - fun function(list: kotlin.collections.List): kotlin.Unit \ No newline at end of file + fun function(list: kotlin.collections.List): kotlin.Unit diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index 03a0bbef9ef..80bfb1c0f3f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class End of files Compiling files: -src/const.kt -End of files \ No newline at end of file + src/const.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 34e9b8168a2..80b7cf4c0e6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,9 +1,15 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt -End of files \ No newline at end of file + src/const.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 8ef11343a77..70b27607138 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/AKt.class -out/production/module/META-INF/module.kotlin_module + out/production/module/AKt.class + out/production/module/META-INF/module.kotlin_module End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log index c874c387c3b..e83f238da35 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log @@ -1,30 +1,50 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineGetKt.class -End of files -Compiling files: -src/inlineGet.kt -End of files -Cleaning output files: -out/production/module/usage/UsageVal.class -out/production/module/usage/UsageVar.class -End of files -Compiling files: -src/UsageVal.kt -src/UsageVar.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineSetKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineGetKt.class End of files Compiling files: -src/inlineSet.kt + src/inlineGet.kt End of files +Marked as dirty by Kotlin: + src/UsageVal.kt + src/UsageVar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/UsageVar.class + out/production/module/usage/UsageVal.class + out/production/module/usage/UsageVar.class End of files Compiling files: -src/UsageVar.kt -End of files \ No newline at end of file + src/UsageVal.kt + src/UsageVar.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineSetKt.class +End of files +Compiling files: + src/inlineSet.kt +End of files +Marked as dirty by Kotlin: + src/UsageVar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/usage/UsageVar.class +End of files +Compiling files: + src/UsageVar.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log index eafebdfd179..2923f2a7da7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log @@ -1,28 +1,48 @@ -Cleaning output files: -out/production/module/inline/Inline.class -End of files -Compiling files: -src/inline.kt -End of files -Cleaning output files: -out/production/module/usage/UsageVal.class -out/production/module/usage/UsageVar.class -End of files -Compiling files: -src/UsageVal.kt -src/UsageVar.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/inline/Inline.class + out/production/module/inline/Inline.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/UsageVal.kt + src/UsageVar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/usage/UsageVar.class + out/production/module/usage/UsageVal.class + out/production/module/usage/UsageVar.class End of files Compiling files: -src/UsageVar.kt -End of files \ No newline at end of file + src/UsageVal.kt + src/UsageVar.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/inline/Inline.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/UsageVar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/usage/UsageVar.class +End of files +Compiling files: + src/UsageVar.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 2afa4c79cd7..2db1685b6ed 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log index 9675632dd89..5e2bfab9714 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/build.log @@ -1,16 +1,22 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: test -An annotation parameter must be a compile-time constant \ No newline at end of file +An annotation parameter must be a compile-time constant diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log index a8962cfce80..841acd22cd2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithConstantRemoved/experimental-ic-build.log @@ -1,18 +1,24 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class End of files Compiling files: End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: test An annotation parameter must be a compile-time constant diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log index 78dbad6abae..31b42a3d8c3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/build.log @@ -1,15 +1,21 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/InlineKt.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED -Unresolved reference: test \ No newline at end of file +Unresolved reference: test diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log index bae88050a02..98e6b08649a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/fileWithInlineFunctionRemoved/experimental-ic-build.log @@ -1,17 +1,23 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/InlineKt.class End of files Compiling files: End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: test diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 95279b945bf..4e7ba492bf2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/CKt.class -out/production/module/foo/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/CKt.class + out/production/module/foo/BKt.class End of files Compiling files: -src/b.kt -src/c.kt + src/b.kt + src/c.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log index 909d7b3fda0..eeef65fb509 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log @@ -1,11 +1,15 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/bar/CKt.class -out/production/module/foo/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/CKt.class + out/production/module/foo/BKt.class End of files Compiling files: -src/b.kt -src/c.kt + src/b.kt + src/c.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 39ae0ba5aea..5d1ddb7b207 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -1,9 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Fun2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Fun2Kt.class End of files Compiling files: -src/fun2.kt + src/fun2.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED -'public fun function(): kotlin.Unit' conflicts with another declaration in package 'test' \ No newline at end of file +'public fun function(): kotlin.Unit' conflicts with another declaration in package 'test' diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log index 66735e9dcd1..e9e9b9c7459 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log @@ -1,9 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Fun2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Fun2Kt.class End of files Compiling files: -src/fun2.kt + src/fun2.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED -'public constructor function()' conflicts with another declaration in package 'test' \ No newline at end of file +'public constructor function()' conflicts with another declaration in package 'test' diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log index 5e5f0f49f14..40033d1b189 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log @@ -1,13 +1,21 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Y.class + out/production/module/Y.class End of files Compiling files: -src/fun.kt + src/fun.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/X$main$1.class -out/production/module/X.class + out/production/module/X$main$1.class + out/production/module/X.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log index 1e504bef642..5c5e42401e3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log @@ -1,15 +1,23 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/Y.class + out/production/module/Y.class End of files Compiling files: -src/fun.kt + src/fun.kt End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/X$main$1.class -out/production/module/X.class + out/production/module/X$main$1.class + out/production/module/X.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log index e4d8b80cbf7..85f980fdf52 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Foo.class + out/production/module/test/Foo.class End of files Compiling files: -src/Foo.kt + src/Foo.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log index dfe9f195402..05629416ce0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 693a52e4076..6546c954a20 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt -End of files \ No newline at end of file + src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index a494ecda26d..a38ca90369b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -1,21 +1,35 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt + src/a.kt End of files +Marked as dirty by Kotlin: + src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Marked as dirty by Kotlin: + src/a.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index d1fcb39ec95..b416fb87163 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -1,8 +1,14 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class -out/production/module/inline/Klass.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class + out/production/module/inline/Klass.class End of files Compiling files: -src/inline.kt -End of files \ No newline at end of file + src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log index 004b241bfbd..fd55a2e97b7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/useG.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UseGKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UseGKt.class End of files Compiling files: -src/useG.kt -End of files \ No newline at end of file + src/useG.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log index 330be2e1a29..de381d502ae 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log @@ -1,9 +1,15 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/InlineKt.class -out/production/module/foo/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/InlineKt.class + out/production/module/foo/UsageKt.class End of files Compiling files: -src/inline.kt -src/usage.kt -End of files \ No newline at end of file + src/inline.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log index ac2a1edc839..13765f5e93f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log @@ -1,14 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/inline/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class End of files Compiling files: -src/inline.kt + src/inline.kt End of files +Marked as dirty by Kotlin: + src/usesG.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/usage/UsesGKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsesGKt.class End of files Compiling files: -src/usesG.kt -End of files \ No newline at end of file + src/usesG.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log index 6bcaff906d6..899c4f0cf8e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log @@ -1,16 +1,27 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/InlineKt.class -End of files -Compiling files: -src/inline.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/InlineKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/InlineKt.class End of files Compiling files: -src/inline.kt -End of files \ No newline at end of file + src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log index bc45ca377cb..e9b07876be0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log @@ -1,12 +1,20 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt + src/ClassA.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/test/Usage.class + out/production/module/test/Usage.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log index 65089e0ba9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log @@ -1,8 +1,12 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt + src/ClassA.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log index bc45ca377cb..e9b07876be0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log @@ -1,12 +1,20 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt + src/ClassA.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/test/Usage.class + out/production/module/test/Usage.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log index 65089e0ba9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log @@ -1,8 +1,12 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt + src/ClassA.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index 8bcb920f9f5..b6484791f7e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -1,8 +1,14 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt$foo$X.class -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt$foo$X.class + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log index 9ecb2e772f7..2c43fd42bde 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log index 9918454d06c..7c58ff5f3ea 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log @@ -1,13 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Foo.class + out/production/module/Foo.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= Cleaning output files: -out/production/module/Foo.class + out/production/module/Foo.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log index d1b09f25402..7ebd66e360a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log @@ -1,11 +1,19 @@ +================ Step #1 ================= + Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log index 37766455187..933d4645539 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log @@ -1,5 +1,9 @@ -========== Step #1 ============ +================ Step #1 ================= Compiling files: -src/b.kt -End of files \ No newline at end of file + src/b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log index a9a6b9d26d9..91cffd9bfe6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log @@ -1,8 +1,14 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__BKt.class End of files Compiling files: -src/b.kt -End of files \ No newline at end of file + src/b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log index 3e38eacb915..c19d6abca0d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__BKt.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log index 5d71ad8f098..dde3710b421 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log index 5d71ad8f098..dde3710b421 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log index 4bf4f586644..1bfcb07e99f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log @@ -1,12 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= Compiling files: -src/b.kt -End of files \ No newline at end of file + src/b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log index 18aa43b6fc9..3d81a9c0056 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log @@ -1,21 +1,34 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class End of files Compiling files: -src/a.kt + src/a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test2/Test2.class -out/production/module/test2/Test2__AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test2/Test2.class + out/production/module/test2/Test2__AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log index 1dd7e7f2c23..542f49dddf8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log @@ -1,16 +1,24 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class End of files Compiling files: -src/a.kt + src/a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ -========== Step #2 ============ +================ Step #2 ================= Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log index 0130c5b1155..dd8ffb41943 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log @@ -1,10 +1,16 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Test.class -out/production/module/test/Test__AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class End of files Cleaning output files: -out/production/module/test/Test__BKt.class + out/production/module/test/Test__BKt.class End of files Compiling files: -End of files \ No newline at end of file +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index dbd1e3ebd5e..1db8ac9f0b2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/b/B2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/b/B2Kt.class End of files Compiling files: -src/a2.kt + src/a2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/a/A1Kt.class -out/production/module/b/B1Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/a/A1Kt.class + out/production/module/b/B1Kt.class End of files Compiling files: -src/a1.kt -src/b1.kt -End of files \ No newline at end of file + src/a1.kt + src/b1.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log index 0b96a15cb01..0a62d657079 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log @@ -1,9 +1,13 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/b/B2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/b/B2Kt.class End of files Compiling files: -src/a2.kt + src/a2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log index 14b397d0268..3d12ce923b0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -1,14 +1,22 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Object.class + out/production/module/test/Object.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/test/Object.class -out/production/module/test/Usage.class + out/production/module/test/Object.class + out/production/module/test/Usage.class End of files Compiling files: -src/const.kt -src/usage.kt -End of files \ No newline at end of file + src/const.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index 6059154e756..a4737464d9c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/OtherKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/OtherKt.class End of files Compiling files: -src/other.kt -End of files \ No newline at end of file + src/other.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index f6db1281cca..72bf5a4b07a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -1,18 +1,29 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class -End of files -Compiling files: -src/a.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/klass/Klass.class -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/Klass.kt -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/klass/Klass.class + out/production/module/test/AKt.class +End of files +Compiling files: + src/Klass.kt + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index 52d2dfe569e..ef636a15241 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class -out/production/module/test/Usage.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class + out/production/module/test/Usage.class End of files Compiling files: -src/const.kt -src/usage.kt -End of files \ No newline at end of file + src/const.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 63886b2e9de..7bce5305d30 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -1,10 +1,18 @@ +================ Step #1 ================= + Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log index 580cd05304e..933d4645539 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log @@ -1,5 +1,9 @@ -========== Step #1 ============ +================ Step #1 ================= Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 3bf6a00fbf0..8fd0d95044c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -1,14 +1,22 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log index 546e71f3b7a..27fdbcc833d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log @@ -1,9 +1,13 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index 6d48cad7fb8..6be309eb468 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -1,22 +1,35 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class -End of files -Compiling files: -src/a.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: + src/a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class +End of files +Compiling files: + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log index 8f2ecfb095b..b509bb38363 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log @@ -1,18 +1,26 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt + src/a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ -========== Step #2 ============ +================ Step #2 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 5fde10f5d36..171f3530f9c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -1,24 +1,37 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class -End of files -Compiling files: -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/other/OtherKt.class -out/production/module/test/AKt.class -End of files -Compiling files: -src/a.kt -src/other.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/other/OtherKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/other.kt -End of files \ No newline at end of file +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/AKt.class +End of files +Compiling files: + src/a.kt + src/other.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log index 9eaab4e1e33..67f143f6ce8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log @@ -1,18 +1,26 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ -========== Step #2 ============ +================ Step #2 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/other/OtherKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class End of files Compiling files: -src/other.kt + src/other.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index 201a5da3f4d..fabaab4ef3c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -1,25 +1,41 @@ -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class -End of files -Compiling files: -src/a.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/b.kt + src/a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #3 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class +End of files +Compiling files: + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index 5d71ad8f098..dde3710b421 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index 5d71ad8f098..dde3710b421 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log index 5c549fedfb3..d7673adff66 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Utils.class -out/production/module/test/Utils__Pkg1Kt.class -out/production/module/test/Utils__Pkg2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Utils.class + out/production/module/test/Utils__Pkg1Kt.class + out/production/module/test/Utils__Pkg2Kt.class End of files Compiling files: -src/pkg1.kt -src/pkg2.kt + src/pkg1.kt + src/pkg2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/test/Usage.class + out/production/module/test/Usage.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log index 0de8b9692ed..58b744035c1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log @@ -1,12 +1,16 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Utils.class -out/production/module/test/Utils__Pkg1Kt.class -out/production/module/test/Utils__Pkg2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Utils.class + out/production/module/test/Utils__Pkg1Kt.class + out/production/module/test/Utils__Pkg2Kt.class End of files Compiling files: -src/pkg1.kt -src/pkg2.kt + src/pkg1.kt + src/pkg2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log index 86929627da9..58b744035c1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log @@ -1,10 +1,16 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Utils.class -out/production/module/test/Utils__Pkg1Kt.class -out/production/module/test/Utils__Pkg2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Utils.class + out/production/module/test/Utils__Pkg1Kt.class + out/production/module/test/Utils__Pkg2Kt.class End of files Compiling files: -src/pkg1.kt -src/pkg2.kt -End of files \ No newline at end of file + src/pkg1.kt + src/pkg2.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log index 6aa345e8bd2..e8d7c491ec0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/PkgKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/PkgKt.class End of files Compiling files: -src/pkg.kt -End of files \ No newline at end of file + src/pkg.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index f03973ae191..3cfb7bc250e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -1,11 +1,22 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= Compiling files: -src/b.kt -End of files \ No newline at end of file + src/b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index e0e7540f091..acf340cfc9d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -1,19 +1,32 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt + src/a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test2/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test2/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log index e428033a4bc..b3ff7edc754 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log @@ -1,15 +1,23 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt + src/a.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ -========== Step #2 ============ +================ Step #2 ================= Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index 58112c0c033..f74030f2601 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -1,9 +1,15 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Cleaning output files: -out/production/module/test/BKt.class + out/production/module/test/BKt.class End of files Compiling files: -End of files \ No newline at end of file +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log index 9f4084d830a..ca875f5571b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log @@ -1,10 +1,16 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/ConstKt.class -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class -out/production/module/test/Obj.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class + out/production/module/test/Obj.class End of files Compiling files: -src/const.kt -End of files \ No newline at end of file + src/const.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index 60cc1bf3937..bb32f37092f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -1,9 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/Prop2Kt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Prop2Kt.class End of files Compiling files: -src/prop2.kt + src/prop2.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED -Redeclaration: property \ No newline at end of file +Redeclaration: property diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 55336e565a6..918b0d771bd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -1,14 +1,22 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/FunKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class End of files Compiling files: -src/fun.kt + src/fun.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log new file mode 100644 index 00000000000..9e8412c4e72 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log index cd31e5c6326..503c9c24ede 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Foo$Boo.class -out/production/module/test/Foo.class + out/production/module/test/Foo$Boo.class + out/production/module/test/Foo.class End of files Compiling files: -src/Foo.kt + src/Foo.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 9ecb2e772f7..2c43fd42bde 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/foo/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index e3f3aac4243..bd49eb37022 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -1,8 +1,14 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/outer/nested/NestedKt$main$1.class -out/production/module/outer/nested/NestedKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/outer/nested/NestedKt$main$1.class + out/production/module/outer/nested/NestedKt.class End of files Compiling files: -src/nested.kt -End of files \ No newline at end of file + src/nested.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index 6d42272706d..efe2e78b6d4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/FunKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class End of files Compiling files: -src/fun.kt -End of files \ No newline at end of file + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 2afa4c79cd7..2db1685b6ed 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log index 4827d2f4878..3325ed95079 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log @@ -1,14 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot access 'foo': it is 'private' in file +================ Step #2 ================= Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 3af1c73f9f2..15cfe2974fc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Trait$Companion.class -out/production/module/test/Trait.class + out/production/module/test/Trait$Companion.class + out/production/module/test/Trait.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/test/Trait$Companion.class -out/production/module/test/Trait.class -out/production/module/test/Usage.class + out/production/module/test/Trait$Companion.class + out/production/module/test/Trait.class + out/production/module/test/Usage.class End of files Compiling files: -src/const.kt -src/usage.kt -End of files \ No newline at end of file + src/const.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log index 71e16b9f6bb..ec12e7f5ab1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -1,15 +1,21 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/A.class + out/production/module/test/A.class End of files Compiling files: -src/A.kt + src/A.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter \ No newline at end of file +Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log new file mode 100644 index 00000000000..e1179f2c022 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/test/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log index 2a97dbd6a90..3fce05dd620 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log @@ -1,18 +1,27 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter +================ Step #2 ================= Cleaning output files: -out/production/module/test/A.class + out/production/module/test/A.class End of files Compiling files: -src/A.kt -src/usage.kt -End of files \ No newline at end of file + src/A.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 2e8924b6ec7..0ebb195d867 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -1,17 +1,25 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/TheClass.class + out/production/module/TheClass.class End of files Compiling files: -src/TheClass.kt + src/TheClass.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/Usage.class -out/production/module/UsageInKotlinKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/Usage.class + out/production/module/UsageInKotlinKt.class End of files Compiling files: -src/usageInKotlin.kt + src/usageInKotlin.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/Usage.java -End of files \ No newline at end of file + src/Usage.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index 170796b034f..d7f61bb3fd6 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -1,33 +1,46 @@ -Cleaning output files: -out/production/module/Foo.class -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class -End of files -Compiling files: -src/Foo.kt -src/usage.kt -End of files -Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class -End of files -Compiling files: -src/usage.kt -End of files - +================ Step #1 ================= Cleaning output files: -out/production/module/Foo.class + out/production/module/Foo.class End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/usage.kt + src/Foo.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/Foo.java -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/Foo.class +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Compiling files: + src/Foo.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log index 15a35947ed4..0befdcaf1b9 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log @@ -1,13 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/TheClass.class + out/production/module/TheClass.class End of files Compiling files: -src/TheClass.kt + src/TheClass.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +================ Step #2 ================= Cleaning output files: -out/production/module/TheClass.class + out/production/module/TheClass.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index 5ca026d1eef..df40b311c98 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -1,19 +1,27 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/TheClass.class + out/production/module/TheClass.class End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/TheClass.java + src/TheClass.java End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/Usage.class -out/production/module/UsageInKotlinKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/Usage.class + out/production/module/UsageInKotlinKt.class End of files Compiling files: -src/usageInKotlin.kt + src/usageInKotlin.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/Usage.java -End of files \ No newline at end of file + src/Usage.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log new file mode 100644 index 00000000000..fa7422b1dcd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log @@ -0,0 +1,29 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/TheClass.class +End of files +Compiling files: +End of files +Marked as dirty by Kotlin: + src/usageInKotlin.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Compiling files: + src/TheClass.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/Usage.class + out/production/module/UsageInKotlinKt.class +End of files +Compiling files: + src/usageInKotlin.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Compiling files: + src/Usage.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log index 06eb34e15ab..1b429defcb6 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature/build.log @@ -1,6 +1,10 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class + out/production/module/JavaClass.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaClass.java + src/JavaClass.java End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index fb3b63529f5..a9c6f15e5a5 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -1,13 +1,21 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class + out/production/module/JavaClass.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaClass.java + src/JavaClass.java End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/usage.kt -End of files \ No newline at end of file + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log index 340fdbba3b4..e6beb2dc221 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class + out/production/module/JavaClass.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaClass.java + src/JavaClass.java End of files Cleaning output files: -out/production/module/JavaClass.class -out/production/module/Usage.class + out/production/module/JavaClass.class + out/production/module/Usage.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/JavaClass.java -End of files \ No newline at end of file + src/JavaClass.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log index 1cefb7c31b1..1b429defcb6 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged/build.log @@ -1,6 +1,10 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class + out/production/module/JavaClass.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaClass.java -End of files \ No newline at end of file + src/JavaClass.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index 16bb200a16c..77974661009 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -1,11 +1,17 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageKt.class + out/production/module/JavaClass.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageKt.class End of files Compiling files: -src/usage.kt + src/usage.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/JavaClass.java -End of files \ No newline at end of file + src/JavaClass.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log index 6f16bf547fb..bb953cb9f0a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper/build.log @@ -1,15 +1,21 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Super.class + out/production/module/Super.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/Super.java + src/Super.java End of files Cleaning output files: -out/production/module/Sub.class + out/production/module/Sub.class End of files Compiling files: -src/Sub.kt + src/Sub.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Cannot weaken access privilege 'public' for 'y' in 'Super' -'y' hides member of supertype 'Super' and needs 'override' modifier \ No newline at end of file +'y' hides member of supertype 'Super' and needs 'override' modifier diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index 7acfe6e0c6e..ef25b3a5cdb 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -1,18 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class + out/production/module/JavaClass.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaClass.java + src/JavaClass.java End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class -out/production/module/WillBeResolvedToOtherKt.class -out/production/module/WillBeUnresolvedKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class + out/production/module/WillBeResolvedToOtherKt.class + out/production/module/WillBeUnresolvedKt.class End of files Compiling files: -src/willBeResolvedToOther.kt -src/willBeUnresolved.kt + src/willBeResolvedToOther.kt + src/willBeUnresolved.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED -Unresolved reference: f \ No newline at end of file +Unresolved reference: f diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log index 06eb34e15ab..1b429defcb6 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature/build.log @@ -1,6 +1,10 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/JavaClass.class + out/production/module/JavaClass.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaClass.java + src/JavaClass.java End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index 33acb90e24b..33a8bd0d00d 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -1,21 +1,27 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/SamInterface.class + out/production/module/SamInterface.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/SamInterface.java + src/SamInterface.java End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$*.class -out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class -out/production/module/UsageWithFunctionExpressionKt.class -out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class -out/production/module/UsageWithFunctionLiteralKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$*.class + out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class + out/production/module/UsageWithFunctionExpressionKt.class + out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class + out/production/module/UsageWithFunctionLiteralKt.class End of files Compiling files: -src/usageWithFunctionExpression.kt -src/usageWithFunctionLiteral.kt + src/usageWithFunctionExpression.kt + src/usageWithFunctionLiteral.kt End of files +Exit code: ABORT +------------------------------------------ COMPILATION FAILED Unresolved reference: SamInterface -Unresolved reference: SamInterface \ No newline at end of file +Unresolved reference: SamInterface diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index 51e50502a62..ea4b8a311c2 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -1,18 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/SamInterface.class + out/production/module/SamInterface.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/SamInterface.java + src/SamInterface.java End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$*.class -out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class -out/production/module/UsageWithFunctionExpressionKt.class -out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class -out/production/module/UsageWithFunctionLiteralKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UsageWithFunctionExpressionKt$sam$SamInterface$*.class + out/production/module/UsageWithFunctionExpressionKt$usageWithFunctionExpression$a$1.class + out/production/module/UsageWithFunctionExpressionKt.class + out/production/module/UsageWithFunctionLiteralKt$usageWithFunctionLiteral$1.class + out/production/module/UsageWithFunctionLiteralKt.class End of files Compiling files: -src/usageWithFunctionExpression.kt -src/usageWithFunctionLiteral.kt -End of files \ No newline at end of file + src/usageWithFunctionExpression.kt + src/usageWithFunctionLiteral.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index ed7f4aa70c3..f99f5428e2a 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -1,18 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/FunKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class End of files Compiling files: -src/fun.kt + src/fun.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/JavaUsage.class -out/production/module/META-INF/module.kotlin_module -out/production/module/test/OtherKt.class + out/production/module/JavaUsage.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/OtherKt.class End of files Compiling files: -src/other.kt + src/other.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/JavaUsage.java -End of files \ No newline at end of file + src/JavaUsage.java +End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log index 5f849f157f0..92221506e10 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log @@ -1,15 +1,19 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/FunKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class End of files Compiling files: -src/fun.kt + src/fun.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/JavaUsage.class + out/production/module/JavaUsage.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/JavaUsage.java + src/JavaUsage.java End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index 6d42272706d..efe2e78b6d4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/FunKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class End of files Compiling files: -src/fun.kt -End of files \ No newline at end of file + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index b8578f3d619..302557a2230 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -1,13 +1,19 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/FunKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class End of files Compiling files: -src/fun.kt + src/fun.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/Usage.class + out/production/module/Usage.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/Usage.java -End of files \ No newline at end of file + src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index e0426c17165..a19d4dbe165 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -1,18 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/Usage.class -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/Usage.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/Usage.java + src/Usage.java End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log index 8dfe7647a28..9b0defb6ab8 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt -End of files \ No newline at end of file + src/const.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index 5c2f946ccf7..dd06455f2ba 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -1,17 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/FunKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class End of files Compiling files: -src/fun.kt + src/fun.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/WillBeUnresolved.class + out/production/module/WillBeUnresolved.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/WillBeUnresolved.java + src/WillBeUnresolved.java End of files COMPILATION FAILED cannot find symbol symbol : method f(java.lang.String) -location: class test.FunKt \ No newline at end of file +location: class test.FunKt diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log index e0426c17165..a19d4dbe165 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log @@ -1,18 +1,26 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/Usage.class -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/Usage.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt + src/const.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/Usage.java + src/Usage.java End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log index 8dfe7647a28..9b0defb6ab8 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/Klass$Companion.class -out/production/module/test/Klass.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class End of files Compiling files: -src/const.kt -End of files \ No newline at end of file + src/const.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log index 9cf77a4d2c9..6c4554b7374 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -1,14 +1,20 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Super.class + out/production/module/Super.class End of files Compiling files: -src/Super.kt + src/Super.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/Sub.class + out/production/module/Sub.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/Sub.java + src/Sub.java End of files COMPILATION FAILED -y() in Sub cannot override y() in Super; overridden method is final \ No newline at end of file +y() in Sub cannot override y() in Super; overridden method is final diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index 6d42272706d..efe2e78b6d4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -1,7 +1,13 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/FunKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class End of files Compiling files: -src/fun.kt -End of files \ No newline at end of file + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 3bf6a00fbf0..8fd0d95044c 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -1,14 +1,22 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log index 546e71f3b7a..27fdbcc833d 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log @@ -1,9 +1,13 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/BKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/BKt.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 097791a0aa3..5f2c173e692 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -1,16 +1,24 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/Usage.class + out/production/module/Usage.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/Usage.java + src/Usage.java End of files Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/AKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class End of files Compiling files: -src/a.kt -End of files \ No newline at end of file + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log index 268ab61c9df..1a206fb87d6 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log @@ -1,11 +1,15 @@ -========== Step #1 ============ +================ Step #1 ================= Cleaning output files: -out/production/module/Usage.class + out/production/module/Usage.class End of files Compiling files: -src/b.kt + src/b.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Compiling files: -src/Usage.java + src/Usage.java End of files +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log index b71c6615b9e..4006a9a7cf3 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log @@ -1,6 +1,12 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/test/ClassA.class + out/production/module/test/ClassA.class End of files Compiling files: -src/ClassA.kt -End of files \ No newline at end of file + src/ClassA.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 6aabff7ee22..a2374e45e84 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -1,17 +1,23 @@ +================ Step #1 ================= + Cleaning output files: -out/production/module/META-INF/module.kotlin_module -out/production/module/test/PropKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/test/PropKt.class End of files Compiling files: -src/prop.kt + src/prop.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ Cleaning output files: -out/production/module/WillBeUnresolved.class + out/production/module/WillBeUnresolved.class End of files +Exit code: NOTHING_DONE +------------------------------------------ Compiling files: -src/WillBeUnresolved.java + src/WillBeUnresolved.java End of files COMPILATION FAILED cannot find symbol symbol : method getProp() -location: class test.PropKt \ No newline at end of file +location: class test.PropKt From df46352af0cd644462d3a139052f5fbdf959df0d Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 27 Jan 2016 16:34:24 +0300 Subject: [PATCH 0793/1557] Improve test multifilePackagePartMethodAdded: add file which should not be affected Original commit: cf173d6963ae3aad382b2b63923b6f9d100774a0 --- .../multifilePackagePartMethodAdded/build.log | 2 ++ .../multifilePackagePartMethodAdded/partB.kt | 1 - .../multifilePackagePartMethodAdded/partC.kt | 4 ++++ .../multifilePackagePartMethodAdded/useFooH.kt | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partC.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooH.kt diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log index e1697459857..d0d70b5b36a 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log @@ -20,9 +20,11 @@ Cleaning output files: out/production/module/UseFooGKt.class out/production/module/Utils.class out/production/module/Utils__PartAKt.class + out/production/module/Utils__PartCKt.class End of files Compiling files: src/partA.kt + src/partC.kt src/useFooF.kt src/useFooG.kt End of files diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt index 66c94da6e9c..4bc354a97b8 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partB.kt @@ -2,4 +2,3 @@ @file:JvmMultifileClass fun g(x: Int) {} - diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partC.kt new file mode 100644 index 00000000000..5cd12424f49 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/partC.kt @@ -0,0 +1,4 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass + +fun h(x: Int) {} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooH.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooH.kt new file mode 100644 index 00000000000..fc8e1380c3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/useFooH.kt @@ -0,0 +1,3 @@ +fun useFooH() { + h(10) +} From eee73145093330d04608ec2e7ab06523198d5c9d Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 21 Oct 2015 23:14:16 +0300 Subject: [PATCH 0794/1557] Caching results of JpsUtils#isJsKotlinModule #KT-9636 Fixed Original commit: 88c8f2488735427ebb5170dda6268effaf351d10 --- .../jetbrains/kotlin/jps/build/JpsUtils.java | 53 +++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java index 86562fc6785..4ab593ed174 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -27,11 +27,18 @@ import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.util.JpsPathUtil; import org.jetbrains.kotlin.utils.LibraryUtils; +import java.util.AbstractMap; +import java.util.Collections; +import java.util.Map; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; class JpsUtils { private JpsUtils() {} + private static final Map IS_KOTLIN_JS_MODULE_CACHE = createMapForCaching(); + private static final Map IS_KOTLIN_JS_STDLIB_JAR_CACHE = createMapForCaching(); + @NotNull static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { return JpsJavaExtensionService.dependencies(target.getModule()).recursively().exportedOnly() @@ -39,13 +46,53 @@ class JpsUtils { } static boolean isJsKotlinModule(@NotNull ModuleBuildTarget target) { + Boolean cachedValue = IS_KOTLIN_JS_MODULE_CACHE.get(target); + if (cachedValue != null) return cachedValue; + + boolean isKotlinJsModule = isJsKotlinModuleImpl(target); + IS_KOTLIN_JS_MODULE_CACHE.put(target, isKotlinJsModule); + + return isKotlinJsModule; + } + + private static boolean isJsKotlinModuleImpl(@NotNull ModuleBuildTarget target) { Set libraries = getAllDependencies(target).getLibraries(); for (JpsLibrary library : libraries) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { - if (LibraryUtils.isKotlinJavascriptStdLibrary(JpsPathUtil.urlToFile(root.getUrl()))) - return true; + String url = root.getUrl(); + + Boolean cachedValue = IS_KOTLIN_JS_STDLIB_JAR_CACHE.get(url); + if (cachedValue != null) return cachedValue; + + boolean isKotlinJavascriptStdLibrary = LibraryUtils.isKotlinJavascriptStdLibrary(JpsPathUtil.urlToFile(url)); + IS_KOTLIN_JS_STDLIB_JAR_CACHE.put(url, isKotlinJavascriptStdLibrary); + if (isKotlinJavascriptStdLibrary) return true; } } return false; } + + private static Map createMapForCaching() { + if ("true".equalsIgnoreCase(System.getProperty("kotlin.jps.tests"))) { + return new AbstractMap() { + @Override + public V put(K key, V value) { + return null; + } + + @Override + public V get(Object key) { + return null; + } + + @NotNull + @Override + public Set> entrySet() { + return Collections.emptySet(); + } + }; + } + + return new ConcurrentHashMap(); + } } From e30ef1326008945c82196a953509c77a1ed9b78d Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 25 Jan 2016 19:32:02 +0300 Subject: [PATCH 0795/1557] KotlinBuilder: don't request additional round when it's unnecessary & fix warnings Original commit: e33e31ad16cdd342085cb777737e0833959c3a57 --- .../kotlin/jps/build/FSOperationsHelper.kt | 13 +++++------ .../kotlin/jps/build/KotlinBuilder.kt | 22 ++++++++++--------- .../clearedHasKotlin/build.log | 4 +--- .../experimentalOn/build.log | 4 +--- .../experimentalOnOff/build.log | 8 ++----- .../incrementalOffOn/build.log | 4 +--- .../annotationFlagRemoved/build.log | 4 +--- .../annotationListChanged/build.log | 8 ++----- .../bridgeGenerated/build.log | 4 +--- .../classBecameFinal/build.log | 4 +--- .../classBecameInterface/build.log | 4 +--- .../classBecamePrivate/build.log | 4 +--- .../classToPackageFacade/build.log | 4 +--- .../build.log | 4 +--- .../companionObjectMemberChanged/build.log | 4 +--- .../companionObjectNameChanged/build.log | 4 +--- .../companionObjectToSimpleObject/build.log | 4 +--- .../constructorVisibilityChanged/build.log | 4 +--- .../enumEntryAdded/build.log | 4 +--- .../enumMemberChanged/build.log | 4 +--- .../build.log | 4 +--- .../build.log | 4 +--- .../implcitUpcast/build.log | 4 +--- .../inferredTypeArgumentChanged/build.log | 4 +--- .../inferredTypeChanged/build.log | 4 +--- .../jvmNameChanged/build.log | 4 +--- .../lambdaParameterAffected/build.log | 4 +--- .../methodAdded/build.log | 4 +--- .../methodAnnotationAdded/build.log | 4 +--- .../methodNullabilityChanged/build.log | 4 +--- .../build.log | 4 +--- .../methodRemoved/build.log | 4 +--- .../multiModuleCircular/build.log | 8 ++----- .../multiModuleExported/build.log | 12 +++------- .../multiModuleSimple/build.log | 8 ++----- .../multifilePackagePartMethodAdded/build.log | 4 +--- .../overrideExplicit/build.log | 4 +--- .../overrideImplicit/build.log | 4 +--- .../packageFacadeToClass/build.log | 4 +--- .../propertyNullabilityChanged/build.log | 4 +--- .../sealedClassImplAdded/build.log | 4 +--- .../secondaryConstructorAdded/build.log | 4 +--- .../starProjectionUpperBoundChanged/build.log | 4 +--- .../supertypesListChanged/build.log | 8 ++----- .../typeParameterListChanged/build.log | 4 +--- .../varianceChanged/build.log | 4 +--- .../javaConstantChangedUsedInKotlin/build.log | 4 +--- .../build.log | 4 +--- .../build.log | 4 +--- .../custom/projectPathCaseChanged/build.log | 4 +--- .../projectPathCaseChangedMultiFile/build.log | 4 +--- .../inlineFunCallSite/classProperty/build.log | 4 +--- .../companionObjectProperty/build.log | 4 +--- .../inlineFunCallSite/function/build.log | 4 +--- .../inlineFunCallSite/getter/build.log | 4 +--- .../inlineFunCallSite/lambda/build.log | 4 +--- .../inlineFunCallSite/localFun/build.log | 4 +--- .../inlineFunCallSite/method/build.log | 4 +--- .../parameterDefaultValue/build.log | 4 +--- .../build.log | 4 +--- .../inlineFunCallSite/superCall/build.log | 4 +--- .../inlineFunCallSite/thisCall/build.log | 4 +--- .../topLevelObjectProperty/build.log | 4 +--- .../topLevelProperty/build.log | 4 +--- .../lazyKotlinCaches/class/build.log | 4 +--- .../classInheritance/build.log | 4 +--- .../lazyKotlinCaches/constant/build.log | 4 +--- .../lazyKotlinCaches/function/build.log | 4 +--- .../inlineFunctionWithUsage/build.log | 4 +--- .../inlineFunctionWithoutUsage/build.log | 4 +--- .../topLevelPropertyAccess/build.log | 4 +--- .../circularDependencyClasses/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../constantValueChanged/build.log | 8 ++----- .../defaultParameterAdded/build.log | 8 ++----- .../experimental-ic-build.log | 4 +--- .../build.log | 8 ++----- .../experimental-ic-build.log | 4 +--- .../defaultParameterRemoved/build.log | 8 ++----- .../experimental-ic-build.log | 4 +--- .../build.log | 8 ++----- .../experimental-ic-build.log | 4 +--- .../inlineFunctionInlined/build.log | 4 +--- .../inlineFunctionTwoPackageParts/build.log | 8 ++----- .../multiModule/simpleDependency/build.log | 8 ++----- .../experimental-ic-build.log | 4 +--- .../build.log | 4 +--- .../build.log | 4 +--- .../simpleDependencyUnchanged/build.log | 4 +--- .../transitiveDependency/build.log | 8 ++----- .../experimental-ic-build.log | 4 +--- .../multiModule/transitiveInlining/build.log | 4 +--- .../multiModule/twoDependants/build.log | 12 +++------- .../twoDependants/experimental-ic-build.log | 8 ++----- .../build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../accessingPropertiesViaField/build.log | 4 +--- .../pureKotlin/allConstants/build.log | 8 ++----- .../pureKotlin/annotations/build.log | 4 +--- .../anonymousObjectChanged/build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../changeWithRemovingUsage/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../classInlineFunctionChanged/build.log | 4 +--- .../classObjectConstantChanged/build.log | 4 +--- .../pureKotlin/classRecreated/build.log | 8 ++----- .../classRecreated/experimental-ic-build.log | 8 ++----- .../classSignatureChanged/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../classSignatureUnchanged/build.log | 4 +--- .../build.log | 4 +--- .../build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../pureKotlin/constantRemoved/build.log | 4 +--- .../pureKotlin/constantsUnchanged/build.log | 4 +--- .../pureKotlin/defaultArguments/build.log | 4 +--- .../build.log | 8 ++----- .../build.log | 8 ++----- .../dependencyClassReferenced/build.log | 4 +--- .../filesExchangePackages/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../pureKotlin/functionBecameInline/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../pureKotlin/independentClasses/build.log | 4 +--- .../inlinFunctionUsageAdded/build.log | 4 +--- .../inlineFunctionRemoved/build.log | 4 +--- .../build.log | 4 +--- .../inlineFunctionsUnchanged/build.log | 4 +--- .../pureKotlin/inlineLinesChanged/build.log | 4 +--- .../inlineModifiedWithUsage/build.log | 4 +--- .../inlineTwoFunctionsOneChanged/build.log | 4 +--- .../inlineUsedWhereDeclared/build.log | 8 ++----- .../pureKotlin/internalClassChanged/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../internalMemberInClassChanged/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../pureKotlin/localClassChanged/build.log | 4 +--- .../pureKotlin/mainRedeclaration/build.log | 4 +--- .../pureKotlin/moveClass/build.log | 8 ++----- .../multifileClassFileAdded/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../multifileClassFileChanged/build.log | 4 +--- .../build.log | 4 +--- .../multifileClassInlineFunction/build.log | 4 +--- .../build.log | 4 +--- .../multifileClassRecreated/build.log | 8 ++----- .../build.log | 8 ++----- .../experimental-ic-build.log | 8 ++----- .../multifileClassRemoved/build.log | 4 +--- .../multiplePackagesModified/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../objectConstantChanged/build.log | 4 +--- .../pureKotlin/optionalParameter/build.log | 4 +--- .../pureKotlin/ourClassReferenced/build.log | 8 ++----- .../packageConstantChanged/build.log | 4 +--- .../pureKotlin/packageFileAdded/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../packageFileChangedPackage/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../build.log | 8 ++----- .../experimental-ic-build.log | 8 ++----- .../pureKotlin/packageFileRemoved/build.log | 8 ++----- .../experimental-ic-build.log | 8 ++----- .../packageFilesChangedInTurn/build.log | 12 +++------- .../build.log | 4 +--- .../build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../build.log | 4 +--- .../packagePrivateOnlyChanged/build.log | 4 +--- .../pureKotlin/packageRecreated/build.log | 8 ++----- .../packageRecreatedAfterRenaming/build.log | 8 ++----- .../experimental-ic-build.log | 8 ++----- .../pureKotlin/packageRemoved/build.log | 4 +--- .../privateConstantsChanged/build.log | 4 +--- .../pureKotlin/privateMethodAdded/build.log | 4 +--- .../pureKotlin/privateMethodDeleted/build.log | 4 +--- .../privateMethodSignatureChanged/build.log | 4 +--- .../build.log | 4 +--- .../build.log | 4 +--- .../privateValAccessorChanged/build.log | 4 +--- .../pureKotlin/privateValAdded/build.log | 4 +--- .../pureKotlin/privateValDeleted/build.log | 4 +--- .../privateValSignatureChanged/build.log | 4 +--- .../pureKotlin/privateVarAdded/build.log | 4 +--- .../pureKotlin/privateVarDeleted/build.log | 4 +--- .../privateVarSignatureChanged/build.log | 4 +--- .../pureKotlin/returnTypeChanged/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../simpleClassDependency/build.log | 4 +--- .../soleFileChangesPackage/build.log | 4 +--- .../pureKotlin/subpackage/build.log | 4 +--- .../topLevelFunctionSameSignature/build.log | 4 +--- .../topLevelMembersInTwoFiles/build.log | 4 +--- .../topLevelPrivateValUsageAdded/build.log | 4 +--- .../traitClassObjectConstantChanged/build.log | 4 +--- .../valRemoveCustomAccessor/build.log | 4 +--- .../javaToKotlin/build.log | 4 +--- .../javaToKotlinAndBack/build.log | 8 ++----- .../javaToKotlinAndRemove/build.log | 8 ++----- .../kotlinToJava/build.log | 4 +--- .../kotlinToJava/experimental-ic-build.log | 4 +--- .../changeSignature/build.log | 4 +--- .../constantChanged/build.log | 4 +--- .../build.log | 4 +--- .../methodSignatureChanged/build.log | 4 +--- .../addOptionalParameter/build.log | 4 +--- .../changeNotUsedSignature/build.log | 4 +--- .../constantChanged/build.log | 4 +--- .../constantUnchanged/build.log | 4 +--- .../jvmFieldChanged/build.log | 4 +--- .../jvmFieldUnchanged/build.log | 4 +--- .../notChangeSignature/build.log | 4 +--- .../build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../packageFileAdded/build.log | 4 +--- .../experimental-ic-build.log | 4 +--- .../kotlinUsedInJava/privateChanges/build.log | 4 +--- 230 files changed, 286 insertions(+), 821 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt index 3e840ae2c98..50786edee74 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -28,9 +28,8 @@ class FSOperationsHelper( private val chunk: ModuleChunk, private val log: Logger ) { - private var markedDirty = false - - fun hasMarkedDirty(): Boolean = markedDirty + internal var hasMarkedDirty = false + private set private val buildLogger = compileContext.testingContext?.buildLogger ?: BuildLogger.DO_NOTHING @@ -40,7 +39,7 @@ class FSOperationsHelper( if (file in excludeFiles) return false - markedDirty = true + hasMarkedDirty = true return true } @@ -65,6 +64,6 @@ class FSOperationsHelper( FSOperations.markDirty(compileContext, CompilationRound.NEXT, file) } - markedDirty = markedDirty || filesToMark.isNotEmpty() + hasMarkedDirty = hasMarkedDirty || filesToMark.isNotEmpty() } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e03396e9357..6091b6d5289 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -139,7 +139,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { try { val proposedExitCode = doBuild(chunk, context, dirtyFilesHolder, messageCollector, outputConsumer, fsOperations) - val actualExitCode = if (proposedExitCode == OK && fsOperations.hasMarkedDirty()) ADDITIONAL_PASS_REQUIRED else proposedExitCode + val actualExitCode = if (proposedExitCode == OK && fsOperations.hasMarkedDirty) ADDITIONAL_PASS_REQUIRED else proposedExitCode LOG.info("Build result: " + actualExitCode) @@ -259,8 +259,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return OK } + @Suppress("REIFIED_TYPE_UNSAFE_SUBSTITUTION") val generatedClasses = generatedFiles.filterIsInstance>() - updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses, incrementalCaches) + val additionalPassRequired = updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses, incrementalCaches) if (!IncrementalCompilation.isEnabled()) { return OK @@ -278,7 +279,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { processChanges(filesToCompile.values().toSet(), allCompiledFiles, dataManager, incrementalCaches.values, changesInfo, fsOperations) incrementalCaches.values.forEach { it.cleanDirtyInlineFunctions() } - return ADDITIONAL_PASS_REQUIRED + return if (additionalPassRequired) ADDITIONAL_PASS_REQUIRED else OK } private fun applyActionsOnCacheVersionChange( @@ -369,7 +370,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { LOG.debug("Compiling to JS ${filesToCompile.values().size} files in ${filesToCompile.keySet().joinToString { it.presentableName }}") - return compileToJs(chunk, commonArguments, environment, null, messageCollector, project) + return compileToJs(chunk, commonArguments, environment, messageCollector, project) } if (IncrementalCompilation.isEnabled()) { @@ -475,7 +476,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { filesToCompile: MultiMap, generatedClasses: List>, incrementalCaches: Map - ) { + ): Boolean { val previousMappings = context.projectDescriptor.dataManager.mappings val delta = previousMappings.createDelta() val callback = delta.callback @@ -511,7 +512,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val allCompiled = filesToCompile.values() val compiledInThisRound = if (compilationErrors) listOf() else allCompiled - JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound) + + return JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound) } private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, generatedFiles: List>) { @@ -578,8 +580,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, environment: CompilerEnvironment, - incrementalCaches: MutableMap?, - messageCollector: MessageCollectorAdapter, project: JpsProject + messageCollector: MessageCollectorAdapter, + project: JpsProject ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() @@ -706,7 +708,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { // IDEA can't find these files, and does not display paths in Messages View, so we add the position information // to the error message itself: val pathname = "" + location.path - return if (File(pathname).exists()) "" else " (" + location + ")" + return if (File(pathname).exists()) "" else " ($location)" } private fun kind(severity: CompilerMessageSeverity): BuildMessage.Kind { diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log index 4b2ab8d5d6a..8186bbcbadf 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -29,9 +29,7 @@ End of files Compiling files: module1/src/module1_B.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log index 91109342f98..5481324e411 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log @@ -60,9 +60,7 @@ End of files Compiling files: module2/src/module2_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log index 4f43272ffea..6d9f76555e3 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log @@ -60,9 +60,7 @@ End of files Compiling files: module2/src/module2_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ @@ -94,9 +92,7 @@ Compiling files: module2/src/module2_b.kt module2/src/module2_c.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index 433cdf6c074..cd4b87fa3d1 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -80,9 +80,7 @@ End of files Compiling files: module2/src/module2_b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log index e2668c90752..b607fd0ae73 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved/build.log @@ -41,7 +41,5 @@ Compiling files: src/useAnn1Fun.kt src/useAnn1Val.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log index 09d2eba3775..90734c31c1f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged/build.log @@ -48,9 +48,7 @@ Compiling files: src/returnType.kt src/returnTypeImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -104,7 +102,5 @@ Compiling files: src/returnType.kt src/returnTypeImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log index 4e76ee1ee21..75ce0f50b92 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated/build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/useAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log index 9391232af5c..1d81d372079 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal/build.log @@ -73,7 +73,5 @@ Compiling files: src/returnType.kt src/returnTypeImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log index a25bda3a216..da9c695e793 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log @@ -78,7 +78,5 @@ Compiling files: src/returnType.kt src/returnTypeImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log index 9f7a1fba93d..cedab0eaa5d 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -89,7 +89,5 @@ Compiling files: src/returnType.kt src/returnTypeImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log index a44d8a257f7..c1a17799b80 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log @@ -66,7 +66,5 @@ Compiling files: src/getAChild.kt src/useJ.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log index d9f69df7d35..dfb126785da 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log @@ -51,7 +51,5 @@ Compiling files: src/companionReferenceImplicit.kt src/importedMember.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log index f2469043cb1..ebeff233c5f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log @@ -48,7 +48,5 @@ Compiling files: src/companionReferenceImplicit.kt src/importedMember.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log index 9c7ada70a86..4778e3423c4 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged/build.log @@ -42,7 +42,5 @@ Compiling files: src/companionReferenceExplicit.kt src/companionReferenceImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log index 423183272e3..32bc9b36144 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log @@ -40,7 +40,5 @@ Compiling files: src/companionReferenceExplicit.kt src/companionReferenceImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log index 91327dbb087..d485c85a260 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log @@ -36,7 +36,5 @@ Compiling files: src/AChild.kt src/createA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log index 2a0e33757db..b8d96cbc562 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -39,7 +39,5 @@ Compiling files: src/use.kt src/useEnumImplicitly.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log index d78d7348f36..a4e3a6d15e8 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log @@ -31,7 +31,5 @@ Compiling files: src/Enum.kt src/useBecameNullable.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log index 92e70b17f06..6e452d4e087 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged/build.log @@ -27,7 +27,5 @@ Compiling files: src/importAChild.kt src/useB.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index e8d2e5aae66..a8ac9c69ed3 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -70,7 +70,5 @@ Compiling files: src/useA.kt src/useB.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log index 6d19b918639..b5acda80c81 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast/build.log @@ -48,7 +48,5 @@ Compiling files: src/getB.kt src/getC.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log index ab98f3636ab..ee2b0711e9a 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log @@ -51,7 +51,5 @@ Compiling files: src/useListOfAWithListOfB.kt src/useListOfAWithListOfC.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log index ae6300b6b77..c579b21600e 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/build.log @@ -32,7 +32,5 @@ Compiling files: src/getC.kt src/getCorD.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log index 889c979f9de..fc282e041ab 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/jvmNameChanged/build.log @@ -20,7 +20,5 @@ Compiling files: src/AChild.kt src/useAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log index beed6e444e4..def5bbc388c 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/build.log @@ -46,7 +46,5 @@ Compiling files: src/useConsumeBExtLambda.kt src/useConsumeBLambda.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log index 889c979f9de..fc282e041ab 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAdded/build.log @@ -20,7 +20,5 @@ Compiling files: src/AChild.kt src/useAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log index 889c979f9de..fc282e041ab 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded/build.log @@ -20,7 +20,5 @@ Compiling files: src/AChild.kt src/useAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log index 994c844f101..aaa57fbc2e4 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log @@ -35,7 +35,5 @@ Compiling files: src/AChild.kt src/useAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log index 889c979f9de..fc282e041ab 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded/build.log @@ -20,7 +20,5 @@ Compiling files: src/AChild.kt src/useAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log index 425add15df3..89ea52f71f9 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved/build.log @@ -21,7 +21,5 @@ Compiling files: src/AChild.kt src/useAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log index 0fb83223d2a..f73f3de34d0 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -61,9 +61,7 @@ End of files Compiling files: module4/src/module4_E.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module5/foo/F.class @@ -71,7 +69,5 @@ End of files Compiling files: module5/src/module5_F.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log index 5844211fd39..172203c7fdc 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -47,9 +47,7 @@ Exit code: NOTHING_DONE Compiling files: module2/src/module2_AChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/foo/AGrandChild.class @@ -58,14 +56,10 @@ Compiling files: module3/src/module3_AGrandChild.kt module3/src/module3_importAGrandChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Compiling files: module4/src/module4_importAGrandChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log index ad91bd5abec..8e64961e1d0 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -48,14 +48,10 @@ Compiling files: module2/src/module2_AChild.kt module2/src/module2_importA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Compiling files: module3/src/module3_importAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log index d0d70b5b36a..86910844d44 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multifilePackagePartMethodAdded/build.log @@ -28,7 +28,5 @@ Compiling files: src/useFooF.kt src/useFooG.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log index 2e8beb3d729..9312d975657 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit/build.log @@ -30,7 +30,5 @@ Compiling files: src/A.kt src/B.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log index 36d30493ebe..062678e016f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log @@ -30,7 +30,5 @@ Compiling files: src/B.kt src/BA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log index efc79dc6100..7793e1ea931 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/packageFacadeToClass/build.log @@ -45,10 +45,8 @@ Compiling files: src/useF.kt src/useG.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/UseFJava.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log index 36db4e07e4a..260a3c78c3e 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log @@ -36,7 +36,5 @@ Compiling files: src/AChild.kt src/useAChild.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log index 878d67343d0..eaaa6d520ec 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log @@ -36,7 +36,5 @@ Compiling files: src/Base.kt src/use.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index 8c4ff368732..1cc2b929b61 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -40,7 +40,5 @@ Compiling files: src/createAFromString.kt src/useA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log index 77ceb6655e5..dc56fb5ef5d 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged/build.log @@ -23,7 +23,5 @@ Compiling files: src/CallGetAStar.kt src/getAStar.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log index e8071f62b2b..03c2b4f77a5 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged/build.log @@ -49,9 +49,7 @@ Compiling files: src/returnType.kt src/returnTypeImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -104,7 +102,5 @@ Compiling files: src/returnType.kt src/returnTypeImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log index 714c14a60a8..3064a4ed62a 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log @@ -82,7 +82,5 @@ Compiling files: src/returnType.kt src/returnTypeImplicit.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log index 14c0ce52c7f..43cd1930bf1 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged/build.log @@ -41,7 +41,5 @@ Compiling files: src/useA.kt src/useD.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log index f2c35bc9fee..3d1ff1d5deb 100644 --- a/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/custom/javaConstantChangedUsedInKotlin/build.log @@ -14,7 +14,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log index 9b0defb6ab8..51a3c22c851 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log index 9b0defb6ab8..51a3c22c851 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log index fca42823651..3132368d7eb 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChanged/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/foo.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log index fca42823651..3132368d7eb 100644 --- a/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log +++ b/jps/jps-plugin/testData/incremental/custom/projectPathCaseChangedMultiFile/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/foo.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log index e057a031f08..c9d1b22852b 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/Usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log index 756700a0864..1dc3c981ab9 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/Usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log index 605fdce7dfa..98c5e9ece93 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log index a009c693c0c..3aee88769ec 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log @@ -21,7 +21,5 @@ Compiling files: src/Usage.kt src/topLevelUsage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log index 3adb6d9df8a..83eeb570cc5 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log @@ -19,7 +19,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log index f0ba63a008b..5c109d067c3 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log @@ -19,7 +19,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log index e057a031f08..c9d1b22852b 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/Usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log index 605fdce7dfa..98c5e9ece93 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log index e057a031f08..c9d1b22852b 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/Usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log index e057a031f08..c9d1b22852b 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/Usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log index e057a031f08..c9d1b22852b 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/Usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log index e057a031f08..c9d1b22852b 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/Usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log index 605fdce7dfa..98c5e9ece93 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log index 012b093d7f0..b24880f3547 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/A.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log index 146bfdd4969..095763a2b7d 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/build.log @@ -8,7 +8,5 @@ End of files Compiling files: src/main.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log index f0e02d57a49..150f8fc1913 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log @@ -18,7 +18,5 @@ Compiling files: src/constant.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log index 23a4ee54d76..7ea9f6c3940 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/utils.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log index 605fdce7dfa..98c5e9ece93 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log index 6546c954a20..21a15a07f99 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/inline.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log index 3ab059e9055..45266a8def6 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/constant.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log index a888cb3fb72..aae52d91530 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log @@ -16,7 +16,5 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log index b729d063db7..62a6f378609 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log @@ -18,7 +18,5 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index 4d6d24a3a93..a1121057132 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -7,7 +7,5 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index b41955ec39b..49b9b6ede95 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -17,7 +17,5 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log index 2c7a9936530..5bf4d44488b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log @@ -7,7 +7,5 @@ End of files Compiling files: module2/src/module2_b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log index a30af0b8efc..80367355c9a 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -24,7 +24,5 @@ End of files Compiling files: module1/src/module1_c1.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log index 6958358e437..5f2902249a4 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log @@ -9,7 +9,5 @@ Compiling files: module1/src/module1_a.kt module1/src/module1_c2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index c212936485f..1bd171646e7 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -16,9 +16,7 @@ End of files Compiling files: module1/src/module1_const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/usage/Usage.class @@ -26,7 +24,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log index 0b03e5add20..461fca20478 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log @@ -6,9 +6,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -17,7 +15,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log index e763a6d122f..c66be0707fa 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log @@ -19,7 +19,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log index 62d91cad136..a59a38584ff 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log @@ -7,9 +7,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -18,7 +16,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log index e6e83159a7c..8057ad99b15 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log @@ -20,7 +20,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log index 0b03e5add20..461fca20478 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log @@ -6,9 +6,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -17,7 +15,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log index e763a6d122f..c66be0707fa 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log @@ -19,7 +19,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log index 62d91cad136..a59a38584ff 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log @@ -7,9 +7,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -18,7 +16,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log index e6e83159a7c..8057ad99b15 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log @@ -20,7 +20,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index 66c221387c3..e2d78e0affb 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -20,7 +20,5 @@ End of files Compiling files: module2/src/module2_usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index 33a02063e39..111b7e68719 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -20,9 +20,7 @@ End of files Compiling files: module2/src/module2_usageF.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -47,7 +45,5 @@ End of files Compiling files: module2/src/module2_usageG.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index 5619972f123..e7962572eca 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -8,9 +8,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -19,7 +17,5 @@ End of files Compiling files: module2/src/module2_b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log index 6904fa0746f..c7045de8aab 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log @@ -21,7 +21,5 @@ End of files Compiling files: module2/src/module2_b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index 57423092b1c..efea0e1b9ce 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -10,9 +10,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log index b884be2bc90..8808e560689 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log @@ -11,9 +11,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index 8c075f8eb19..888b57a1c66 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -8,9 +8,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index faac8132f41..0a7146547b9 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -8,9 +8,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -19,9 +17,7 @@ End of files Compiling files: module2/src/module2_b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log index 4974337be4b..73b0b03f420 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log @@ -21,9 +21,7 @@ End of files Compiling files: module2/src/module2_b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 1c02e469d07..23ad69e9bbc 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -33,7 +33,5 @@ End of files Compiling files: module3/src/module3_c.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index 2fce90018fd..c5d46a2cdad 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -8,9 +8,7 @@ End of files Compiling files: module1/src/module1_a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module @@ -19,9 +17,7 @@ End of files Compiling files: module3/src/module3_c.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -30,7 +26,5 @@ End of files Compiling files: module2/src/module2_b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log index 7a2cd1c6685..99c74cffa62 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log @@ -22,9 +22,7 @@ End of files Compiling files: module3/src/module3_c.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module @@ -33,7 +31,5 @@ End of files Compiling files: module2/src/module2_b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log index 524251631b5..b165b6aac08 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaPackagePart/build.log @@ -9,7 +9,5 @@ Compiling files: src/b.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log index 0d35c519654..5fdf7c1b9cc 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/build.log @@ -20,7 +20,5 @@ Compiling files: src/other.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log index 9b27584341c..d0f049c8713 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingFunctionsViaRenamedFileClass/experimental-ic-build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log index 524251631b5..b165b6aac08 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/accessingPropertiesViaField/build.log @@ -9,7 +9,5 @@ Compiling files: src/b.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index 77636324b50..cf60e2e8822 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -7,9 +7,7 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -32,7 +30,5 @@ Compiling files: src/const.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log index a4737464d9c..ce955a3768c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/annotations/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/other.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log index b59883cc54e..ccfe1e400ac 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/anonymousObjectChanged/build.log @@ -8,7 +8,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log index 7274a7f8732..36487c59f20 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/build.log @@ -16,7 +16,5 @@ End of files Compiling files: src/usage2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log index 8b3290c7b7e..a958ab5ed8f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeTypeImplicitlyWithCircularDependency/experimental-ic-build.log @@ -29,7 +29,5 @@ End of files Compiling files: src/usage1.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log index 1eedc32fd9a..d7c03378370 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/build.log @@ -10,7 +10,5 @@ End of files Compiling files: src/foo.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log index 1eedc32fd9a..d7c03378370 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log @@ -10,7 +10,5 @@ End of files Compiling files: src/foo.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log index f68d7db9a4b..e2309cc51dd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index e27367a0216..17964e4fe92 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -18,7 +18,5 @@ Compiling files: src/const.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log index d308252c746..bad1fc16aa9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/build.log @@ -14,9 +14,7 @@ End of files Compiling files: src/other.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -33,7 +31,5 @@ End of files Compiling files: src/other.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log index 8f513eb5955..d74096ec08b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRecreated/experimental-ic-build.log @@ -5,9 +5,7 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -15,7 +13,5 @@ Exit code: NOTHING_DONE Compiling files: src/A.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log index 0ebc60160da..dec1e35b4f8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/build.log @@ -15,7 +15,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log index 02ab1e4dfbe..84d1cdafe6f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureChanged/experimental-ic-build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log index 130aec8bf7d..f48076f22fb 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classSignatureUnchanged/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/class.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log index af23ce40d8c..debae4135b3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedOtherPackage/build.log @@ -17,7 +17,5 @@ Expecting an expression Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log index 426f2bf8734..c172058ffda 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedSamePackage/build.log @@ -17,7 +17,5 @@ Expecting an expression Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log index 54292ca8f44..1529b7328e6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/build.log @@ -29,7 +29,5 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log index d2ed8cd2114..6a249e3d749 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart/experimental-ic-build.log @@ -20,7 +20,5 @@ Expecting an expression Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log index 2a472b9ed95..0a51d3fc3ac 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/build.log @@ -29,7 +29,5 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log index 706b4bf2f1b..ed84bb8e478 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart2/experimental-ic-build.log @@ -20,7 +20,5 @@ Compiling files: src/other.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log index e088fbc259b..bafc9adc1bd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/build.log @@ -33,7 +33,5 @@ Compiling files: src/likePart.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log index eb447620edc..53cfd43669b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log @@ -29,7 +29,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log index 80bfb1c0f3f..85fd6b8ac98 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantRemoved/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index 80b7cf4c0e6..7e05c0aef73 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -9,7 +9,5 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log index 70b27607138..7ff4e7fca9b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log index e83f238da35..3de05e9c23a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/build.log @@ -20,9 +20,7 @@ Compiling files: src/UsageVal.kt src/UsageVar.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -44,7 +42,5 @@ End of files Compiling files: src/UsageVar.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log index 2923f2a7da7..d11c5b74875 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/build.log @@ -19,9 +19,7 @@ Compiling files: src/UsageVal.kt src/UsageVar.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -42,7 +40,5 @@ End of files Compiling files: src/UsageVar.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log index 2db1685b6ed..eef6764ff16 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log index 4e7ba492bf2..68a5e63cff8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log index eeef65fb509..669e2b72119 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/filesExchangePackages/experimental-ic-build.log @@ -9,7 +9,5 @@ Compiling files: src/b.kt src/c.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log index 40033d1b189..371bc7cb855 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/build.log @@ -15,7 +15,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log index 5c5e42401e3..10803d22f67 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/functionBecameInline/experimental-ic-build.log @@ -17,7 +17,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log index 85f980fdf52..671ed4c9ac5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/Foo.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log index 05629416ce0..3ebcf40cc65 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinFunctionUsageAdded/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log index 6546c954a20..21a15a07f99 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/inline.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log index a38ca90369b..1a5df786f0d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/build.log @@ -29,7 +29,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log index b416fb87163..3048feceb65 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsUnchanged/build.log @@ -8,7 +8,5 @@ End of files Compiling files: src/inline.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log index fd55a2e97b7..c1da0ac53cd 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/useG.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log index de381d502ae..324a693c886 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineModifiedWithUsage/build.log @@ -9,7 +9,5 @@ Compiling files: src/inline.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log index 13765f5e93f..d5bbb4e2256 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/usesG.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log index 899c4f0cf8e..0dd2fd08c98 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/build.log @@ -7,9 +7,7 @@ End of files Compiling files: src/inline.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -21,7 +19,5 @@ End of files Compiling files: src/inline.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log index e9b07876be0..8af6b65b4d0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/build.log @@ -14,7 +14,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalClassChanged/experimental-ic-build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log index e9b07876be0..8af6b65b4d0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/build.log @@ -14,7 +14,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/internalMemberInClassChanged/experimental-ic-build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log index b6484791f7e..c325a276023 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/localClassChanged/build.log @@ -8,7 +8,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log index 2c43fd42bde..9758c44ea24 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/mainRedeclaration/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log index 7c58ff5f3ea..dd9aff0f44c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log @@ -6,9 +6,7 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -18,7 +16,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log index 7ebd66e360a..76d714665b2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/build.log @@ -13,7 +13,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log index 933d4645539..2fb46435909 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/experimental-ic-build.log @@ -3,7 +3,5 @@ Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log index 91cffd9bfe6..0aeeb8ca95f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/build.log @@ -8,7 +8,5 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log index c19d6abca0d..2a6f3372739 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log index dde3710b421..5a7cd69239a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunction/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log index dde3710b421..5a7cd69239a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassInlineFunctionAccessingField/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log index 1bfcb07e99f..6b8c48454ee 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreated/build.log @@ -7,9 +7,7 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -17,7 +15,5 @@ Exit code: NOTHING_DONE Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log index 3d81a9c0056..71c297533a5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/build.log @@ -8,9 +8,7 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -28,7 +26,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log index 542f49dddf8..654861fc4c1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRecreatedAfterRenaming/experimental-ic-build.log @@ -8,9 +8,7 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -18,7 +16,5 @@ Exit code: NOTHING_DONE Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log index dd8ffb41943..0549585e040 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log @@ -10,7 +10,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log index 1db8ac9f0b2..32dee0bfdc1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/build.log @@ -18,7 +18,5 @@ Compiling files: src/a1.kt src/b1.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log index 0a62d657079..e4510f053f8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multiplePackagesModified/experimental-ic-build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/a2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log index 3d12ce923b0..d4fc7b2018b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -16,7 +16,5 @@ Compiling files: src/const.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log index a4737464d9c..ce955a3768c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/optionalParameter/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/other.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log index 72bf5a4b07a..d636aedc54e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/ourClassReferenced/build.log @@ -7,9 +7,7 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -23,7 +21,5 @@ Compiling files: src/Klass.kt src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index ef636a15241..0f23479c090 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -18,7 +18,5 @@ Compiling files: src/const.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log index 7bce5305d30..28d9ce5c1a6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/build.log @@ -12,7 +12,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log index 933d4645539..2fb46435909 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileAdded/experimental-ic-build.log @@ -3,7 +3,5 @@ Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log index 8fd0d95044c..bc8c479e933 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/build.log @@ -16,7 +16,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log index 27fdbcc833d..9c5c0846c6b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedPackage/experimental-ic-build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log index 6be309eb468..c5fb35ce4e4 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/build.log @@ -7,9 +7,7 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -29,7 +27,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log index b509bb38363..da15fc4665c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileChangedThenOtherRemoved/experimental-ic-build.log @@ -7,9 +7,7 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -20,7 +18,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log index 171f3530f9c..7a88d57727c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/build.log @@ -17,9 +17,7 @@ Compiling files: src/a.kt src/other.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -31,7 +29,5 @@ End of files Compiling files: src/other.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log index 67f143f6ce8..0bae0872097 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFileRemoved/experimental-ic-build.log @@ -6,9 +6,7 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -20,7 +18,5 @@ End of files Compiling files: src/other.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log index fabaab4ef3c..792c4cff026 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/build.log @@ -7,9 +7,7 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -21,9 +19,7 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #3 ================= @@ -35,7 +31,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log index dde3710b421..5a7cd69239a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionAccessingField/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log index dde3710b421..5a7cd69239a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageInlineFunctionFromOurPackage/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log index d7673adff66..fecba542c23 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log index 58b744035c1..66ffa3ed402 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassOneFileWithPublicChanges/experimental-ic-build.log @@ -10,7 +10,5 @@ Compiling files: src/pkg1.kt src/pkg2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log index 58b744035c1..66ffa3ed402 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageMultifileClassPrivateOnlyChanged/build.log @@ -10,7 +10,5 @@ Compiling files: src/pkg1.kt src/pkg2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log index e8d7c491ec0..345e3083078 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packagePrivateOnlyChanged/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/pkg.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log index 3cfb7bc250e..8071b786706 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreated/build.log @@ -6,9 +6,7 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -16,7 +14,5 @@ Exit code: NOTHING_DONE Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log index acf340cfc9d..a1eaee6f95c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/build.log @@ -7,9 +7,7 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -26,7 +24,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log index b3ff7edc754..31068d6310a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRecreatedAfterRenaming/experimental-ic-build.log @@ -7,9 +7,7 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -17,7 +15,5 @@ Exit code: NOTHING_DONE Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index f74030f2601..c71c9f3e205 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -9,7 +9,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log index ca875f5571b..8e7eba93448 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/build.log @@ -10,7 +10,5 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodAdded/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodDeleted/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateMethodSignatureChanged/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorAdded/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateSecondaryConstructorDeleted/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAccessorChanged/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValAdded/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValDeleted/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateValSignatureChanged/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarAdded/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarDeleted/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/privateVarSignatureChanged/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log index 918b0d771bd..1a655050bc7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/build.log @@ -16,7 +16,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log index 9e8412c4e72..bd047404e08 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/experimental-ic-build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log index 503c9c24ede..71e757e4d58 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/simpleClassDependency/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/Foo.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log index 2c43fd42bde..9758c44ea24 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/soleFileChangesPackage/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log index bd49eb37022..2acccf6a6be 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/subpackage/build.log @@ -8,7 +8,5 @@ End of files Compiling files: src/nested.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log index efe2e78b6d4..0aba103dd32 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log index 2db1685b6ed..eef6764ff16 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log index 3325ed95079..ff9f8b0eba6 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log @@ -17,7 +17,5 @@ Cannot access 'foo': it is 'private' in file Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 15cfe2974fc..d840f5a96b1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -18,7 +18,5 @@ Compiling files: src/const.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log index 3fce05dd620..96b7b7bbbf1 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log @@ -21,7 +21,5 @@ Compiling files: src/A.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log index 0ebb195d867..689280d2908 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/build.log @@ -16,10 +16,8 @@ End of files Compiling files: src/usageInKotlin.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index d7f61bb3fd6..f8d413cf6ce 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -20,9 +20,7 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -37,10 +35,8 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/Foo.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log index 0befdcaf1b9..5b9f74cd080 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log @@ -6,9 +6,7 @@ End of files Compiling files: src/TheClass.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ ================ Step #2 ================= @@ -18,7 +16,5 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log index df40b311c98..3545f9d40b4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/build.log @@ -18,10 +18,8 @@ End of files Compiling files: src/usageInKotlin.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log index fa7422b1dcd..ed11991db05 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava/experimental-ic-build.log @@ -20,10 +20,8 @@ End of files Compiling files: src/usageInKotlin.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log index a9c6f15e5a5..6acfcd2c480 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature/build.log @@ -15,7 +15,5 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log index e6beb2dc221..93d2d828a73 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged/build.log @@ -15,10 +15,8 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/JavaClass.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log index 77974661009..b00a2ba28a7 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/build.log @@ -8,10 +8,8 @@ End of files Compiling files: src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/JavaClass.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log index ea4b8a311c2..4d218e28ba1 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged/build.log @@ -20,7 +20,5 @@ Compiling files: src/usageWithFunctionExpression.kt src/usageWithFunctionLiteral.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log index f99f5428e2a..0e565678f1c 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/build.log @@ -17,10 +17,8 @@ End of files Compiling files: src/other.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/JavaUsage.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log index efe2e78b6d4..0aba103dd32 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index a19d4dbe165..9cb04b4d7c1 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -17,10 +17,8 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log index 9b0defb6ab8..51a3c22c851 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log index a19d4dbe165..9cb04b4d7c1 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log @@ -17,10 +17,8 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log index 9b0defb6ab8..51a3c22c851 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/const.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log index efe2e78b6d4..0aba103dd32 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log index 8fd0d95044c..bc8c479e933 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/build.log @@ -16,7 +16,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log index 27fdbcc833d..9c5c0846c6b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/experimental-ic-build.log @@ -7,7 +7,5 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log index 5f2c173e692..6d4990d4f88 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/build.log @@ -18,7 +18,5 @@ End of files Compiling files: src/a.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log index 1a206fb87d6..674ffb38d8f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/experimental-ic-build.log @@ -6,10 +6,8 @@ End of files Compiling files: src/b.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Compiling files: src/Usage.java End of files -Exit code: NOTHING_DONE ------------------------------------------- diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log index 4006a9a7cf3..c6433f94cf9 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/build.log @@ -6,7 +6,5 @@ End of files Compiling files: src/ClassA.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Exit code: NOTHING_DONE +Exit code: OK ------------------------------------------ From 74de0e6e7cc45b3dafd01cefde9d2460b979f4b0 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 18 Nov 2015 19:22:32 +0300 Subject: [PATCH 0796/1557] New IC: add processing changes for constants Original commit: ced23c02bd0bb81d49ccf9610d4dcb40fda9f9d3 --- .../constant/experimental-ic-build.log | 24 +++++++++++++ .../experimental-ic-build.log | 30 ++++++++++++++++ .../allConstants/experimental-ic-build.log | 36 +++++++++++++++++++ .../experimental-ic-build.log | 24 +++++++++++++ 4 files changed, 114 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/allConstants/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/experimental-ic-build.log diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-ic-build.log new file mode 100644 index 00000000000..efacb1f6e61 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-ic-build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/constant/ConstantKt.class +End of files +Compiling files: + src/constant.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/constant/ConstantKt.class + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/constant.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log new file mode 100644 index 00000000000..26e3e9444c3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log @@ -0,0 +1,30 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/test/Module1_constKt.class +End of files +Compiling files: + module1/src/module1_const.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/test/Module1_constKt.class +End of files +Compiling files: + module1/src/module1_const.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/usage/Usage.class +End of files +Compiling files: + module2/src/module2_usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/experimental-ic-build.log new file mode 100644 index 00000000000..2b59cc2ecff --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/experimental-ic-build.log @@ -0,0 +1,36 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class +End of files +Compiling files: + src/const.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class +End of files +Compiling files: + src/const.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class + out/production/module/test/Usage.class +End of files +Compiling files: + src/const.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/experimental-ic-build.log new file mode 100644 index 00000000000..5df3e1b0c32 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/experimental-ic-build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class +End of files +Compiling files: + src/const.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/ConstKt.class + out/production/module/test/Usage.class +End of files +Compiling files: + src/const.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ From 46253721f1612b13986df2999b9e0b08cdb514f5 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 10 Feb 2016 18:43:48 +0300 Subject: [PATCH 0797/1557] Minor: drop content from touch files Original commit: 45f21bc7fda34a19d02d3ba2d74cb0f0069c4152 --- .../cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 | 1 - .../clearedHasKotlin/module1_C.java.touch.1 | 1 - .../cacheVersionChanged/touchedOnlyJavaFile/A.java.touch | 1 - .../incremental/pureKotlin/independentClasses/Foo.kt.touch | 2 -- .../pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 | 3 --- 5 files changed, 8 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 index fb7337ede5b..e69de29bb2d 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_A.kt.touch.2 @@ -1 +0,0 @@ -class A \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 index f9822136b3d..e69de29bb2d 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/module1_C.java.touch.1 @@ -1 +0,0 @@ -class C {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch index 37bdd2221a7..e69de29bb2d 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/A.java.touch @@ -1 +0,0 @@ -class A {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch index de4f811f0b1..e69de29bb2d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch +++ b/jps/jps-plugin/testData/incremental/pureKotlin/independentClasses/Foo.kt.touch @@ -1,2 +0,0 @@ -package test -class Foo \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 index a36b6841040..e69de29bb2d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageFilesChangedInTurn/a.kt.touch.3 @@ -1,3 +0,0 @@ -package test - -fun a() = "aa" From cb985c0d139f9e122edbc5d65edb4928384be2b8 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 10 Feb 2016 14:44:47 +0300 Subject: [PATCH 0798/1557] Effective visibility: concise diagnostic messages #KT-10761 Fixed Also #KT-9760 Fixed Original commit: 1bbc46729cfad57a378628c4d9a33043cabbe31a --- .../errors.txt | 8 ++++---- .../general/InternalFromAnotherModule/errors.txt | 6 +++--- .../classBecamePrivate/build.log | 12 ++++++------ .../flagsAndMemberInSameClassChanged/build.log | 4 ++-- .../multiModuleExported/build.log | 2 +- .../multiModuleSimple/build.log | 2 +- .../build.log | 2 +- .../experimental-ic-build.log | 2 +- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index 16909f08763..de432978151 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -1,10 +1,10 @@ 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14 +'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 +'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 +'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 Cannot access 'InternalClass2': it is 'internal' in 'test' at line 19, column 15 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 Cannot access 'InternalFileAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 18, column 36 -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 19, column 15 -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 8, column 36 \ No newline at end of file +Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index 6da24d6c7e8..9627524678f 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,8 +1,8 @@ 'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14 +'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 +'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 Cannot access 'InternalTestAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 18, column 36 -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'internal' at line 8, column 36 \ No newline at end of file +Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log index cedab0eaa5d..51b1fa9217c 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -52,22 +52,22 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Cannot access 'A': it is 'private' in file -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' -Generic effective visibility 'public' should be the same or less permissive than its type parameter bound effective visibility 'private' +'public' subclass exposes its 'private' supertype A +'public' generic exposes its 'private' parameter bound type A Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file -Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'private' +'public' function exposes its 'private' parameter type A Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file -Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' +'public' function exposes its 'private' return type A Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file -Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' +'public' function exposes its 'private' return type A Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file -Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' +'public' function exposes its 'private' return type A ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index a8ac9c69ed3..2856771b984 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -33,8 +33,8 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Cannot access 'A': it is 'private' in file -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' -Function effective visibility 'public' should be the same or less permissive than its return type effective visibility 'private' +'public' subclass exposes its 'private' supertype A +'public' function exposes its 'private' return type A Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log index 172203c7fdc..23d3560344a 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -25,7 +25,7 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Cannot access 'A': it is 'private' in file -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' +'public' subclass exposes its 'private' supertype A ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log index 8e64961e1d0..fe2e77d7cc9 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -25,7 +25,7 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Cannot access 'A': it is 'private' in file -Subclass effective visibility 'public' should be the same or less permissive than its superclass effective visibility 'private' +'public' subclass exposes its 'private' supertype A Cannot access 'A': it is 'private' in file ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index efea0e1b9ce..97d0b6d11e8 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -28,6 +28,6 @@ Cannot access 'A': it is 'internal' in 'a' Cannot access 'FileAnnotation': it is 'internal' in 'a' Cannot access 'ClassAnnotation': it is 'internal' in 'a' Cannot access 'ClassAnnotation': it is 'internal' in 'a' -Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'internal' +'public' function exposes its 'internal' parameter type A Cannot access 'A': it is 'internal' in 'a' Cannot access 'a': it is 'internal' in 'a' diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log index c105d8ab425..b4c4f0f17d3 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log @@ -32,6 +32,6 @@ Cannot access 'A': it is 'internal' in 'a' Cannot access 'FileAnnotation': it is 'internal' in 'a' Cannot access 'ClassAnnotation': it is 'internal' in 'a' Cannot access 'ClassAnnotation': it is 'internal' in 'a' -Function effective visibility 'public' should be the same or less permissive than its parameter type effective visibility 'internal' +'public' function exposes its 'internal' parameter type A Cannot access 'A': it is 'internal' in 'a' Cannot access 'a': it is 'internal' in 'a' From cc99898fed8c694c8053b0771391004d60c0b5db Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Tue, 16 Feb 2016 18:58:14 +0300 Subject: [PATCH 0799/1557] Update copyright in generated tests. Original commit: 341b251e4d04846e7d6e9930ae9bb63c244faad3 --- .../jps/build/DataContainerVersionChangedTestGenerated.java | 2 +- .../build/ExperimentalChangeIncrementalOptionTestGenerated.java | 2 +- ...ExperimentalIncrementalCacheVersionChangedTestGenerated.java | 2 +- .../jps/build/ExperimentalIncrementalJpsTestGenerated.java | 2 +- .../build/ExperimentalIncrementalLazyCachesTestGenerated.java | 2 +- .../jps/build/IncrementalCacheVersionChangedTestGenerated.java | 2 +- .../jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java | 2 +- .../kotlin/jps/build/IncrementalLazyCachesTestGenerated.java | 2 +- .../jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java | 2 +- .../kotlin/jps/incremental/ProtoComparisonTestGenerated.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java index 6c97d1c0b7a..a947b388dea 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java index dcef0a52da9..e2df8e95f7e 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java index ceb8648cf91..95249af06ee 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index ab67536190b..99e59a204cc 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java index 0a61111e4b0..2672e118453 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index 8ca46395714..6b639125feb 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 0d2f97b7183..80c2bd6ca57 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index a84128bbfb3..f506138e00d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index fa4d89c14a3..f6e6133b449 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 4269b47f0ac..8cd04959b04 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. From e99513da07ca0fa8136156f765462024a168a4ae Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 11 Feb 2016 23:07:41 +0300 Subject: [PATCH 0800/1557] New IC: don't fail on unsupported difference kinds and process SUPERTYPE_ID_LIST correctly Original commit: 05eff9028f7b75c087986a4ed79a1108a91fce36 --- .../jps/build/incrementalCustomTests.kt | 31 +++++++++++++++++++ .../incremental/custom/renameModule/build.log | 18 +++++++++++ .../incremental/custom/renameModule/test.kt | 5 +++ .../custom/renameModule/test.kt.touch | 0 .../custom/renameModule/unrelated.kt | 4 +++ .../incremental/custom/renameModule/usage.kt | 6 ++++ 6 files changed, 64 insertions(+) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/build.log create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/test.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt create mode 100644 jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt new file mode 100644 index 00000000000..d5c0af29a9e --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt @@ -0,0 +1,31 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.build + +open class IncrementalRenameModuleTest : AbstractIncrementalJpsTest() { + fun testRenameModule() { + doTest("jps-plugin/testData/incremental/custom/renameModule/") + } + + override fun performAdditionalModifications(modifications: List) { + projectDescriptor.project.modules.forEach { it.name += "Renamed" } + } +} + +class ExperimentalIncrementalRenameModuleTest : IncrementalRenameModuleTest() { + override val enableExperimentalIncrementalCompilation = true +} diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/build.log b/jps/jps-plugin/testData/incremental/custom/renameModule/build.log new file mode 100644 index 00000000000..5b9b113b83b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/build.log @@ -0,0 +1,18 @@ +================ Step #1 ================= + +Compiling files: + src/test.kt + src/unrelated.kt + src/usage.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/moduleRenamed/META-INF/moduleRenamed.kotlin_module + out/production/moduleRenamed/test/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt new file mode 100644 index 00000000000..e10864dc984 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt @@ -0,0 +1,5 @@ +package test + +class Foo + +fun bar() {} diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch b/jps/jps-plugin/testData/incremental/custom/renameModule/test.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt new file mode 100644 index 00000000000..8a9fa61e315 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/unrelated.kt @@ -0,0 +1,4 @@ +package unrelated + +fun doSomething() { +} diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt b/jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt new file mode 100644 index 00000000000..7805cf82546 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/usage.kt @@ -0,0 +1,6 @@ +package test + +fun usage() { + Foo() + bar() +} From 998dfacd5f4bd4aa4edad0e13bd02e74893819ab Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 19 Feb 2016 16:48:00 +0300 Subject: [PATCH 0801/1557] KotlinBuilder: use proper API to update Java mappings Original commit: d832a3d2906ae1bbfbf56bb6a7b4283bff4e2a0a --- .../kotlin/jps/build/KotlinBuilder.kt | 15 ++++++------ .../lazyKotlinCaches/constant/build.log | 2 -- .../constantValueChanged/build.log | 9 +------ .../pureKotlin/allConstants/build.log | 3 --- .../classObjectConstantChanged/build.log | 3 --- .../experimental-ic-build.log | 22 +++++++++++++++++ .../pureKotlin/classRedeclaration/build.log | 2 +- .../experimental-ic-build.log | 2 +- .../experimental-ic-build.log | 22 +++++++++++++++++ .../objectConstantChanged/build.log | 2 -- .../experimental-ic-build.log | 20 ++++++++++++++++ .../packageConstantChanged/build.log | 3 --- .../traitClassObjectConstantChanged/build.log | 3 --- .../experimental-ic-build.log | 22 +++++++++++++++++ .../javaToKotlin/experimental-ic-build.log | 23 ++++++++++++++++++ .../javaToKotlinAndBack/build.log | 2 +- .../experimental-ic-build.log | 2 +- .../changeSignature/build.log | 2 +- .../constantChanged/build.log | 7 +----- .../constantChanged/experimental-ic-build.log | 24 +++++++++++++++++++ .../kotlinUsedInJava/funRenamed/build.log | 2 +- .../jvmFieldChanged/build.log | 7 +----- .../jvmFieldChanged/experimental-ic-build.log | 24 +++++++++++++++++++ .../methodAddedInSuper/build.log | 2 +- .../propertyRenamed/build.log | 2 +- 25 files changed, 176 insertions(+), 51 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6091b6d5289..60fb5928698 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -261,7 +261,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { @Suppress("REIFIED_TYPE_UNSAFE_SUBSTITUTION") val generatedClasses = generatedFiles.filterIsInstance>() - val additionalPassRequired = updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses, incrementalCaches) + updateJavaMappings(chunk, compilationErrors, context, dirtyFilesHolder, filesToCompile, generatedClasses, incrementalCaches) if (!IncrementalCompilation.isEnabled()) { return OK @@ -279,7 +279,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { processChanges(filesToCompile.values().toSet(), allCompiledFiles, dataManager, incrementalCaches.values, changesInfo, fsOperations) incrementalCaches.values.forEach { it.cleanDirtyInlineFunctions() } - return if (additionalPassRequired) ADDITIONAL_PASS_REQUIRED else OK + return OK } private fun applyActionsOnCacheVersionChange( @@ -476,10 +476,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { filesToCompile: MultiMap, generatedClasses: List>, incrementalCaches: Map - ): Boolean { + ) { val previousMappings = context.projectDescriptor.dataManager.mappings - val delta = previousMappings.createDelta() - val callback = delta.callback + val callback = JavaBuilderUtil.getDependenciesRegistrar(context) + val targetDirtyFiles: Map> = chunk.targets.keysToMap { val files = HashSet() dirtyFilesHolder.getRemovedFiles(it).mapTo(files, ::File) @@ -511,9 +511,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } val allCompiled = filesToCompile.values() - val compiledInThisRound = if (compilationErrors) listOf() else allCompiled + val successfullyCompiled = if (compilationErrors) listOf() else allCompiled - return JavaBuilderUtil.updateMappings(context, delta, dirtyFilesHolder, chunk, allCompiled, compiledInThisRound) + JavaBuilderUtil.registerFilesToCompile(context, allCompiled) + JavaBuilderUtil.registerSuccessfullyCompiled(context, successfullyCompiled) } private fun registerOutputItems(outputConsumer: ModuleLevelBuilder.OutputConsumer, generatedFiles: List>) { diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log index 150f8fc1913..81ba2b80649 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log @@ -11,11 +11,9 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/constant/ConstantKt.class out/production/module/usage/UsageKt.class End of files Compiling files: - src/constant.kt src/usage.kt End of files Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 1bd171646e7..632ed20af04 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -9,14 +9,7 @@ Compiling files: End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ -Cleaning output files: - out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_constKt.class -End of files -Compiling files: - module1/src/module1_const.kt -End of files -Exit code: OK +Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/usage/Usage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log index cf60e2e8822..e92b97f77a8 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/allConstants/build.log @@ -22,12 +22,9 @@ End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/ConstKt.class out/production/module/test/Usage.class End of files Compiling files: - src/const.kt src/usage.kt End of files Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 17964e4fe92..9709f96d08e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -10,12 +10,9 @@ End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class out/production/module/test/Usage.class End of files Compiling files: - src/const.kt src/usage.kt End of files Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log new file mode 100644 index 00000000000..bf455b07c77 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class +End of files +Compiling files: + src/const.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class + out/production/module/test/Usage.class +End of files +Compiling files: + src/const.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log index 77153b329f8..da4e0b01787 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log @@ -3,7 +3,7 @@ Compiling files: src/class2.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/Klass.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log index 53cfd43669b..7722838c8fe 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/compilationErrorThenFixedWithPhantomPart3/experimental-ic-build.log @@ -20,7 +20,7 @@ Compiling files: src/other.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log new file mode 100644 index 00000000000..82fd3845d42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileMovedToAnotherMultifileClass/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__BKt.class +End of files +Compiling files: + src/b.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class +End of files +Compiling files: + src/a.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log index d4fc7b2018b..5ef732c6a6f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -9,11 +9,9 @@ End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: - out/production/module/test/Object.class out/production/module/test/Usage.class End of files Compiling files: - src/const.kt src/usage.kt End of files Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log new file mode 100644 index 00000000000..1b6aab2fc85 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/test/Object.class +End of files +Compiling files: + src/const.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module/test/Object.class + out/production/module/test/Usage.class +End of files +Compiling files: + src/const.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log index 0f23479c090..c65246888fe 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageConstantChanged/build.log @@ -10,12 +10,9 @@ End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/ConstKt.class out/production/module/test/Usage.class End of files Compiling files: - src/const.kt src/usage.kt End of files Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index d840f5a96b1..c4ae0d3901e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -10,12 +10,9 @@ End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: - out/production/module/test/Trait$Companion.class - out/production/module/test/Trait.class out/production/module/test/Usage.class End of files Compiling files: - src/const.kt src/usage.kt End of files Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log new file mode 100644 index 00000000000..33d35483270 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/test/Trait$Companion.class + out/production/module/test/Trait.class +End of files +Compiling files: + src/const.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module/test/Trait$Companion.class + out/production/module/test/Trait.class + out/production/module/test/Usage.class +End of files +Compiling files: + src/const.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log new file mode 100644 index 00000000000..6188d73bf81 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/TheClass.class +End of files +Compiling files: + src/TheClass.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/Usage.class + out/production/module/UsageInKotlinKt.class +End of files +Compiling files: + src/usageInKotlin.kt +End of files +Exit code: OK +------------------------------------------ +Compiling files: + src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log index f8d413cf6ce..cd2de0c9575 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack/build.log @@ -11,7 +11,7 @@ Compiling files: src/Foo.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log index 92221506e10..7fcd3cd0cfe 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/experimental-ic-build.log @@ -7,7 +7,7 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/JavaUsage.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log index 302557a2230..40d5de2889b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/build.log @@ -7,7 +7,7 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/Usage.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index 9cb04b4d7c1..3544758175f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -11,13 +11,8 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/Usage.class - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class End of files -Compiling files: - src/const.kt -End of files -Exit code: OK +Exit code: NOTHING_DONE ------------------------------------------ Compiling files: src/Usage.java diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log new file mode 100644 index 00000000000..1d26bdaba08 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/experimental-ic-build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class +End of files +Compiling files: + src/const.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module/Usage.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class +End of files +Compiling files: + src/const.kt +End of files +Exit code: OK +------------------------------------------ +Compiling files: + src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index dd06455f2ba..cb63f56fc99 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -7,7 +7,7 @@ End of files Compiling files: src/fun.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/WillBeUnresolved.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log index 9cb04b4d7c1..3544758175f 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log @@ -11,13 +11,8 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/Usage.class - out/production/module/test/Klass$Companion.class - out/production/module/test/Klass.class End of files -Compiling files: - src/const.kt -End of files -Exit code: OK +Exit code: NOTHING_DONE ------------------------------------------ Compiling files: src/Usage.java diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log new file mode 100644 index 00000000000..1d26bdaba08 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/experimental-ic-build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class +End of files +Compiling files: + src/const.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module/Usage.class + out/production/module/test/Klass$Companion.class + out/production/module/test/Klass.class +End of files +Compiling files: + src/const.kt +End of files +Exit code: OK +------------------------------------------ +Compiling files: + src/Usage.java +End of files diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log index 6c4554b7374..c1d74686c36 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -6,7 +6,7 @@ End of files Compiling files: src/Super.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/Sub.class diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index a2374e45e84..938f61c54ac 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -7,7 +7,7 @@ End of files Compiling files: src/prop.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/module/WillBeUnresolved.class From f511d4986fb9669b1883db24a685b947a1fde2ee Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Sat, 20 Feb 2016 13:10:57 +0300 Subject: [PATCH 0802/1557] Minor: fix testdata Original commit: 61cc8394e878998eaee6043e241f5d3895700664 --- .../testData/incremental/custom/renameModule/build.log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/custom/renameModule/build.log b/jps/jps-plugin/testData/incremental/custom/renameModule/build.log index 5b9b113b83b..43e4c87217c 100644 --- a/jps/jps-plugin/testData/incremental/custom/renameModule/build.log +++ b/jps/jps-plugin/testData/incremental/custom/renameModule/build.log @@ -5,7 +5,7 @@ Compiling files: src/unrelated.kt src/usage.kt End of files -Exit code: ADDITIONAL_PASS_REQUIRED +Exit code: OK ------------------------------------------ Cleaning output files: out/production/moduleRenamed/META-INF/moduleRenamed.kotlin_module From 8f456556f69df021ee845baa55bc214f1091b4b7 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 25 Feb 2016 13:56:43 +0300 Subject: [PATCH 0803/1557] Update existing test data depending on diagnostic parameter rendering Original commit: a4c005fefdb113a86c164b14b445417de65344dd --- .../errors.txt | 2 +- .../testData/general/InternalFromAnotherModule/errors.txt | 2 +- .../companionObjectInheritedMemberChanged/build.log | 8 ++++---- .../companionObjectMemberChanged/build.log | 8 ++++---- .../classHierarchyAffected/enumMemberChanged/build.log | 2 +- .../flagsAndMemberInSameClassChanged/build.log | 8 ++++---- .../inferredTypeArgumentChanged/build.log | 4 ++-- .../methodNullabilityChanged/build.log | 2 +- .../classHierarchyAffected/overrideImplicit/build.log | 2 +- .../propertyNullabilityChanged/build.log | 2 +- .../secondaryConstructorAdded/build.log | 2 +- .../pureKotlin/conflictingPlatformDeclarations/build.log | 8 ++++---- .../incremental/pureKotlin/funRedeclaration/build.log | 2 +- .../incremental/pureKotlin/valAddCustomAccessor/build.log | 2 +- .../valAddCustomAccessor/experimental-ic-build.log | 2 +- .../pureKotlin/valRemoveCustomAccessor/build.log | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index de432978151..c025526d7a1 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -1,4 +1,4 @@ -'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14 +'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15 diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index 9627524678f..d1920809ebf 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,4 +1,4 @@ -'internal open val member: kotlin.Int defined in test.ClassBB1' has no access to 'internal abstract val member: kotlin.Int defined in test.ClassB1', so it cannot override it at line 14, column 14 +'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log index dfb126785da..dfe2d963e1e 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged/build.log @@ -33,10 +33,10 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log index ebeff233c5f..4d2113b7a99 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged/build.log @@ -30,10 +30,10 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type String? ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log index a4e3a6d15e8..c1aa2e715de 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/build.log @@ -20,7 +20,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index 2856771b984..5b6fbaf1784 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -37,9 +37,9 @@ Cannot access 'A': it is 'private' in file 'public' function exposes its 'private' return type A Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? Cannot access 'x': it is 'invisible_fake' in 'B' -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #2 ================= @@ -57,8 +57,8 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? -Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type kotlin.Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? +Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #3 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log index ee2b0711e9a..059e63deb32 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/build.log @@ -34,8 +34,8 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected -Type mismatch: inferred type is kotlin.collections.List but kotlin.collections.List was expected +Type mismatch: inferred type is List but List was expected +Type mismatch: inferred type is List but List was expected ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log index aaa57fbc2e4..cf30e6eee91 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged/build.log @@ -23,7 +23,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Null can not be a value of a non-null type kotlin.Any +Null can not be a value of a non-null type Any ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log index 062678e016f..3370de7c993 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit/build.log @@ -19,7 +19,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C): kotlin.Unit defined in A +Class 'BA' must be declared abstract or implement abstract member public abstract fun f(c: C): Unit defined in A ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log index 260a3c78c3e..f5140879637 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged/build.log @@ -24,7 +24,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Type mismatch: inferred type is kotlin.Any? but kotlin.Any was expected +Type mismatch: inferred type is Any? but Any was expected ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index 1cc2b929b61..8ff9855fed1 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -9,7 +9,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public constructor A(x: kotlin.String)' conflicts with another declaration in package '' +'public constructor A(x: String)' conflicts with another declaration in package '' ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index 21ab5180f89..c3d008be68b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -12,8 +12,8 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: kotlin.collections.List): kotlin.Unit - fun function(list: kotlin.collections.List): kotlin.Unit + fun function(list: List): kotlin.Unit + fun function(list: List): kotlin.Unit Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: kotlin.collections.List): kotlin.Unit - fun function(list: kotlin.collections.List): kotlin.Unit + fun function(list: List): kotlin.Unit + fun function(list: List): kotlin.Unit \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index 5d1ddb7b207..cc75bbbadea 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public fun function(): kotlin.Unit' conflicts with another declaration in package 'test' +'public fun function(): Unit' conflicts with another declaration in package 'test' \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log index ec12e7f5ab1..12944581320 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/build.log @@ -18,4 +18,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter +Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log index e1179f2c022..1b9a86e1791 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valAddCustomAccessor/experimental-ic-build.log @@ -20,4 +20,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter +Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log index 96b7b7bbbf1..ba582b86091 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/build.log @@ -10,7 +10,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Smart cast to 'kotlin.Int' is impossible, because 'a.x' is a property that has open or custom getter +Smart cast to 'Int' is impossible, because 'a.x' is a property that has open or custom getter ================ Step #2 ================= From 8741456ea0239d98d105c87c67742aeddd7e4a45 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 29 Jan 2016 10:17:17 +0100 Subject: [PATCH 0804/1557] Preparing build lib for migrating gradle plugin on it: moving ArgumentUtils from jps plugin, adding buildUtils with incremental compilation functions extracted from kotlinBuilder, minor tweak to lookup storage dump KT-8487 Original commit: d3d854ec7df65176e6dda455873bc14f69dae15c --- .../kotlin/compilerRunner/ArgumentUtils.java | 101 ------------------ 1 file changed, 101 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java deleted file mode 100644 index f2329867d68..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.compilerRunner; - -import com.intellij.openapi.util.text.StringUtil; -import com.intellij.util.Function; -import com.intellij.util.containers.ComparatorUtil; -import com.sampullara.cli.Argument; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; - -public class ArgumentUtils { - private ArgumentUtils() {} - - @NotNull - public static List convertArgumentsToStringList(@NotNull CommonCompilerArguments arguments) - throws InstantiationException, IllegalAccessException { - List result = new ArrayList(); - convertArgumentsToStringList(arguments, arguments.getClass().newInstance(), arguments.getClass(), result); - result.addAll(arguments.freeArgs); - return result; - } - - private static void convertArgumentsToStringList( - @NotNull CommonCompilerArguments arguments, - @NotNull CommonCompilerArguments defaultArguments, - @NotNull Class clazz, - @NotNull List result - ) throws IllegalAccessException, InstantiationException { - for (Field field : clazz.getDeclaredFields()) { - Argument argument = field.getAnnotation(Argument.class); - if (argument == null) continue; - - Object value; - Object defaultValue; - try { - value = field.get(arguments); - defaultValue = field.get(defaultArguments); - } - catch (IllegalAccessException ignored) { - // skip this field - continue; - } - - if (ComparatorUtil.equalsNullable(value, defaultValue)) continue; - - String name = getAlias(argument); - if (name == null) { - name = getName(argument, field); - } - - Class fieldType = field.getType(); - - if (fieldType.isArray()) { - Object[] values = (Object[]) value; - if (values.length == 0) continue; - //noinspection unchecked - value = StringUtil.join(values, Function.TO_STRING, argument.delimiter()); - } - - result.add(argument.prefix() + name); - - if (fieldType == boolean.class || fieldType == Boolean.class) continue; - - result.add(value.toString()); - } - - Class superClazz = clazz.getSuperclass(); - if (superClazz != null) { - convertArgumentsToStringList(arguments, defaultArguments, superClazz, result); - } - } - - private static String getAlias(Argument argument) { - String alias = argument.alias(); - return alias.isEmpty() ? null : alias; - } - - private static String getName(Argument argument, Field field) { - String name = argument.value(); - return name.isEmpty() ? field.getName() : name; - } -} From 36235e85e7e437ec35993aa63c7cbe9c23648635 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 8 Feb 2016 16:05:55 +0300 Subject: [PATCH 0805/1557] Reuse code from build-common KT-8487 Original commit: f93562299c339925bdc76e534463c44137bf6750 --- .../kotlin/jps/build/KotlinBuilder.kt | 93 ++----------------- .../incremental/JpsIncrementalCacheImpl.kt | 2 +- 2 files changed, 9 insertions(+), 86 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 60fb5928698..f4aec197e4b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -62,7 +62,6 @@ import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.TargetId -import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.utils.JsLibraryUtils @@ -773,88 +772,20 @@ private fun CompilationResult.doProcessChangesUsingLookups( compiledFiles: Set, dataManager: BuildDataManager, fsOperations: FSOperationsHelper, - caches: Collection> + caches: Iterable> ) { - val dirtyLookupSymbols = HashSet() - val dirtyClassesFqNames = HashSet() val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) - val allCaches: Sequence> = caches.asSequence().flatMap { it.dependentsWithThis } + val allCaches = caches.flatMap { it.thisWithDependentCaches } + val logAction = { logStr: String -> KotlinBuilder.LOG.debug(logStr) } - KotlinBuilder.LOG.debug("Start processing changes") - - for (change in changes) { - KotlinBuilder.LOG.debug("Process $change") - - if (change is ChangeInfo.SignatureChanged) { - val fqNames = if (!change.areSubclassesAffected) listOf(change.fqName) else withSubtypes(change.fqName, allCaches) - - for (classFqName in fqNames) { - assert(!classFqName.isRoot) { "classFqName is root when processing $change" } - - val scope = classFqName.parent().asString() - val name = classFqName.shortName().identifier - dirtyLookupSymbols.add(LookupSymbol(name, scope)) - } - } - else if (change is ChangeInfo.MembersChanged) { - val fqNames = withSubtypes(change.fqName, allCaches) - // need to recompile subtypes because changed member might break override - dirtyClassesFqNames.addAll(fqNames) - - change.names.forAllPairs(fqNames) { name, fqName -> - dirtyLookupSymbols.add(LookupSymbol(name, fqName.asString())) - } - } - } - - val dirtyFiles = HashSet() - - for (lookup in dirtyLookupSymbols) { - val affectedFiles = lookupStorage.get(lookup).map(::File) - - KotlinBuilder.LOG.debug { "${lookup.scope}#${lookup.name} caused recompilation of: $affectedFiles" } - - dirtyFiles.addAll(affectedFiles) - } - - for (cache in allCaches) { - for (dirtyClassFqName in dirtyClassesFqNames) { - val srcFile = cache.getSourceFileIfClass(dirtyClassFqName) ?: continue - dirtyFiles.add(srcFile) - } - } + logAction("Start processing changes") + val (dirtyLookupSymbols, dirtyClassFqNames) = getDirtyData(allCaches, logAction) + val dirtyFiles = mapLookupSymbolsToFiles(lookupStorage, dirtyLookupSymbols, logAction) + + mapClassesFqNamesToFiles(allCaches, dirtyClassFqNames, logAction) fsOperations.markFiles(dirtyFiles.asIterable(), excludeFiles = compiledFiles) - KotlinBuilder.LOG.debug("End of processing changes") -} -/** - * Returns type with its subtypes transitively - * - * For example: - * open class A - * open class B : A() - * class C : B() - * withSubtypes(A) will return [A, B, C] - */ -private fun withSubtypes( - typeFqName: FqName, - caches: Sequence> -): Set { - val types = LinkedList(listOf(typeFqName)) - val subtypes = hashSetOf() - - while (types.isNotEmpty()) { - val unprocessedType = types.pollFirst() - - caches.flatMap { it.getSubtypesOf(unprocessedType) } - .filter { it !in subtypes } - .forEach { types.addLast(it) } - - subtypes.add(unprocessedType) - } - - return subtypes + logAction("End of processing changes") } private fun getLookupTracker(project: JpsProject): LookupTracker { @@ -948,14 +879,6 @@ private fun hasKotlinDirtyOrRemovedFiles( return chunk.targets.any { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isNotEmpty() } } -private inline fun Iterable.forAllPairs(other: Iterable, fn: (T, R)->Unit) { - for (t in this) { - for (r in other) { - fn(t, r) - } - } -} - private inline fun Logger.debug(message: ()->String) { if (isDebugEnabled) { debug(message()) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt index 8c199778276..1f8782e6712 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt @@ -60,7 +60,7 @@ class JpsIncrementalCacheImpl( for ((className, functions) in dirtyInlineFunctionsMap.getEntries()) { val classFilePath = getClassFilePath(className.internalName) - for (cache in dependentsWithThis) { + for (cache in thisWithDependentCaches) { val targetFiles = functions.flatMap { (cache as JpsIncrementalCacheImpl).inlinedTo[classFilePath, it] } result.addAll(targetFiles) } From f18ec129fb1eb8aea1a9c4c9d9630661f260bb50 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 2 Mar 2016 16:27:58 +0300 Subject: [PATCH 0806/1557] Remove dependency on kotlin-test in IC test KT-8487 Original commit: 4f2f0f0a60ba3645ecbaf25e3d05c633a32a37fa --- .../incremental/pureKotlin/dependencyClassReferenced/a.kt | 2 +- .../incremental/pureKotlin/dependencyClassReferenced/b.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt index 89692d95832..d14755d91f3 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/a.kt @@ -1,6 +1,6 @@ package test -fun a(ref: kotlin.test.Asserter) { +fun a(ref: List) { b(ref) println(":)") } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt index 9addb367f04..7c34849d5f2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/dependencyClassReferenced/b.kt @@ -1,6 +1,6 @@ package test -fun b(ref: kotlin.test.Asserter) { +fun b(ref: List) { a(ref) println(":)") } \ No newline at end of file From 5bb64ee2838df8b4b1521f492450f3ea507b2d77 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 11 Feb 2016 15:31:06 +0300 Subject: [PATCH 0807/1557] Extract incremental test modification utils KT-8487 Original commit: f4aed97d52dda90a64070cb6f9efde3e263d7be1 --- ...tractIncrementalCacheVersionChangedTest.kt | 4 +- .../jps/build/AbstractIncrementalJpsTest.kt | 145 ++-------------- .../AbstractIncrementalLazyCachesTest.kt | 10 +- .../IncrementalProjectPathCaseChangedTest.kt | 3 +- .../incrementalModificationUtils.kt | 161 ++++++++++++++++++ 5 files changed, 190 insertions(+), 133 deletions(-) create mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index 536f6d91219..e348885d2e4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -17,10 +17,12 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.ModifyContent import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { - override fun performAdditionalModifications(modifications: List) { + override fun performAdditionalModifications(modifications: List) { val modifiedFiles = modifications.filterIsInstance().map { it.path } val paths = projectDescriptor.dataManager.dataPaths val targets = projectDescriptor.allModuleTargets diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 1e27566a945..673cfb30222 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -47,6 +47,10 @@ import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.TouchPolicy +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.copyTestSources +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.getModificationsToPerform import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.jps.incremental.getKotlinCache @@ -75,9 +79,6 @@ abstract class AbstractIncrementalJpsTest( val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" - private val COMMANDS = listOf("new", "touch", "delete") - private val COMMANDS_AS_REGEX_PART = COMMANDS.joinToString("|") - private val COMMANDS_AS_MESSAGE_PART = COMMANDS.joinToString("/") { "\".$it\"" } private val BUILD_LOG_FILE_NAME = "build.log" } @@ -91,7 +92,7 @@ abstract class AbstractIncrementalJpsTest( protected var lookupsDuringTest: MutableSet by Delegates.notNull() - protected val mapWorkingToOriginalFile: MutableMap = hashMapOf() + protected var mapWorkingToOriginalFile: MutableMap = hashMapOf() protected open val experimentalBuildLogFileName = "experimental-ic-build.log" @@ -207,68 +208,6 @@ abstract class AbstractIncrementalJpsTest( return build(CompileScopeTestBuilder.rebuild().allModules(), checkLookups = false) } - private fun getModificationsToPerform(moduleNames: Collection?): List> { - - fun getModificationsForIteration(newSuffix: String, touchSuffix: String, deleteSuffix: String): List { - - fun getDirPrefix(fileName: String): String { - val underscore = fileName.indexOf("_") - - if (underscore != -1) { - val module = fileName.substring(0, underscore) - - assert(moduleNames != null) { "File name has module prefix, but multi-module environment is absent" } - assert(module in moduleNames!!) { "Module not found for file with prefix: $fileName" } - - return "$module/src" - } - - assert(moduleNames == null) { "Test is multi-module, but file has no module prefix: $fileName" } - return "src" - } - - val modifications = ArrayList() - for (file in testDataDir.listFiles()!!) { - val fileName = file.name - - if (fileName.endsWith(newSuffix)) { - modifications.add(ModifyContent(getDirPrefix(fileName) + "/" + fileName.removeSuffix(newSuffix), file)) - } - if (fileName.endsWith(touchSuffix)) { - modifications.add(TouchFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(touchSuffix))) - } - if (fileName.endsWith(deleteSuffix)) { - modifications.add(DeleteFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(deleteSuffix))) - } - } - return modifications - } - - val haveFilesWithoutNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false - val haveFilesWithNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false - - if (haveFilesWithoutNumbers && haveFilesWithNumbers) { - fail("Bad test data format: files ending with both unnumbered and numbered $COMMANDS_AS_MESSAGE_PART were found") - } - if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { - if (allowNoFilesWithSuffixInTestData) { - return listOf(listOf()) - } - else { - fail("Bad test data format: no files ending with $COMMANDS_AS_MESSAGE_PART found") - } - } - - if (haveFilesWithoutNumbers) { - return listOf(getModificationsForIteration(".new", ".touch", ".delete")) - } - else { - return (1..10) - .map { getModificationsForIteration(".new.$it", ".touch.$it", ".delete.$it") } - .filter { it.isNotEmpty() } - } - } - private fun rebuildAndCheckOutput(makeOverallResult: MakeResult) { val outDir = File(getAbsolutePath("out")) val outAfterMake = File(getAbsolutePath("out-after-make")) @@ -430,8 +369,8 @@ abstract class AbstractIncrementalJpsTest( private fun performModificationsAndMake(moduleNames: Set?): List { val results = arrayListOf() + val modifications = getModificationsToPerform(testDataDir, moduleNames, allowNoFilesWithSuffixInTestData, TouchPolicy.TIMESTAMP) - val modifications = getModificationsToPerform(moduleNames) for (step in modifications) { step.forEach { it.perform(workDir, mapWorkingToOriginalFile) } performAdditionalModifications(step) @@ -452,16 +391,13 @@ abstract class AbstractIncrementalJpsTest( // null means one module private fun configureModules(): Set? { - - fun prepareSources(relativePathToSrc: String, filePrefix: String) { - val srcDir = File(workDir, relativePathToSrc) - FileUtil.copyDir(testDataDir, srcDir) { - it.isDirectory || it.name.startsWith(filePrefix) && (it.name.endsWith(".kt") || it.name.endsWith(".java")) - } - - srcDir.walk().forEach { mapWorkingToOriginalFile[it] = File(testDataDir, filePrefix + it.name) } - - preProcessSources(srcDir) + fun prepareModuleSources(moduleName: String?) { + val sourceDirName = moduleName?.let { "$it/src" } ?: "src" + val filePrefix = moduleName?.let { "${it}_" } ?: "" + val sourceDestinationDir = File(workDir, sourceDirName) + val sourcesMapping = copyTestSources(testDataDir, sourceDestinationDir, filePrefix) + mapWorkingToOriginalFile.putAll(sourcesMapping) + preProcessSources(sourceDestinationDir) } var moduleNames: Set? @@ -469,11 +405,11 @@ abstract class AbstractIncrementalJpsTest( val jdk = addJdk("my jdk") val moduleDependencies = readModuleDependencies() + mapWorkingToOriginalFile = hashMapOf() + if (moduleDependencies == null) { addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk) - - prepareSources(relativePathToSrc = "src", filePrefix = "") - + prepareModuleSources(moduleName = null) moduleNames = null } else { @@ -490,8 +426,7 @@ abstract class AbstractIncrementalJpsTest( } for (module in nameToModule.values) { - val moduleName = module.name - prepareSources(relativePathToSrc = "$moduleName/src", filePrefix = moduleName + "_") + prepareModuleSources(module.name) } moduleNames = nameToModule.keys @@ -501,6 +436,7 @@ abstract class AbstractIncrementalJpsTest( return moduleNames } + protected open fun preProcessSources(srcDir: File) { } @@ -548,51 +484,6 @@ abstract class AbstractIncrementalJpsTest( logBuf.append(KotlinTestUtils.replaceHashWithStar(message!!.replace("^$rootPath/".toRegex(), " "))).append('\n') } } - - protected abstract class Modification(val path: String) { - abstract fun perform(workDir: File, mapping: MutableMap) - - override fun toString(): String = "${javaClass.simpleName} $path" - } - - protected class ModifyContent(path: String, val dataFile: File) : Modification(path) { - override fun perform(workDir: File, mapping: MutableMap) { - val file = File(workDir, path) - - val oldLastModified = file.lastModified() - file.delete() - dataFile.copyTo(file) - - val newLastModified = file.lastModified() - if (newLastModified <= oldLastModified) { - //Mac OS and some versions of Linux truncate timestamp to nearest second - file.setLastModified(oldLastModified + 1000) - } - - mapping[file] = dataFile - } - } - - protected class TouchFile(path: String) : Modification(path) { - override fun perform(workDir: File, mapping: MutableMap) { - val file = File(workDir, path) - - val oldLastModified = file.lastModified() - //Mac OS and some versions of Linux truncate timestamp to nearest second - file.setLastModified(Math.max(System.currentTimeMillis(), oldLastModified + 1000)) - } - } - - protected class DeleteFile(path: String) : Modification(path) { - override fun perform(workDir: File, mapping: MutableMap) { - val fileToDelete = File(workDir, path) - if (!fileToDelete.delete()) { - throw AssertionError("Couldn't delete $fileToDelete") - } - - mapping.remove(fileToDelete) - } - } } internal val ProjectDescriptor.allModuleTargets: Collection diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 9850719ebd1..6be9be31d5b 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -21,9 +21,11 @@ import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.CacheVersion -import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner -import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME +import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.ModifyContent +import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.utils.Printer import java.io.File @@ -40,11 +42,11 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() UsefulTestCase.assertSameLinesWithFile(expectedFile.canonicalPath, actual) } - override fun performAdditionalModifications(modifications: List) { + override fun performAdditionalModifications(modifications: List) { super.performAdditionalModifications(modifications) for (modification in modifications) { - if (modification !is AbstractIncrementalJpsTest.ModifyContent) continue + if (modification !is ModifyContent) continue val name = File(modification.path).name diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt index 717cef06ac3..0e6d3f1ebf4 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.SystemInfoRt import org.jetbrains.jps.model.java.JavaSourceRootType +import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) { fun testProjectPathCaseChanged() { @@ -36,7 +37,7 @@ class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDu super.doTest(testDataPath) } - override fun performAdditionalModifications(modifications: List) { + override fun performAdditionalModifications(modifications: List) { val module = myProject.modules[0] val sourceRoot = module.sourceRoots[0].url assert(sourceRoot.endsWith("/src")) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt new file mode 100644 index 00000000000..438d0dee717 --- /dev/null +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt @@ -0,0 +1,161 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.build.incrementalModificationUtils + +import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.jps.builders.JpsBuildTestCase +import java.io.File +import java.util.* + +private val COMMANDS = listOf("new", "touch", "delete") +private val COMMANDS_AS_REGEX_PART = COMMANDS.joinToString("|") +private val COMMANDS_AS_MESSAGE_PART = COMMANDS.joinToString("/") { "\".$it\"" } + +enum class TouchPolicy { + TIMESTAMP, + CHECKSUM +} + +fun copyTestSources(testDataDir: File, sourceDestinationDir: File, filePrefix: String): Map { + val mapping = hashMapOf() + FileUtil.copyDir(testDataDir, sourceDestinationDir) { + it.isDirectory || it.name.startsWith(filePrefix) && (it.name.endsWith(".kt") || it.name.endsWith(".java")) + } + + sourceDestinationDir.walk().forEach { mapping[it] = File(testDataDir, filePrefix + it.name) } + return mapping +} + +fun getModificationsToPerform( + testDataDir: File, + moduleNames: Collection?, + allowNoFilesWithSuffixInTestData: Boolean, + touchPolicy: TouchPolicy +): List> { + + fun getModificationsForIteration(newSuffix: String, touchSuffix: String, deleteSuffix: String): List { + + fun getDirPrefix(fileName: String): String { + val underscore = fileName.indexOf("_") + + if (underscore != -1) { + val module = fileName.substring(0, underscore) + + assert(moduleNames != null) { "File name has module prefix, but multi-module environment is absent" } + assert(module in moduleNames!!) { "Module not found for file with prefix: $fileName" } + + return "$module/src" + } + + assert(moduleNames == null) { "Test is multi-module, but file has no module prefix: $fileName" } + return "src" + } + + val modifications = ArrayList() + for (file in testDataDir.listFiles()!!) { + val fileName = file.name + + if (fileName.endsWith(newSuffix)) { + modifications.add(ModifyContent(getDirPrefix(fileName) + "/" + fileName.removeSuffix(newSuffix), file)) + } + if (fileName.endsWith(touchSuffix)) { + modifications.add(TouchFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(touchSuffix), touchPolicy)) + } + if (fileName.endsWith(deleteSuffix)) { + modifications.add(DeleteFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(deleteSuffix))) + } + } + return modifications + } + + val haveFilesWithoutNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false + val haveFilesWithNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false + + if (haveFilesWithoutNumbers && haveFilesWithNumbers) { + JpsBuildTestCase.fail("Bad test data format: files ending with both unnumbered and numbered $COMMANDS_AS_MESSAGE_PART were found") + } + if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { + if (allowNoFilesWithSuffixInTestData) { + return listOf(listOf()) + } + else { + JpsBuildTestCase.fail("Bad test data format: no files ending with $COMMANDS_AS_MESSAGE_PART found") + } + } + + if (haveFilesWithoutNumbers) { + return listOf(getModificationsForIteration(".new", ".touch", ".delete")) + } + else { + return (1..10) + .map { getModificationsForIteration(".new.$it", ".touch.$it", ".delete.$it") } + .filter { it.isNotEmpty() } + } +} + +abstract class Modification(val path: String) { + abstract fun perform(workDir: File, mapping: MutableMap) + + override fun toString(): String = "${javaClass.simpleName} $path" +} + +class ModifyContent(path: String, val dataFile: File) : Modification(path) { + override fun perform(workDir: File, mapping: MutableMap) { + val file = File(workDir, path) + + val oldLastModified = file.lastModified() + file.delete() + dataFile.copyTo(file) + + val newLastModified = file.lastModified() + if (newLastModified <= oldLastModified) { + //Mac OS and some versions of Linux truncate timestamp to nearest second + file.setLastModified(oldLastModified + 1000) + } + + mapping[file] = dataFile + } +} + +class TouchFile(path: String, private val touchPolicy: TouchPolicy) : Modification(path) { + override fun perform(workDir: File, mapping: MutableMap) { + val file = File(workDir, path) + + when (touchPolicy) { + TouchPolicy.TIMESTAMP -> { + val oldLastModified = file.lastModified() + //Mac OS and some versions of Linux truncate timestamp to nearest second + file.setLastModified(Math.max(System.currentTimeMillis(), oldLastModified + 1000)) + } + TouchPolicy.CHECKSUM -> { + file.appendText(" ") + } + } + + } +} + +class DeleteFile(path: String) : Modification(path) { + override fun perform(workDir: File, mapping: MutableMap) { + val fileToDelete = File(workDir, path) + if (!fileToDelete.delete()) { + throw AssertionError("Couldn't delete $fileToDelete") + } + + mapping.remove(fileToDelete) + } +} From 0e2f3ab201430b0b9430c3216bd0838416ed12d2 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 11 Feb 2016 15:46:26 +0300 Subject: [PATCH 0808/1557] Move incremental test modification utils to build-common KT-8487 Original commit: 8df209b436a5bbd27eec994142e40b1c3f70eb4b --- ...tractIncrementalCacheVersionChangedTest.kt | 4 +- .../jps/build/AbstractIncrementalJpsTest.kt | 8 +- .../AbstractIncrementalLazyCachesTest.kt | 4 +- .../IncrementalProjectPathCaseChangedTest.kt | 2 +- .../jps/build/incrementalCustomTests.kt | 2 + .../incrementalModificationUtils.kt | 161 ------------------ 6 files changed, 11 insertions(+), 170 deletions(-) delete mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt index e348885d2e4..f8d2a49a50c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt @@ -17,8 +17,8 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.ModifyContent +import org.jetbrains.kotlin.incremental.testingUtils.Modification +import org.jetbrains.kotlin.incremental.testingUtils.ModifyContent import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractIncrementalCacheVersionChangedTest : AbstractIncrementalJpsTest(allowNoFilesWithSuffixInTestData = true) { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 673cfb30222..d285c1c5626 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -46,11 +46,11 @@ import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.testingUtils.Modification +import org.jetbrains.kotlin.incremental.testingUtils.TouchPolicy +import org.jetbrains.kotlin.incremental.testingUtils.copyTestSources +import org.jetbrains.kotlin.incremental.testingUtils.getModificationsToPerform import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.TouchPolicy -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.copyTestSources -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.getModificationsToPerform import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.jps.incremental.getKotlinCache diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 6be9be31d5b..02b7270f0ab 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -23,8 +23,8 @@ import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.KOTLIN_CACHE_DIRECTORY_NAME import org.jetbrains.kotlin.incremental.storage.BasicMapsOwner -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.ModifyContent +import org.jetbrains.kotlin.incremental.testingUtils.Modification +import org.jetbrains.kotlin.incremental.testingUtils.ModifyContent import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.utils.Printer diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt index 0e6d3f1ebf4..e2b3e54d6b1 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt @@ -18,7 +18,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.SystemInfoRt import org.jetbrains.jps.model.java.JavaSourceRootType -import org.jetbrains.kotlin.jps.build.incrementalModificationUtils.Modification +import org.jetbrains.kotlin.incremental.testingUtils.Modification class IncrementalProjectPathCaseChangedTest : AbstractIncrementalJpsTest(checkDumpsCaseInsensitively = true) { fun testProjectPathCaseChanged() { diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt index d5c0af29a9e..42a8c9a497c 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt @@ -16,6 +16,8 @@ package org.jetbrains.kotlin.jps.build +import org.jetbrains.kotlin.incremental.testingUtils.Modification + open class IncrementalRenameModuleTest : AbstractIncrementalJpsTest() { fun testRenameModule() { doTest("jps-plugin/testData/incremental/custom/renameModule/") diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt deleted file mode 100644 index 438d0dee717..00000000000 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalModificationUtils/incrementalModificationUtils.kt +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright 2010-2016 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.kotlin.jps.build.incrementalModificationUtils - -import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jps.builders.JpsBuildTestCase -import java.io.File -import java.util.* - -private val COMMANDS = listOf("new", "touch", "delete") -private val COMMANDS_AS_REGEX_PART = COMMANDS.joinToString("|") -private val COMMANDS_AS_MESSAGE_PART = COMMANDS.joinToString("/") { "\".$it\"" } - -enum class TouchPolicy { - TIMESTAMP, - CHECKSUM -} - -fun copyTestSources(testDataDir: File, sourceDestinationDir: File, filePrefix: String): Map { - val mapping = hashMapOf() - FileUtil.copyDir(testDataDir, sourceDestinationDir) { - it.isDirectory || it.name.startsWith(filePrefix) && (it.name.endsWith(".kt") || it.name.endsWith(".java")) - } - - sourceDestinationDir.walk().forEach { mapping[it] = File(testDataDir, filePrefix + it.name) } - return mapping -} - -fun getModificationsToPerform( - testDataDir: File, - moduleNames: Collection?, - allowNoFilesWithSuffixInTestData: Boolean, - touchPolicy: TouchPolicy -): List> { - - fun getModificationsForIteration(newSuffix: String, touchSuffix: String, deleteSuffix: String): List { - - fun getDirPrefix(fileName: String): String { - val underscore = fileName.indexOf("_") - - if (underscore != -1) { - val module = fileName.substring(0, underscore) - - assert(moduleNames != null) { "File name has module prefix, but multi-module environment is absent" } - assert(module in moduleNames!!) { "Module not found for file with prefix: $fileName" } - - return "$module/src" - } - - assert(moduleNames == null) { "Test is multi-module, but file has no module prefix: $fileName" } - return "src" - } - - val modifications = ArrayList() - for (file in testDataDir.listFiles()!!) { - val fileName = file.name - - if (fileName.endsWith(newSuffix)) { - modifications.add(ModifyContent(getDirPrefix(fileName) + "/" + fileName.removeSuffix(newSuffix), file)) - } - if (fileName.endsWith(touchSuffix)) { - modifications.add(TouchFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(touchSuffix), touchPolicy)) - } - if (fileName.endsWith(deleteSuffix)) { - modifications.add(DeleteFile(getDirPrefix(fileName) + "/" + fileName.removeSuffix(deleteSuffix))) - } - } - return modifications - } - - val haveFilesWithoutNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)$".toRegex()) }?.isNotEmpty() ?: false - val haveFilesWithNumbers = testDataDir.listFiles { it -> it.name.matches(".+\\.($COMMANDS_AS_REGEX_PART)\\.\\d+$".toRegex()) }?.isNotEmpty() ?: false - - if (haveFilesWithoutNumbers && haveFilesWithNumbers) { - JpsBuildTestCase.fail("Bad test data format: files ending with both unnumbered and numbered $COMMANDS_AS_MESSAGE_PART were found") - } - if (!haveFilesWithoutNumbers && !haveFilesWithNumbers) { - if (allowNoFilesWithSuffixInTestData) { - return listOf(listOf()) - } - else { - JpsBuildTestCase.fail("Bad test data format: no files ending with $COMMANDS_AS_MESSAGE_PART found") - } - } - - if (haveFilesWithoutNumbers) { - return listOf(getModificationsForIteration(".new", ".touch", ".delete")) - } - else { - return (1..10) - .map { getModificationsForIteration(".new.$it", ".touch.$it", ".delete.$it") } - .filter { it.isNotEmpty() } - } -} - -abstract class Modification(val path: String) { - abstract fun perform(workDir: File, mapping: MutableMap) - - override fun toString(): String = "${javaClass.simpleName} $path" -} - -class ModifyContent(path: String, val dataFile: File) : Modification(path) { - override fun perform(workDir: File, mapping: MutableMap) { - val file = File(workDir, path) - - val oldLastModified = file.lastModified() - file.delete() - dataFile.copyTo(file) - - val newLastModified = file.lastModified() - if (newLastModified <= oldLastModified) { - //Mac OS and some versions of Linux truncate timestamp to nearest second - file.setLastModified(oldLastModified + 1000) - } - - mapping[file] = dataFile - } -} - -class TouchFile(path: String, private val touchPolicy: TouchPolicy) : Modification(path) { - override fun perform(workDir: File, mapping: MutableMap) { - val file = File(workDir, path) - - when (touchPolicy) { - TouchPolicy.TIMESTAMP -> { - val oldLastModified = file.lastModified() - //Mac OS and some versions of Linux truncate timestamp to nearest second - file.setLastModified(Math.max(System.currentTimeMillis(), oldLastModified + 1000)) - } - TouchPolicy.CHECKSUM -> { - file.appendText(" ") - } - } - - } -} - -class DeleteFile(path: String) : Modification(path) { - override fun perform(workDir: File, mapping: MutableMap) { - val fileToDelete = File(workDir, path) - if (!fileToDelete.delete()) { - throw AssertionError("Couldn't delete $fileToDelete") - } - - mapping.remove(fileToDelete) - } -} From 5bc13aa57165fe83a88c71a8b3ced7c23a9be554 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 16 Feb 2016 16:13:42 +0300 Subject: [PATCH 0809/1557] Build incremental testing utils to kotlin-build-common-test.jar KT-8487 Original commit: 7a7562d6856f8d8d5d7f6594ff65ff1e94c2cdcf --- .../kannotator-jps-plugin-test.iml | 5 +- .../build/kannotator/KannotatorJpsTest.java | 2 +- .../jps/build/AbstractIncrementalJpsTest.kt | 6 +- .../classFilesComparison.kt | 178 ------------------ 4 files changed, 5 insertions(+), 186 deletions(-) delete mode 100644 jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml index e99b5a3918b..a6a5f690c4a 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml +++ b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml @@ -7,10 +7,11 @@ + + - - + \ No newline at end of file diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java index ea0dbc4c9f5..39c0146cdca 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java +++ b/jps/jps-plugin/kannotator-jps-plugin-test/test/org/jetbrains/kotlin/jps/build/kannotator/KannotatorJpsTest.java @@ -21,8 +21,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.builders.BuildResult; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.model.module.JpsModuleSourceRoot; +import org.jetbrains.kotlin.incremental.testingUtils.ClassFilesComparisonKt; import org.jetbrains.kotlin.jps.build.AbstractKotlinJpsBuildTestCase; -import org.jetbrains.kotlin.jps.build.classFilesComparison.ClassFilesComparisonKt; import java.io.File; import java.io.IOException; diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index d285c1c5626..a1c52bc10a2 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -46,11 +46,7 @@ import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.incremental.testingUtils.Modification -import org.jetbrains.kotlin.incremental.testingUtils.TouchPolicy -import org.jetbrains.kotlin.incremental.testingUtils.copyTestSources -import org.jetbrains.kotlin.incremental.testingUtils.getModificationsToPerform -import org.jetbrains.kotlin.jps.build.classFilesComparison.assertEqualDirectories +import org.jetbrains.kotlin.incremental.testingUtils.* import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.jps.incremental.getKotlinCache diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt deleted file mode 100644 index 64f7260b6f5..00000000000 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/classFilesComparison/classFilesComparison.kt +++ /dev/null @@ -1,178 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.jps.build.classFilesComparison - -import com.google.common.collect.Sets -import com.google.common.hash.Hashing -import com.google.common.io.Files -import com.google.protobuf.ExtensionRegistry -import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.kotlin.incremental.LocalFileKotlinClass -import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader -import org.jetbrains.kotlin.serialization.DebugProtoBuf -import org.jetbrains.kotlin.serialization.jvm.BitEncoding -import org.jetbrains.kotlin.serialization.jvm.DebugJvmProtoBuf -import org.jetbrains.kotlin.utils.Printer -import org.jetbrains.org.objectweb.asm.ClassReader -import org.jetbrains.org.objectweb.asm.util.TraceClassVisitor -import org.junit.Assert.assertEquals -import org.junit.Assert.assertNotNull -import java.io.ByteArrayInputStream -import java.io.File -import java.io.PrintWriter -import java.io.StringWriter -import java.util.* -import kotlin.comparisons.* - - -// Set this to true if you want to dump all bytecode (test will fail in this case) -val DUMP_ALL = System.getProperty("comparison.dump.all") == "true" - -fun File.hash() = Files.hash(this, Hashing.crc32()) - -fun getDirectoryString(dir: File, interestingPaths: List): String { - val buf = StringBuilder() - val p = Printer(buf) - - - fun addDirContent(dir: File) { - p.pushIndent() - - val listFiles = dir.listFiles() - assertNotNull(listFiles) - - val children = listFiles!!.sortedWith(compareBy({ it.isDirectory }, { it.name })) - for (child in children) { - if (child.isDirectory) { - p.println(child.name) - addDirContent(child) - } - else { - p.println(child.name, " ", child.hash()) - } - } - - p.popIndent() - } - - - p.println(".") - addDirContent(dir) - - for (path in interestingPaths) { - p.println("================", path, "================") - p.println(fileToStringRepresentation(File(dir, path))) - p.println() - p.println() - } - - return buf.toString() -} - -fun getAllRelativePaths(dir: File): Set { - val result = HashSet() - FileUtil.processFilesRecursively(dir) { - if (it!!.isFile) { - result.add(FileUtil.getRelativePath(dir, it)!!) - } - - true - } - - return result -} - -fun assertEqualDirectories(expected: File, actual: File, forgiveExtraFiles: Boolean) { - val pathsInExpected = getAllRelativePaths(expected) - val pathsInActual = getAllRelativePaths(actual) - - val commonPaths = Sets.intersection(pathsInExpected, pathsInActual) - val changedPaths = commonPaths - .filter { DUMP_ALL || !Arrays.equals(File(expected, it).readBytes(), File(actual, it).readBytes()) } - .sorted() - - val expectedString = getDirectoryString(expected, changedPaths) - val actualString = getDirectoryString(actual, changedPaths) - - if (DUMP_ALL) { - assertEquals(expectedString, actualString + " ") - } - - if (forgiveExtraFiles) { - // If compilation fails, output may be different for full rebuild and partial make. Parsing output (directory string) for simplicity. - if (changedPaths.isEmpty()) { - val expectedListingLines = expectedString.split('\n').toList() - val actualListingLines = actualString.split('\n').toList() - if (actualListingLines.containsAll(expectedListingLines)) { - return - } - } - } - - assertEquals(expectedString, actualString) -} - -fun classFileToString(classFile: File): String { - val out = StringWriter() - - val traceVisitor = TraceClassVisitor(PrintWriter(out)) - ClassReader(classFile.readBytes()).accept(traceVisitor, 0) - - val classHeader = LocalFileKotlinClass.create(classFile)?.classHeader - - val annotationDataEncoded = classHeader?.data - if (annotationDataEncoded != null) { - ByteArrayInputStream(BitEncoding.decodeBytes(annotationDataEncoded)).use { - input -> - - out.write("\n------ string table types proto -----\n${DebugJvmProtoBuf.StringTableTypes.parseDelimitedFrom(input)}") - - if (!classHeader!!.metadataVersion.isCompatible()) { - error("Incompatible class ($classHeader): $classFile") - } - - when (classHeader.kind) { - KotlinClassHeader.Kind.FILE_FACADE -> - out.write("\n------ file facade proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") - KotlinClassHeader.Kind.CLASS -> - out.write("\n------ class proto -----\n${DebugProtoBuf.Class.parseFrom(input, getExtensionRegistry())}") - KotlinClassHeader.Kind.MULTIFILE_CLASS_PART -> - out.write("\n------ multi-file part proto -----\n${DebugProtoBuf.Package.parseFrom(input, getExtensionRegistry())}") - else -> throw IllegalStateException() - } - } - } - - return out.toString() -} - -fun getExtensionRegistry(): ExtensionRegistry { - val registry = ExtensionRegistry.newInstance()!! - DebugJvmProtoBuf.registerAllExtensions(registry) - return registry -} - -fun fileToStringRepresentation(file: File): String { - return when { - file.name.endsWith(".class") -> { - classFileToString(file) - } - else -> { - file.readText() - } - } -} From cd0c962c7cc0b66cafa4dba3435453ef0b468d75 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 17 Feb 2016 18:27:52 +0300 Subject: [PATCH 0810/1557] Add dummy files to fix gradle incremental tests Gradle won't call kotlin task if source directory is empty KT-8487 Original commit: 402436f3ebd65bf453d093ab01ad861870de3d38 --- .../pureKotlin/moveClass/build.log | 9 +++++++++ .../moveClass/experimental-ic-build.log | 20 +++++++++++++++++++ .../incremental/pureKotlin/moveClass/other.kt | 3 +++ .../pureKotlin/packageRemoved/build.log | 11 +++++++++- .../packageRemoved/experimental-ic-build.log | 13 ++++++++++++ .../pureKotlin/packageRemoved/other.kt | 3 +++ .../javaToKotlinAndRemove/build.log | 18 +++++++++++++++++ .../experimental-ic-build.log | 20 +++++++++++++++++++ .../javaToKotlinAndRemove/other.kt | 3 +++ 9 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveClass/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveClass/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/other.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log index dd9aff0f44c..711548a7e6d 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/build.log @@ -16,5 +16,14 @@ Cleaning output files: End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/experimental-ic-build.log new file mode 100644 index 00000000000..bb01e5d56e8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/experimental-ic-build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/Foo.class +End of files +Compiling files: + src/b.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/Foo.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/other.kt new file mode 100644 index 00000000000..d3689e2ea8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveClass/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log index c71c9f3e205..5c5f23eea4a 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/build.log @@ -9,5 +9,14 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: OK +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..b44cdc0a85f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/experimental-ic-build.log @@ -0,0 +1,13 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/AKt.class +End of files +Cleaning output files: + out/production/module/test/BKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/other.kt new file mode 100644 index 00000000000..d3689e2ea8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/packageRemoved/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log index 5b9f74cd080..499bdd9ebf4 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/build.log @@ -6,6 +6,15 @@ End of files Compiling files: src/TheClass.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files Exit code: OK ------------------------------------------ @@ -16,5 +25,14 @@ Cleaning output files: End of files Compiling files: End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/experimental-ic-build.log new file mode 100644 index 00000000000..5b9f74cd080 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/experimental-ic-build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/TheClass.class +End of files +Compiling files: + src/TheClass.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/TheClass.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file From cf417d5c9ff11b26e79e7271b00642f8cd579e7a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 19 Feb 2016 16:00:09 +0300 Subject: [PATCH 0811/1557] Pass isPackage = false when processing class proto KT-8487 Original commit: ba386f031bfb5b0742caf7745ecedbaa16d7c25f --- .../pureKotlin/classObjectConstantChanged/build.log | 2 +- .../classObjectConstantChanged/experimental-ic-build.log | 6 ++++-- .../incremental/pureKotlin/objectConstantChanged/build.log | 2 +- .../objectConstantChanged/experimental-ic-build.log | 4 +++- .../pureKotlin/traitClassObjectConstantChanged/build.log | 2 +- .../experimental-ic-build.log | 4 +++- 6 files changed, 13 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 9709f96d08e..fb1d8a2567e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -16,4 +16,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log index bf455b07c77..8b4f21d7ead 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/experimental-ic-build.log @@ -7,7 +7,9 @@ End of files Compiling files: src/const.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/test/Klass$Companion.class @@ -19,4 +21,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log index 5ef732c6a6f..144b5ab2934 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -15,4 +15,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log index 1b6aab2fc85..4c041f2743b 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/experimental-ic-build.log @@ -6,7 +6,9 @@ End of files Compiling files: src/const.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/test/Object.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index c4ae0d3901e..ff93496f568 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -16,4 +16,4 @@ Compiling files: src/usage.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log index 33d35483270..ebb5d82b894 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/experimental-ic-build.log @@ -7,7 +7,9 @@ End of files Compiling files: src/const.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/test/Trait$Companion.class From 378aafae692fb7d7b0bc2127bb10d0e4bf84d03a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Mar 2016 00:55:43 +0300 Subject: [PATCH 0812/1557] Add missing enum entry added/removed tests #KT-6200 fixed Original commit: 9523a8b88d3370d11fada72902d0ea7033309a5c --- ...perimentalIncrementalJpsTestGenerated.java | 18 ++++++++ .../build/IncrementalJpsTestGenerated.java | 12 ++++++ .../enumEntryRemoved/Enum.kt | 5 +++ .../enumEntryRemoved/Enum.kt.new.1 | 4 ++ .../enumEntryRemoved/build.log | 43 +++++++++++++++++++ .../enumEntryRemoved/getRandomEnumEntry.kt | 6 +++ .../enumEntryRemoved/use.kt | 8 ++++ .../enumEntryRemoved/use.kt.new.2 | 7 +++ .../enumEntryRemoved/useEnumImplicitly.kt | 3 ++ .../javaUsedInKotlin/enumEntryAdded/Enum.java | 4 ++ .../enumEntryAdded/Enum.java.new.1 | 5 +++ .../javaUsedInKotlin/enumEntryAdded/build.log | 22 ++++++++++ .../enumEntryAdded/getRandomEnumEntry.kt | 6 +++ .../javaUsedInKotlin/enumEntryAdded/use.kt | 7 +++ .../enumEntryAdded/use.kt.new.2 | 8 ++++ .../enumEntryAdded/useEnumImplicitly.kt | 3 ++ .../enumEntryRemoved/Enum.java | 5 +++ .../enumEntryRemoved/Enum.java.new.1 | 4 ++ .../enumEntryRemoved/build.log | 35 +++++++++++++++ .../enumEntryRemoved/getRandomEnumEntry.kt | 6 +++ .../javaUsedInKotlin/enumEntryRemoved/use.kt | 8 ++++ .../enumEntryRemoved/use.kt.new.2 | 7 +++ .../enumEntryRemoved/useEnumImplicitly.kt | 3 ++ 23 files changed, 229 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 99e59a204cc..b3da1e07334 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -807,6 +807,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("enumEntryAdded") + public void testEnumEntryAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/"); + doTest(fileName); + } + + @TestMetadata("enumEntryRemoved") + public void testEnumEntryRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/"); + doTest(fileName); + } + @TestMetadata("javaAndKotlinChangedSimultaneously") public void testJavaAndKotlinChangedSimultaneously() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/"); @@ -1123,6 +1135,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("enumEntryRemoved") + public void testEnumEntryRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/"); + doTest(fileName); + } + @TestMetadata("enumMemberChanged") public void testEnumMemberChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 80c2bd6ca57..2e2da5f5f72 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -807,6 +807,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("enumEntryAdded") + public void testEnumEntryAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/"); + doTest(fileName); + } + + @TestMetadata("enumEntryRemoved") + public void testEnumEntryRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/"); + doTest(fileName); + } + @TestMetadata("javaAndKotlinChangedSimultaneously") public void testJavaAndKotlinChangedSimultaneously() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously/"); diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt new file mode 100644 index 00000000000..d8b67e71746 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt @@ -0,0 +1,5 @@ +enum class Enum { + A, + B, + C +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1 new file mode 100644 index 00000000000..8e80c9708b0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/Enum.kt.new.1 @@ -0,0 +1,4 @@ +enum class Enum { + A, + B +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log new file mode 100644 index 00000000000..41bafdcc2fb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log @@ -0,0 +1,43 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/Enum.class +End of files +Compiling files: + src/Enum.kt +End of files +Marked as dirty by Kotlin: + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/GetRandomEnumEntryKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseEnumImplicitlyKt.class + out/production/module/UseKt.class +End of files +Compiling files: + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: C + +================ Step #2 ================= + +Cleaning output files: + out/production/module/Enum.class +End of files +Compiling files: + src/Enum.kt + src/getRandomEnumEntry.kt + src/use.kt + src/useEnumImplicitly.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt new file mode 100644 index 00000000000..2845b19351c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/getRandomEnumEntry.kt @@ -0,0 +1,6 @@ +import java.util.Random + +fun getRandomEnumEntry() = + with (Enum.values()) { + get(Random().nextInt(size)) + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt new file mode 100644 index 00000000000..d64d3769328 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt @@ -0,0 +1,8 @@ +import Enum.* + +fun use(e: Enum): String = + when (e) { + A -> "A" + B -> "B" + C -> "C" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2 new file mode 100644 index 00000000000..14d2aa5be07 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/use.kt.new.2 @@ -0,0 +1,7 @@ +import Enum.* + +fun use(e: Enum): String = + when (e) { + A -> "A" + B -> "B" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt new file mode 100644 index 00000000000..d5ad0b4c83a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/useEnumImplicitly.kt @@ -0,0 +1,3 @@ +fun useImplicit() { + println(use(getRandomEnumEntry())) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java new file mode 100644 index 00000000000..a5b25884ea6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java @@ -0,0 +1,4 @@ +public enum Enum { + A, + B +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1 new file mode 100644 index 00000000000..dc41c6883d8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/Enum.java.new.1 @@ -0,0 +1,5 @@ +public enum Enum { + A, + B, + C +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log new file mode 100644 index 00000000000..43d2c5501a4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/Enum.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/Enum.java +End of files + +================ Step #2 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UseKt.class +End of files +Compiling files: + src/use.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt new file mode 100644 index 00000000000..2845b19351c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/getRandomEnumEntry.kt @@ -0,0 +1,6 @@ +import java.util.Random + +fun getRandomEnumEntry() = + with (Enum.values()) { + get(Random().nextInt(size)) + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt new file mode 100644 index 00000000000..14d2aa5be07 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt @@ -0,0 +1,7 @@ +import Enum.* + +fun use(e: Enum): String = + when (e) { + A -> "A" + B -> "B" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2 new file mode 100644 index 00000000000..d64d3769328 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/use.kt.new.2 @@ -0,0 +1,8 @@ +import Enum.* + +fun use(e: Enum): String = + when (e) { + A -> "A" + B -> "B" + C -> "C" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt new file mode 100644 index 00000000000..d5ad0b4c83a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/useEnumImplicitly.kt @@ -0,0 +1,3 @@ +fun useImplicit() { + println(use(getRandomEnumEntry())) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java new file mode 100644 index 00000000000..dc41c6883d8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java @@ -0,0 +1,5 @@ +public enum Enum { + A, + B, + C +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1 new file mode 100644 index 00000000000..a5b25884ea6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/Enum.java.new.1 @@ -0,0 +1,4 @@ +public enum Enum { + A, + B +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log new file mode 100644 index 00000000000..fbad2c8600c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log @@ -0,0 +1,35 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/Enum.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/Enum.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UseKt.class +End of files +Compiling files: + src/use.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: C + +================ Step #2 ================= + +Cleaning output files: + out/production/module/Enum.class +End of files +Compiling files: + src/use.kt +End of files +Exit code: OK +------------------------------------------ +Compiling files: + src/Enum.java +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt new file mode 100644 index 00000000000..2845b19351c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/getRandomEnumEntry.kt @@ -0,0 +1,6 @@ +import java.util.Random + +fun getRandomEnumEntry() = + with (Enum.values()) { + get(Random().nextInt(size)) + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt new file mode 100644 index 00000000000..d64d3769328 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt @@ -0,0 +1,8 @@ +import Enum.* + +fun use(e: Enum): String = + when (e) { + A -> "A" + B -> "B" + C -> "C" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2 b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2 new file mode 100644 index 00000000000..14d2aa5be07 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/use.kt.new.2 @@ -0,0 +1,7 @@ +import Enum.* + +fun use(e: Enum): String = + when (e) { + A -> "A" + B -> "B" + } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt new file mode 100644 index 00000000000..d5ad0b4c83a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/useEnumImplicitly.kt @@ -0,0 +1,3 @@ +fun useImplicit() { + println(use(getRandomEnumEntry())) +} \ No newline at end of file From 1e279a8c35e83fbc4216f2edf951228b0bf483ae Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 Mar 2016 15:10:07 +0300 Subject: [PATCH 0813/1557] Test IC for adding private inline function #KT-9681 fixed Original commit: a3893a3c2e6d6e7f9bfd37be1a7b4e95043b7774 --- ...perimentalIncrementalJpsTestGenerated.java | 6 ++++++ .../build/IncrementalJpsTestGenerated.java | 6 ++++++ .../inlinePrivateFunctionAdded/build.log | 20 +++++++++++++++++++ .../experimental-ic-build.log | 11 ++++++++++ .../inlinePrivateFunctionAdded/inline.kt | 10 ++++++++++ .../inlinePrivateFunctionAdded/inline.kt.new | 16 +++++++++++++++ .../inlinePrivateFunctionAdded/other.kt | 3 +++ 7 files changed, 72 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index b3da1e07334..d712367a8f0 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -389,6 +389,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("inlinePrivateFunctionAdded") + public void testInlinePrivateFunctionAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 2e2da5f5f72..4147bcbd732 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -389,6 +389,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlinePrivateFunctionAdded") + public void testInlinePrivateFunctionAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log new file mode 100644 index 00000000000..2320b705b27 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log new file mode 100644 index 00000000000..b908417e51c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/experimental-ic-build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt new file mode 100644 index 00000000000..f573f09d977 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt @@ -0,0 +1,10 @@ +package foo + +fun test() { + oldInlineFun() +} + +inline +private fun oldInlineFun() { + println("oldInlineFun") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new new file mode 100644 index 00000000000..c1fcbf02c30 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/inline.kt.new @@ -0,0 +1,16 @@ +package foo + +inline +private fun newInlineFun() { + println("newInlineFun") +} + +fun test() { + newInlineFun() + oldInlineFun() +} + +inline +private fun oldInlineFun() { + println("oldInlineFun") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePrivateFunctionAdded/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file From a763af2ae00c331d1b1747dd1e16ffa0b5bce045 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 9 Mar 2016 14:17:20 +0300 Subject: [PATCH 0814/1557] Add incremental tests for parameters with default values Original commit: d352905a7262693e7b1bc80a29609f3691fbe22b --- ...perimentalIncrementalJpsTestGenerated.java | 66 ++++++++++++++++++- .../build/IncrementalJpsTestGenerated.java | 54 ++++++++++++++- .../ProtoComparisonTestGenerated.java | 12 ++++ .../defaultValues/new.kt | 17 +++++ .../defaultValues/old.kt | 17 +++++ .../defaultValues/result.out | 7 ++ .../packageMembers/defaultValues/new.kt | 8 +++ .../packageMembers/defaultValues/old.kt | 8 +++ .../packageMembers/defaultValues/result.out | 2 + .../build.log | 38 +++++++++++ .../dependencies.txt | 2 + .../module1_A.kt | 3 + .../module1_A.kt.new.1 | 3 + .../module2_createADefault.kt | 5 ++ .../module2_createANonDefault.kt | 5 ++ .../module2_createANonDefault.kt.delete.2} | 0 .../build.log | 38 +++++++++++ .../dependencies.txt | 2 + .../module1_A.kt | 3 + .../module1_A.kt.new.1 | 3 + .../module2_createADefault.kt | 5 ++ .../module2_createADefault.kt.delete.2 | 0 .../module2_createANonDefault.kt | 5 ++ .../defaultArgumentInConstructorAdded/A.kt | 3 + .../A.kt.new.1 | 3 + .../defaultArgumentInConstructorAdded/B.kt | 3 + .../defaultArgumentInConstructorAdded/C.kt | 3 + .../build.log | 29 ++++++++ .../createA.kt | 5 ++ .../createB.kt | 5 ++ .../experimental-ic-build.log | 27 ++++++++ .../defaultArgumentInConstructorAdded/useA.kt | 3 + .../defaultArgumentInConstructorAdded/useB.kt | 3 + .../defaultArgumentInConstructorRemoved/A.kt | 3 + .../A.kt.new.1 | 3 + .../defaultArgumentInConstructorRemoved/B.kt | 3 + .../defaultArgumentInConstructorRemoved/C.kt | 3 + .../build.log | 50 ++++++++++++++ .../createADefault.kt | 5 ++ .../createANonDefault.kt | 5 ++ .../createANonDefault.kt.delete.2 | 0 .../createB.kt | 5 ++ .../experimental-ic-build.log | 46 +++++++++++++ .../useA.kt | 3 + .../useB.kt | 3 + .../pureKotlin/defaultArguments/a.kt | 3 - .../pureKotlin/defaultArguments/b.kt | 3 - .../pureKotlin/defaultValueAdded/build.log | 24 +++++++ .../experimental-ic-build.log | 25 +++++++ .../pureKotlin/defaultValueAdded/fun.kt | 9 +++ .../pureKotlin/defaultValueAdded/fun.kt.new.1 | 9 +++ .../pureKotlin/defaultValueAdded/other.kt | 3 + .../defaultValueAdded/useDefault.kt | 5 ++ .../defaultValueAdded/useNonDefault.kt | 5 ++ .../build.log | 6 +- .../pureKotlin/defaultValueChanged/fun.kt | 3 + .../pureKotlin/defaultValueChanged/fun.kt.new | 3 + .../defaultValueChanged/useDefault.kt | 5 ++ .../defaultValueChanged/useNonDefault.kt | 5 ++ .../defaultValueInConstructorAdded/A.kt | 8 +++ .../defaultValueInConstructorAdded/A.kt.new.1 | 8 +++ .../defaultValueInConstructorAdded/B.kt | 3 + .../defaultValueInConstructorAdded/C.kt | 3 + .../defaultValueInConstructorAdded/build.log | 33 ++++++++++ .../createADefault.kt | 5 ++ .../createANonDefault.kt | 5 ++ .../defaultValueInConstructorAdded/createB.kt | 5 ++ .../experimental-ic-build.log | 32 +++++++++ .../defaultValueInConstructorAdded/useA.kt | 3 + .../defaultValueInConstructorAdded/useB.kt | 3 + .../defaultValueInConstructorChanged/A.kt | 3 + .../A.kt.new.1 | 3 + .../defaultValueInConstructorChanged/B.kt | 3 + .../defaultValueInConstructorChanged/C.kt | 3 + .../build.log | 10 +++ .../createADefault.kt | 5 ++ .../createANonDefault.kt | 5 ++ .../createB.kt | 5 ++ .../defaultValueInConstructorChanged/useA.kt | 3 + .../defaultValueInConstructorChanged/useB.kt | 3 + .../defaultValueInConstructorRemoved/A.kt | 3 + .../A.kt.new.1 | 3 + .../defaultValueInConstructorRemoved/B.kt | 3 + .../defaultValueInConstructorRemoved/C.kt | 3 + .../build.log | 52 +++++++++++++++ .../createADefault.kt | 5 ++ .../createANonDefault.kt | 5 ++ .../createB.kt | 5 ++ .../experimental-ic-build.log | 48 ++++++++++++++ .../defaultValueInConstructorRemoved/useA.kt | 3 + .../defaultValueInConstructorRemoved/useB.kt | 3 + .../pureKotlin/defaultValueRemoved1/build.log | 40 +++++++++++ .../experimental-ic-build.log | 40 +++++++++++ .../pureKotlin/defaultValueRemoved1/fun.kt | 5 ++ .../defaultValueRemoved1/fun.kt.new.1 | 5 ++ .../pureKotlin/defaultValueRemoved1/other.kt | 3 + .../defaultValueRemoved1/useDefault.kt | 5 ++ .../defaultValueRemoved1/useDefault.kt.new.2 | 5 ++ .../defaultValueRemoved1/useNonDefault.kt | 5 ++ .../pureKotlin/defaultValueRemoved2/build.log | 44 +++++++++++++ .../experimental-ic-build.log | 45 +++++++++++++ .../pureKotlin/defaultValueRemoved2/fun.kt | 5 ++ .../defaultValueRemoved2/fun.kt.new.1 | 5 ++ .../pureKotlin/defaultValueRemoved2/other.kt | 3 + .../defaultValueRemoved2/useDefault1.kt | 5 ++ .../defaultValueRemoved2/useDefault1.kt.new.2 | 5 ++ .../defaultValueRemoved2/useDefault2.kt | 5 ++ .../defaultValueRemoved2/useDefault2.kt.new.2 | 5 ++ .../defaultValueRemoved2/useNonDefault.kt | 5 ++ 109 files changed, 1128 insertions(+), 15 deletions(-) create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt create mode 100644 jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/defaultValues/new.kt create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/defaultValues/old.kt create mode 100644 jps/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt rename jps/jps-plugin/testData/incremental/{pureKotlin/defaultArguments/a.kt.touch => classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2} (100%) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt rename jps/jps-plugin/testData/incremental/pureKotlin/{defaultArguments => defaultValueChanged}/build.log (65%) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index d712367a8f0..cf616f82111 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -287,9 +287,57 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } - @TestMetadata("defaultArguments") - public void testDefaultArguments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + @TestMetadata("defaultArgumentInConstructorAdded") + public void testDefaultArgumentInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultArgumentInConstructorRemoved") + public void testDefaultArgumentInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultValueAdded") + public void testDefaultValueAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultValueChanged") + public void testDefaultValueChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorAdded") + public void testDefaultValueInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorChanged") + public void testDefaultValueInConstructorChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorRemoved") + public void testDefaultValueInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultValueRemoved1") + public void testDefaultValueRemoved1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/"); + doTest(fileName); + } + + @TestMetadata("defaultValueRemoved2") + public void testDefaultValueRemoved2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/"); doTest(fileName); } @@ -1231,6 +1279,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("multiModuleDefaultArgumentInConstructorRemoved") + public void testMultiModuleDefaultArgumentInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("multiModuleDefaultValueInConstructorRemoved") + public void testMultiModuleDefaultValueInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/"); + doTest(fileName); + } + @TestMetadata("multiModuleExported") public void testMultiModuleExported() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/"); diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 4147bcbd732..cefa62c3483 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -287,9 +287,57 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("defaultArguments") - public void testDefaultArguments() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArguments/"); + @TestMetadata("defaultArgumentInConstructorAdded") + public void testDefaultArgumentInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultArgumentInConstructorRemoved") + public void testDefaultArgumentInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultValueAdded") + public void testDefaultValueAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultValueChanged") + public void testDefaultValueChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorAdded") + public void testDefaultValueInConstructorAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorChanged") + public void testDefaultValueInConstructorChanged() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/"); + doTest(fileName); + } + + @TestMetadata("defaultValueInConstructorRemoved") + public void testDefaultValueInConstructorRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/"); + doTest(fileName); + } + + @TestMetadata("defaultValueRemoved1") + public void testDefaultValueRemoved1() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/"); + doTest(fileName); + } + + @TestMetadata("defaultValueRemoved2") + public void testDefaultValueRemoved2() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/"); doTest(fileName); } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 8cd04959b04..32bbb470923 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -159,6 +159,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { doTest(fileName); } + @TestMetadata("defaultValues") + public void testDefaultValues() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/"); + doTest(fileName); + } + @TestMetadata("membersFlagsChanged") public void testMembersFlagsChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged/"); @@ -181,6 +187,12 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); } + @TestMetadata("defaultValues") + public void testDefaultValues() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/defaultValues/"); + doTest(fileName); + } + @TestMetadata("membersFlagsChanged") public void testMembersFlagsChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged/"); diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt new file mode 100644 index 00000000000..b8fdf2c6d41 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/new.kt @@ -0,0 +1,17 @@ +package test + +class A { + fun argumentAdded(x: Int = 1) {} + fun argumentRemoved() {} + + fun valueAdded(x: Int = 3) {} + fun valueRemoved(x: Int) {} + fun valueChanged(x: Int = 6) {} +} + +class ConstructorValueAdded(x: Int = 7) +class ConstructorValueRemoved(x: Int) +class ConstructorValueChanged(x: Int = 20) + +class ConstructorArgumentAdded(x: Int = 9) +class ConstructorArgumentRemoved() \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt new file mode 100644 index 00000000000..e4bca5f4515 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/old.kt @@ -0,0 +1,17 @@ +package test + +class A { + fun argumentAdded() {} + fun argumentRemoved(x: Int = 2) {} + + fun valueAdded(x: Int) {} + fun valueRemoved(x: Int = 4) {} + fun valueChanged(x: Int = 5) {} +} + +class ConstructorValueAdded(x: Int) +class ConstructorValueRemoved(x: Int = 8) +class ConstructorValueChanged(x: Int = 19) + +class ConstructorArgumentAdded() +class ConstructorArgumentRemoved(x: Int = 10) \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out new file mode 100644 index 00000000000..38bb7923619 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues/result.out @@ -0,0 +1,7 @@ +changes in test/A: MEMBERS + [argumentAdded, argumentRemoved, valueAdded, valueRemoved] +changes in test/ConstructorArgumentAdded: CLASS_SIGNATURE +changes in test/ConstructorArgumentRemoved: CLASS_SIGNATURE +changes in test/ConstructorValueAdded: CLASS_SIGNATURE +changes in test/ConstructorValueChanged: NONE +changes in test/ConstructorValueRemoved: CLASS_SIGNATURE diff --git a/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/new.kt b/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/new.kt new file mode 100644 index 00000000000..928941e3ec0 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/new.kt @@ -0,0 +1,8 @@ +package test + +fun argumentAdded(x: Int = 1) {} +fun argumentRemoved() {} + +fun valueAdded(x: Int = 3) {} +fun valueRemoved(x: Int) {} +fun valueChanged(x: Int = 6) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/old.kt b/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/old.kt new file mode 100644 index 00000000000..5b95a0ab6a0 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/old.kt @@ -0,0 +1,8 @@ +package test + +fun argumentAdded() {} +fun argumentRemoved(x: Int = 2) {} + +fun valueAdded(x: Int) {} +fun valueRemoved(x: Int = 4) {} +fun valueChanged(x: Int = 5) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out b/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out new file mode 100644 index 00000000000..3c50291bd28 --- /dev/null +++ b/jps/jps-plugin/testData/comparison/packageMembers/defaultValues/result.out @@ -0,0 +1,2 @@ +changes in test/MainKt: MEMBERS + [argumentAdded, argumentRemoved, valueAdded, valueRemoved] diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log new file mode 100644 index 00000000000..a5bdbe5bd98 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log @@ -0,0 +1,38 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/module1_A.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_createADefault.kt + module2/src/module2_createANonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_createADefaultKt.class + out/production/module2/foo/Module2_createANonDefaultKt.class +End of files +Compiling files: + module2/src/module2_createADefault.kt + module2/src/module2_createANonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Too many arguments for public constructor A() defined in foo.A + +================ Step #2 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + module2/src/module2_createADefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt new file mode 100644 index 00000000000..ec937d3cdd9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt new file mode 100644 index 00000000000..532efaa3af5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt @@ -0,0 +1,3 @@ +package foo + +class A(x: Int = 10) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 new file mode 100644 index 00000000000..a772984c7e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module1_A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +class A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt new file mode 100644 index 00000000000..592d4e7aea8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(20) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt.touch rename to jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/module2_createANonDefault.kt.delete.2 diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log new file mode 100644 index 00000000000..fd6e6c52645 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log @@ -0,0 +1,38 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/module1_A.kt +End of files +Marked as dirty by Kotlin: + module2/src/module2_createADefault.kt + module2/src/module2_createANonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/Module2_createADefaultKt.class + out/production/module2/foo/Module2_createANonDefaultKt.class +End of files +Compiling files: + module2/src/module2_createADefault.kt + module2/src/module2_createANonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x + +================ Step #2 ================= + +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + module2/src/module2_createANonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt new file mode 100644 index 00000000000..ec937d3cdd9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt new file mode 100644 index 00000000000..532efaa3af5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt @@ -0,0 +1,3 @@ +package foo + +class A(x: Int = 10) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 new file mode 100644 index 00000000000..af03c523fef --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module1_A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +class A(x: Int) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createADefault.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt new file mode 100644 index 00000000000..592d4e7aea8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/module2_createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(20) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt new file mode 100644 index 00000000000..21a27277384 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 new file mode 100644 index 00000000000..e55b1518b83 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 10) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt new file mode 100644 index 00000000000..eabe4db6463 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log new file mode 100644 index 00000000000..f0bdbb8c6f7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/build.log @@ -0,0 +1,29 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/C.class + out/production/module/foo/CreateAKt.class + out/production/module/foo/CreateBKt.class + out/production/module/foo/UseAKt.class + out/production/module/foo/UseBKt.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/createA.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createA.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log new file mode 100644 index 00000000000..ed5652a5e41 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/experimental-ic-build.log @@ -0,0 +1,27 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createA.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/CreateAKt.class + out/production/module/foo/UseAKt.class +End of files +Compiling files: + src/B.kt + src/createA.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorAdded/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt new file mode 100644 index 00000000000..e55b1518b83 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 10) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 new file mode 100644 index 00000000000..21a27277384 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt new file mode 100644 index 00000000000..eabe4db6463 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log new file mode 100644 index 00000000000..430625ca53d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/build.log @@ -0,0 +1,50 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/C.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/CreateBKt.class + out/production/module/foo/UseAKt.class + out/production/module/foo/UseBKt.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/createADefault.kt + src/createANonDefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Too many arguments for public constructor A() defined in foo.A + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/C.kt + src/createADefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt new file mode 100644 index 00000000000..30f71d1945d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(10) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createANonDefault.kt.delete.2 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..0ee15e9f36d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/experimental-ic-build.log @@ -0,0 +1,46 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/UseAKt.class +End of files +Compiling files: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Too many arguments for public constructor A() defined in foo.A + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/createADefault.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArgumentInConstructorRemoved/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt deleted file mode 100644 index 1609642a906..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/a.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun a(p1: String, p2: String? = null) { - -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt deleted file mode 100644 index 21bf9e204ba..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/b.kt +++ /dev/null @@ -1,3 +0,0 @@ -fun b(p1: String, p2: String? = null) { - -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log new file mode 100644 index 00000000000..e5448796571 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/UseDefaultKt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/other.kt + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log new file mode 100644 index 00000000000..9c5c62e65b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/experimental-ic-build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault.kt + src/useNonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefaultKt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt new file mode 100644 index 00000000000..1f588b0f8c3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt @@ -0,0 +1,9 @@ +package test + +fun f(x: Any) { + println("f(x: Any)") +} + +fun f(x: Int, y: Int) { + println("f(x=$x, y=$y)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 new file mode 100644 index 00000000000..e77870d39b3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/fun.kt.new.1 @@ -0,0 +1,9 @@ +package test + +fun f(x: Any) { + println("f(x: Any)") +} + +fun f(x: Int, y: Int = 2) { + println("f(x=$x, y=$y)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt new file mode 100644 index 00000000000..73e68e1b5e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault1() { + f(10) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt new file mode 100644 index 00000000000..26114226465 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueAdded/useNonDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useNonDefault() { + f(10, 20) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log similarity index 65% rename from jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log index 7ff4e7fca9b..425c4a969b0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/defaultArguments/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/build.log @@ -1,11 +1,11 @@ ================ Step #1 ================= Cleaning output files: - out/production/module/AKt.class out/production/module/META-INF/module.kotlin_module + out/production/module/foo/FunKt.class End of files Compiling files: - src/a.kt + src/fun.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt new file mode 100644 index 00000000000..edc19c98005 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt @@ -0,0 +1,3 @@ +package foo + +fun f(x: Int = 10) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new new file mode 100644 index 00000000000..4a286548bb2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/fun.kt.new @@ -0,0 +1,3 @@ +package foo + +fun f(x: Int = 20) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt new file mode 100644 index 00000000000..32cc748fe73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun useDefault() { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt new file mode 100644 index 00000000000..a6201ac0864 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueChanged/useNonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun useNonDefault() { + f(15) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt new file mode 100644 index 00000000000..1aa0cb739a3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt @@ -0,0 +1,8 @@ +package foo + +open class A(x: Int) + +// The use of annotation here is intentional, so no change for "fun A" is detected, +// but after adding default value to A constructor, we want to force resolve to the constructor +@Deprecated("Warning", level = DeprecationLevel.WARNING) +fun A() = A(30) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 new file mode 100644 index 00000000000..9c989355cd0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/A.kt.new.1 @@ -0,0 +1,8 @@ +package foo + +open class A(x: Int = 10) + +// The use of annotation here is intentional, so no change for "fun A" is detected, +// but after adding default value to A constructor, we want to force resolve to the constructor +@Deprecated("Hidden", level = DeprecationLevel.HIDDEN) +fun A() = A(30) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt new file mode 100644 index 00000000000..a0a7d08e730 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A(20) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log new file mode 100644 index 00000000000..eb037521ebe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/build.log @@ -0,0 +1,33 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/A.class + out/production/module/foo/AKt.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/C.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/CreateBKt.class + out/production/module/foo/UseAKt.class + out/production/module/foo/UseBKt.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/createADefault.kt + src/createANonDefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt new file mode 100644 index 00000000000..e8df2c0192d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(15) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log new file mode 100644 index 00000000000..ffa764fb740 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/experimental-ic-build.log @@ -0,0 +1,32 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/A.class + out/production/module/foo/AKt.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/UseAKt.class +End of files +Compiling files: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorAdded/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt new file mode 100644 index 00000000000..e55b1518b83 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 10) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 new file mode 100644 index 00000000000..595bfd1ae98 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 11) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt new file mode 100644 index 00000000000..a0a7d08e730 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A(20) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log new file mode 100644 index 00000000000..0859bcf46fd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/build.log @@ -0,0 +1,10 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt new file mode 100644 index 00000000000..e8df2c0192d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(15) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorChanged/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt new file mode 100644 index 00000000000..e55b1518b83 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int = 10) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 new file mode 100644 index 00000000000..f9474759c7d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/A.kt.new.1 @@ -0,0 +1,3 @@ +package foo + +open class A(x: Int) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt new file mode 100644 index 00000000000..eabe4db6463 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt @@ -0,0 +1,3 @@ +package foo + +open class B() : A() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt new file mode 100644 index 00000000000..1cf6ddc7b3b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/C.kt @@ -0,0 +1,3 @@ +package foo + +class C : B() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log new file mode 100644 index 00000000000..b84f9294680 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/build.log @@ -0,0 +1,52 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/C.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/CreateBKt.class + out/production/module/foo/UseAKt.class + out/production/module/foo/UseBKt.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/createADefault.kt + src/createANonDefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x +No value passed for parameter x + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/C.kt + src/createADefault.kt + src/createANonDefault.kt + src/createB.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt new file mode 100644 index 00000000000..0dd71808c10 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt new file mode 100644 index 00000000000..30f71d1945d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createANonDefault.kt @@ -0,0 +1,5 @@ +package foo + +fun createANonDefault() { + A(10) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt new file mode 100644 index 00000000000..b563c089603 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createB.kt @@ -0,0 +1,5 @@ +package foo + +fun createB() { + B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..d3de59c7890 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/experimental-ic-build.log @@ -0,0 +1,48 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/foo/CreateADefaultKt.class + out/production/module/foo/CreateANonDefaultKt.class + out/production/module/foo/UseAKt.class +End of files +Compiling files: + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x +No value passed for parameter x + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/createADefault.kt + src/createANonDefault.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt new file mode 100644 index 00000000000..b156f1532ae --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useA.kt @@ -0,0 +1,3 @@ +package foo + +fun useA(a: A) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt new file mode 100644 index 00000000000..3b441f0463c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/useB.kt @@ -0,0 +1,3 @@ +package foo + +fun useB(b: B) {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log new file mode 100644 index 00000000000..78a09c5c2cc --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/build.log @@ -0,0 +1,40 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/UseDefaultKt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/other.kt + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x + +================ Step #2 ================= + +Cleaning output files: + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt + src/other.kt + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log new file mode 100644 index 00000000000..16333b1de00 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/experimental-ic-build.log @@ -0,0 +1,40 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault.kt + src/useNonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefaultKt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter x + +================ Step #2 ================= + +Cleaning output files: + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt + src/useDefault.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt new file mode 100644 index 00000000000..1ca7cdfff4d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(x: Int = 1) { + println(x) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 new file mode 100644 index 00000000000..93139f5a688 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/fun.kt.new.1 @@ -0,0 +1,5 @@ +package test + +fun f(x: Int) { + println(x) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt new file mode 100644 index 00000000000..ebf29c4495a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault() { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 new file mode 100644 index 00000000000..6b03cc95a85 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useDefault.kt.new.2 @@ -0,0 +1,5 @@ +package test + +fun useDefault() { + f(5) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt new file mode 100644 index 00000000000..0d213872ad1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved1/useNonDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useNonDefault() { + f(10) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log new file mode 100644 index 00000000000..9fa0f2e459e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/build.log @@ -0,0 +1,44 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/test/UseDefault1Kt.class + out/production/module/test/UseDefault2Kt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/other.kt + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter y +No value passed for parameter y + +================ Step #2 ================= + +Cleaning output files: + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt + src/other.kt + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log new file mode 100644 index 00000000000..e4c98e81655 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/experimental-ic-build.log @@ -0,0 +1,45 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefault1Kt.class + out/production/module/test/UseDefault2Kt.class + out/production/module/test/UseNonDefaultKt.class +End of files +Compiling files: + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +No value passed for parameter y +No value passed for parameter y + +================ Step #2 ================= + +Cleaning output files: + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt + src/useDefault1.kt + src/useDefault2.kt + src/useNonDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt new file mode 100644 index 00000000000..3a7664d6786 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(x: Int = 1, y: Int = 2) { + println("f(x=$x, y=$y)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 new file mode 100644 index 00000000000..75d53a41009 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/fun.kt.new.1 @@ -0,0 +1,5 @@ +package test + +fun f(x: Int = 1, y: Int) { + println("f(x=$x, y=$y)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt new file mode 100644 index 00000000000..276164b5715 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault1() { + f() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 new file mode 100644 index 00000000000..4c4f45e0bf7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault1.kt.new.2 @@ -0,0 +1,5 @@ +package test + +fun useDefault1() { + f(y=6) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt new file mode 100644 index 00000000000..85d2ec30364 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault2() { + f(5) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 new file mode 100644 index 00000000000..a551748a2d3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useDefault2.kt.new.2 @@ -0,0 +1,5 @@ +package test + +fun useDefault2() { + f(5, 6) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt new file mode 100644 index 00000000000..26114226465 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueRemoved2/useNonDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useNonDefault() { + f(10, 20) +} \ No newline at end of file From bf97307b387f9abec5a14960e301edd8ba8c721b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 11 Mar 2016 02:39:55 +0300 Subject: [PATCH 0815/1557] Minor: add two accidentally deleted files to test case Original commit: 52be775f286652dd28d4964cc0d7f4d7bde4e4bc --- .../pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2 | 3 +++ .../defaultValueInConstructorRemoved/createADefault.kt.new.2 | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2 new file mode 100644 index 00000000000..4af1ce1941a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/B.kt.new.2 @@ -0,0 +1,3 @@ +package foo + +open class B() : A(5) \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2 new file mode 100644 index 00000000000..f413fc964cb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/defaultValueInConstructorRemoved/createADefault.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +fun createADefault() { + A(5) +} \ No newline at end of file From 0f4f707b6c7c60ad21f798f2fdb3eab8da915647 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 16 Mar 2016 14:42:13 +0300 Subject: [PATCH 0816/1557] Minor: source sources of SourceToOutputMap when dump it to make IC tests more stable Original commit: f00615c00ba487a2a6a81affcc41c04b31131cde --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index a1c52bc10a2..d822f30e170 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -337,7 +337,7 @@ abstract class AbstractIncrementalJpsTest( result.pushIndent() val mapping = project.dataManager.getSourceToOutputMap(target) - mapping.sources.forEach { + mapping.sources.sorted().forEach { val outputs = mapping.getOutputs(it)!!.sorted() if (outputs.isNotEmpty()) { result.println("source $it -> $outputs") From 01aab0deda8f062afe47e2633f197c1f569cfe71 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Mar 2016 14:57:17 +0300 Subject: [PATCH 0817/1557] Minor: removed experimental-ic-build.log duplicating build.log Original commit: 33cd661aad20772c4556fe7e0a56077597c4fbdb --- .../experimental-ic-build.log | 14 -------------- 1 file changed, 14 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log deleted file mode 100644 index d7c03378370..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/changeWithRemovingUsage/experimental-ic-build.log +++ /dev/null @@ -1,14 +0,0 @@ -================ Step #1 ================= - -Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/test/BarKt.class -End of files -Cleaning output files: - out/production/module/test/FooKt.class -End of files -Compiling files: - src/foo.kt -End of files -Exit code: OK ------------------------------------------- From b2c79c0ff30b28a9d71e7043bdda849a6b353b98 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 23 Mar 2016 13:38:47 +0300 Subject: [PATCH 0818/1557] IC: add tests with moving files Additionally added the ability to use directories in IC tests. #KT-8002 Obsolete Original commit: 9a9b863c9d7e03c309631d12702eb8142ec0f201 --- ...perimentalIncrementalJpsTestGenerated.java | 21 ++++++++- .../build/IncrementalJpsTestGenerated.java | 21 ++++++++- .../moveFileToAnotherModule/build.log | 43 +++++++++++++++++++ .../moveFileToAnotherModule/dependencies.txt | 2 + .../experimental-ic-build.log | 26 +++++++++++ .../moveFileToAnotherModule/module1_a.kt | 6 +++ .../moveFileToAnotherModule/module1_b.kt.new | 6 +++ .../moveFileToAnotherModule/module2_b.kt | 6 +++ .../module2_b.kt.delete | 0 .../module2_useClassA.kt | 5 +++ .../module2_useClassB.kt | 5 +++ .../module2_useFunA.kt | 5 +++ .../module2_useFunB.kt | 5 +++ .../moveFileWithChangingPackage/bar/a.kt.new | 5 +++ .../moveFileWithChangingPackage/bar/dummy.kt | 3 ++ .../moveFileWithChangingPackage/build.log | 27 ++++++++++++ .../experimental-ic-build.log | 25 +++++++++++ .../moveFileWithChangingPackage/foo/a.kt | 5 +++ .../foo/a.kt.delete | 0 .../moveFileWithChangingPackage/foo/dummy.kt | 3 ++ .../moveFileWithChangingPackage/useClass.kt | 8 ++++ .../moveFileWithChangingPackage/useFun.kt | 8 ++++ .../bar/a.kt.new | 5 +++ .../moveFileWithoutChangingPackage/build.log | 23 ++++++++++ .../moveFileWithoutChangingPackage/foo/a.kt | 5 +++ .../foo/a.kt.delete | 0 .../useClass.kt | 5 +++ .../moveFileWithoutChangingPackage/useFun.kt | 5 +++ 28 files changed, 274 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassB.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunA.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index cf616f82111..c3ca6dd14ba 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -103,6 +103,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("moveFileToAnotherModule") + public void testMoveFileToAnotherModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/"); + doTest(fileName); + } + @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); @@ -176,7 +182,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta } public void testAllFilesPresentInPureKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("annotations") @@ -485,6 +491,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("moveFileWithChangingPackage") + public void testMoveFileWithChangingPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/"); + doTest(fileName); + } + + @TestMetadata("moveFileWithoutChangingPackage") + public void testMoveFileWithoutChangingPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/"); + doTest(fileName); + } + @TestMetadata("multifileClassFileAdded") public void testMultifileClassFileAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); @@ -784,7 +802,6 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/incremental/withJava") diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index cefa62c3483..da142333f80 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -103,6 +103,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("moveFileToAnotherModule") + public void testMoveFileToAnotherModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/"); + doTest(fileName); + } + @TestMetadata("simpleDependency") public void testSimpleDependency() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/simpleDependency/"); @@ -176,7 +182,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInPureKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), false); } @TestMetadata("annotations") @@ -485,6 +491,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("moveFileWithChangingPackage") + public void testMoveFileWithChangingPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/"); + doTest(fileName); + } + + @TestMetadata("moveFileWithoutChangingPackage") + public void testMoveFileWithoutChangingPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/"); + doTest(fileName); + } + @TestMetadata("multifileClassFileAdded") public void testMultifileClassFileAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); @@ -784,7 +802,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/valRemoveCustomAccessor/"); doTest(fileName); } - } @TestMetadata("jps-plugin/testData/incremental/withJava") diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log new file mode 100644 index 00000000000..38c05b916b0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log @@ -0,0 +1,43 @@ +================ Step #1 ================= + +Compiling files: + module1/src/b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/AKt.class +End of files +Compiling files: + module1/src/a.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/B.class + out/production/module2/b/BKt.class +End of files +Cleaning output files: + out/production/module2/usage/UseClassBKt.class + out/production/module2/usage/UseFunBKt.class +End of files +Compiling files: + module2/src/useClassB.kt + module2/src/useFunB.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/UseClassAKt.class + out/production/module2/usage/UseFunAKt.class +End of files +Compiling files: + module2/src/useClassA.kt + module2/src/useFunA.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log new file mode 100644 index 00000000000..e365cc0188c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log @@ -0,0 +1,26 @@ +================ Step #1 ================= + +Compiling files: + module1/src/b.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/B.class + out/production/module2/b/BKt.class +End of files +Cleaning output files: + out/production/module2/usage/UseClassBKt.class + out/production/module2/usage/UseFunBKt.class +End of files +Compiling files: + module2/src/useClassB.kt + module2/src/useFunB.kt +End of files +Marked as dirty by Kotlin: + module1/src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_a.kt new file mode 100644 index 00000000000..a3470c00a84 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_a.kt @@ -0,0 +1,6 @@ +package a + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_b.kt.new b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_b.kt.new new file mode 100644 index 00000000000..7965b9e82a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module1_b.kt.new @@ -0,0 +1,6 @@ +package b + +class B + +fun b() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt new file mode 100644 index 00000000000..7965b9e82a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt @@ -0,0 +1,6 @@ +package b + +class B + +fun b() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt.delete b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_b.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassA.kt b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassA.kt new file mode 100644 index 00000000000..a6e5135a4b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassA.kt @@ -0,0 +1,5 @@ +package usage + +fun useClassA() { + a.A() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassB.kt b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassB.kt new file mode 100644 index 00000000000..568e8076a09 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useClassB.kt @@ -0,0 +1,5 @@ +package usage + +fun useClassB() { + b.B() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunA.kt b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunA.kt new file mode 100644 index 00000000000..9cee04d3276 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunA.kt @@ -0,0 +1,5 @@ +package usage + +fun useFunA() { + a.a() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunB.kt b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunB.kt new file mode 100644 index 00000000000..bb4d7bca61f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/module2_useFunB.kt @@ -0,0 +1,5 @@ +package usage + +fun useFunB() { + b.b() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new new file mode 100644 index 00000000000..5495f8ba80d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/a.kt.new @@ -0,0 +1,5 @@ +package bar + +class Foo + +fun bar() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt new file mode 100644 index 00000000000..bf4ea3d98f0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/bar/dummy.kt @@ -0,0 +1,3 @@ +package bar + +private fun dummy() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log new file mode 100644 index 00000000000..efa242c6d47 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/build.log @@ -0,0 +1,27 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AKt.class + out/production/module/foo/Foo.class +End of files +Compiling files: + src/bar/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/bar/DummyKt.class + out/production/module/baz/UseClassKt.class + out/production/module/baz/UseFunKt.class + out/production/module/foo/DummyKt.class +End of files +Compiling files: + src/bar/dummy.kt + src/foo/dummy.kt + src/useClass.kt + src/useFun.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log new file mode 100644 index 00000000000..015c0970896 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/AKt.class + out/production/module/foo/Foo.class +End of files +Compiling files: + src/bar/a.kt +End of files +Marked as dirty by Kotlin: + src/useFun.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/baz/UseClassKt.class + out/production/module/baz/UseFunKt.class +End of files +Compiling files: + src/useClass.kt + src/useFun.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt new file mode 100644 index 00000000000..8bb46f273df --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt @@ -0,0 +1,5 @@ +package foo + +class Foo + +fun bar() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/a.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt new file mode 100644 index 00000000000..b40e183d8fb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/foo/dummy.kt @@ -0,0 +1,3 @@ +package foo + +private fun dummy() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt new file mode 100644 index 00000000000..5134f9a405f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useClass.kt @@ -0,0 +1,8 @@ +package baz + +import foo.* +import bar.* + +fun useClass() { + Foo() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt new file mode 100644 index 00000000000..92512578ad1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/useFun.kt @@ -0,0 +1,8 @@ +package baz + +import foo.* +import bar.* + +fun useFun() { + bar() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new new file mode 100644 index 00000000000..0394ed4179b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/bar/a.kt.new @@ -0,0 +1,5 @@ +package baz + +class Foo + +fun bar() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log new file mode 100644 index 00000000000..33498a2b680 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/baz/AKt.class + out/production/module/baz/Foo.class +End of files +Compiling files: + src/bar/a.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/baz/UseClassKt.class + out/production/module/baz/UseFunKt.class +End of files +Compiling files: + src/useClass.kt + src/useFun.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt new file mode 100644 index 00000000000..0394ed4179b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt @@ -0,0 +1,5 @@ +package baz + +class Foo + +fun bar() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/foo/a.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt new file mode 100644 index 00000000000..8418cee6664 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useClass.kt @@ -0,0 +1,5 @@ +package baz + +fun useClass() { + Foo() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt new file mode 100644 index 00000000000..d56ad84e8ec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/useFun.kt @@ -0,0 +1,5 @@ +package baz + +fun useFun() { + bar() +} From e0042d99c1a36da2ac675e9cbfd870a41b77b090 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 23 Mar 2016 13:39:02 +0300 Subject: [PATCH 0819/1557] Minor: fix testdata Original commit: 4b8c9c8b39abbf8a73fef5e10fceb89b9cfca6a6 --- .../clearedHasKotlin/build.log | 6 +-- .../exportedModule/build.log | 8 ++-- .../data-container-version-build.log | 16 +++---- .../javaOnlyModulesAreNotAffected/build.log | 4 +- .../module1Modified/build.log | 14 +++--- .../data-container-version-build.log | 22 ++++----- .../module2Modified/build.log | 8 ++-- .../data-container-version-build.log | 12 ++--- .../moduleWithConstantModified/build.log | 6 +-- .../data-container-version-build.log | 10 ++-- .../moduleWithInlineModified/build.log | 6 +-- .../data-container-version-build.log | 10 ++-- .../cacheVersionChanged/withError/build.log | 22 ++++----- .../data-container-version-build.log | 32 ++++++------- .../experimentalOn/build.log | 34 +++++++------- .../experimentalOnJavaChanged/build.log | 20 ++++---- .../experimentalOnOff/build.log | 46 +++++++++---------- .../incrementalOff/build.log | 16 +++---- .../incrementalOffOn/build.log | 36 +++++++-------- .../multiModuleCircular/build.log | 34 +++++++------- .../build.log | 18 ++++---- .../build.log | 18 ++++---- .../multiModuleExported/build.log | 30 ++++++------ .../multiModuleSimple/build.log | 26 +++++------ .../circularDependencyClasses/build.log | 4 +- .../experimental-ic-build.log | 6 +-- .../build.log | 4 +- .../build.log | 8 ++-- .../experimental-ic-build.log | 4 +- .../build.log | 16 +++---- .../experimental-ic-build.log | 8 ++-- .../constantValueChanged/build.log | 6 +-- .../experimental-ic-build.log | 12 ++--- .../defaultParameterAdded/build.log | 6 +-- .../experimental-ic-build.log | 8 ++-- .../build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../defaultParameterRemoved/build.log | 6 +-- .../experimental-ic-build.log | 8 ++-- .../build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../inlineFunctionInlined/build.log | 10 ++-- .../inlineFunctionTwoPackageParts/build.log | 20 ++++---- .../multiModule/simpleDependency/build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../build.log | 8 ++-- .../simpleDependencyUnchanged/build.log | 4 +- .../transitiveDependency/build.log | 8 ++-- .../experimental-ic-build.log | 10 ++-- .../multiModule/transitiveInlining/build.log | 16 +++---- .../multiModule/twoDependants/build.log | 12 ++--- .../twoDependants/experimental-ic-build.log | 16 +++---- 54 files changed, 363 insertions(+), 363 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log index 8186bbcbadf..c2086b69a47 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -6,7 +6,7 @@ End of files Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_C.java + module1/src/C.java End of files Exit code: NOTHING_DONE ------------------------------------------ @@ -19,7 +19,7 @@ Cleaning output files: out/production/module1/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ @@ -27,7 +27,7 @@ Cleaning output files: out/production/module1/B.class End of files Compiling files: - module1/src/module1_B.kt + module1/src/B.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log index d02fea7e638..10b162bd35e 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log @@ -4,7 +4,7 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Exit code: OK ------------------------------------------ @@ -12,7 +12,7 @@ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ @@ -20,7 +20,7 @@ Cleaning output files: out/production/module3/c/C.class End of files Compiling files: - module3/src/module3_C.kt + module3/src/C.kt End of files Exit code: OK ------------------------------------------ @@ -28,7 +28,7 @@ Cleaning output files: out/production/module4/D/D.class End of files Compiling files: - module4/src/module4_D.kt + module4/src/D.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log index 1a8d7b0695f..aaaa056607b 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log @@ -4,20 +4,20 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module1/src/module1_A.kt - module2/src/module2_B.kt - module3/src/module3_C.kt - module4/src/module4_D.kt + module1/src/A.kt + module2/src/B.kt + module3/src/C.kt + module4/src/D.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ @@ -25,7 +25,7 @@ Cleaning output files: out/production/module3/c/C.class End of files Compiling files: - module3/src/module3_C.kt + module3/src/C.kt End of files Exit code: OK ------------------------------------------ @@ -33,7 +33,7 @@ Cleaning output files: out/production/module4/D/D.class End of files Compiling files: - module4/src/module4_D.kt + module4/src/D.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log index b7b0767477c..e6bdd80c5e7 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log @@ -6,7 +6,7 @@ End of files Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_A.java + module1/src/A.java End of files Exit code: NOTHING_DONE ------------------------------------------ @@ -21,7 +21,7 @@ End of files Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_B.java + module1/src/B.java End of files Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index 2894338355f..ded55f46d67 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -6,35 +6,35 @@ Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: - module4/src/module4_d.kt + module4/src/d.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/module3/Module3_cKt.class + out/production/module3/module3/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log index 2b342e3b58b..cb0f7a4ec83 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -6,40 +6,40 @@ Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: - module4/src/module4_d.kt + module4/src/d.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt - module2/src/module2_b.kt - module3/src/module3_c.kt - module4/src/module4_d.kt + module1/src/a.kt + module2/src/b.kt + module3/src/c.kt + module4/src/d.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/module3/Module3_cKt.class + out/production/module3/module3/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log index 9365c3e7817..e683eb51ead 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log @@ -3,19 +3,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log index da85b77b110..93442154ba3 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log @@ -3,22 +3,22 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class + out/production/module1/module1/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt - module2/src/module2_b.kt + module1/src/a.kt + module2/src/b.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index 840832f2d80..11aa2c27032 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -2,10 +2,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_AKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Exit code: OK ------------------------------------------ @@ -13,7 +13,7 @@ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log index e91ca18b7e9..22017d936e8 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log @@ -2,21 +2,21 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_AKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module1/src/module1_A.kt - module2/src/module2_B.kt + module1/src/A.kt + module2/src/B.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index b09b8be9b22..4a0adc2e40a 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -3,10 +3,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_AKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Exit code: OK ------------------------------------------ @@ -14,7 +14,7 @@ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log index 0fc485c9e08..e35086f3432 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log @@ -3,21 +3,21 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_AKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module1/src/module1_A.kt - module2/src/module2_B.kt + module1/src/A.kt + module2/src/B.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/b/B.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log index a6ea3e076ec..f2b67ca3ace 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -6,19 +6,19 @@ Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: - module4/src/module4_d.kt + module4/src/d.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class - out/production/module1/module1/Module1_fKt.class + out/production/module1/module1/AKt.class + out/production/module1/module1/FKt.class End of files Compiling files: - module1/src/module1_a.kt - module1/src/module1_f.kt + module1/src/a.kt + module1/src/f.kt End of files Exit code: ABORT ------------------------------------------ @@ -32,26 +32,26 @@ Exit code: NOTHING_DONE Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_a.kt - module1/src/module1_f.kt + module1/src/a.kt + module1/src/f.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/module3/Module3_cKt.class + out/production/module3/module3/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log index 1a89d780789..ffad4243995 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log @@ -6,25 +6,25 @@ Cleaning output files: out/production/module4/module4/D.class End of files Compiling files: - module4/src/module4_d.kt + module4/src/d.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt - module1/src/module1_f.kt - module2/src/module2_b.kt - module3/src/module3_c.kt - module4/src/module4_d.kt + module1/src/a.kt + module1/src/f.kt + module2/src/b.kt + module3/src/c.kt + module4/src/d.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class - out/production/module1/module1/Module1_aKt.class - out/production/module1/module1/Module1_fKt.class + out/production/module1/module1/AKt.class + out/production/module1/module1/FKt.class End of files Compiling files: - module1/src/module1_a.kt - module1/src/module1_f.kt + module1/src/a.kt + module1/src/f.kt End of files Exit code: ABORT ------------------------------------------ @@ -38,26 +38,26 @@ Exit code: NOTHING_DONE Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module1/src/module1_a.kt - module1/src/module1_f.kt + module1/src/a.kt + module1/src/f.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/module2/Module2_bKt.class + out/production/module2/module2/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/module3/Module3_cKt.class + out/production/module3/module3/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log index 5481324e411..0d14fe5c64f 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log @@ -4,30 +4,30 @@ Cleaning output files: out/production/module1/foo/Z.class End of files Compiling files: - module1/src/module1_z.kt + module1/src/z.kt End of files Marked as dirty by Kotlin: - module1/src/module1_z.kt - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt - module3/src/module3_d.kt - module4/src/module4_e.kt + module1/src/z.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt + module3/src/d.kt + module4/src/e.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class + out/production/module2/foo/AKt.class out/production/module2/foo/B.class + out/production/module2/foo/BKt.class out/production/module2/foo/C.class - out/production/module2/foo/Module2_aKt.class - out/production/module2/foo/Module2_bKt.class - out/production/module2/foo/Module2_cKt.class + out/production/module2/foo/CKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -35,7 +35,7 @@ Cleaning output files: out/production/module3/foo/D.class End of files Compiling files: - module3/src/module3_d.kt + module3/src/d.kt End of files Exit code: OK ------------------------------------------ @@ -43,7 +43,7 @@ Cleaning output files: out/production/module4/foo/E.class End of files Compiling files: - module4/src/module4_e.kt + module4/src/e.kt End of files Exit code: OK ------------------------------------------ @@ -55,10 +55,10 @@ Exit code: NOTHING_DONE Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt + module2/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log index 0f54ba72254..a383c6b8b34 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log @@ -1,37 +1,37 @@ ================ Step #1 ================= Cleaning output files: + out/production/module1/AKt.class out/production/module1/META-INF/module1.kotlin_module - out/production/module1/Module1_aKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt - module2/src/module2_c.kt - module3/src/module3_d.kt + module1/src/a.kt + module2/src/c.kt + module3/src/d.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/B.class + out/production/module2/CKt.class out/production/module2/META-INF/module2.kotlin_module - out/production/module2/Module2_cKt.class End of files Compiling files: - module2/src/module2_c.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ Compiling files: - module2/src/module2_B.java + module2/src/B.java End of files Cleaning output files: + out/production/module3/DKt.class out/production/module3/META-INF/module3.kotlin_module - out/production/module3/Module3_dKt.class End of files Compiling files: - module3/src/module3_d.kt + module3/src/d.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log index 6d9f76555e3..5fb2084b8ca 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log @@ -4,30 +4,30 @@ Cleaning output files: out/production/module1/foo/Z.class End of files Compiling files: - module1/src/module1_z.kt + module1/src/z.kt End of files Marked as dirty by Kotlin: - module1/src/module1_z.kt - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt - module3/src/module3_d.kt - module4/src/module4_e.kt + module1/src/z.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt + module3/src/d.kt + module4/src/e.kt Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class + out/production/module2/foo/AKt.class out/production/module2/foo/B.class + out/production/module2/foo/BKt.class out/production/module2/foo/C.class - out/production/module2/foo/Module2_aKt.class - out/production/module2/foo/Module2_bKt.class - out/production/module2/foo/Module2_cKt.class + out/production/module2/foo/CKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -35,7 +35,7 @@ Cleaning output files: out/production/module3/foo/D.class End of files Compiling files: - module3/src/module3_d.kt + module3/src/d.kt End of files Exit code: OK ------------------------------------------ @@ -43,7 +43,7 @@ Cleaning output files: out/production/module4/foo/E.class End of files Compiling files: - module4/src/module4_e.kt + module4/src/e.kt End of files Exit code: OK ------------------------------------------ @@ -55,10 +55,10 @@ Exit code: NOTHING_DONE Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt + module2/src/a.kt End of files Exit code: OK ------------------------------------------ @@ -74,23 +74,23 @@ Exit code: NOTHING_DONE Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt + module2/src/a.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/B.class + out/production/module2/foo/BKt.class out/production/module2/foo/C.class - out/production/module2/foo/Module2_bKt.class - out/production/module2/foo/Module2_cKt.class + out/production/module2/foo/CKt.class End of files Compiling files: - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log index 551992f4603..aad8e10a540 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log @@ -4,12 +4,12 @@ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -24,12 +24,12 @@ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index cd4b87fa3d1..6f5a9f3f178 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -4,12 +4,12 @@ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -24,20 +24,20 @@ Cleaning output files: out/production/module1/foo/Z.class End of files Compiling files: - module1/src/module1_z.kt + module1/src/z.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class - out/production/module2/foo/Module2_bKt.class - out/production/module2/foo/Module2_cKt.class + out/production/module2/foo/AKt.class + out/production/module2/foo/BKt.class + out/production/module2/foo/CKt.class End of files Compiling files: - module2/src/module2_a.kt - module2/src/module2_b.kt - module2/src/module2_c.kt + module2/src/a.kt + module2/src/b.kt + module2/src/c.kt End of files Exit code: OK ------------------------------------------ @@ -45,7 +45,7 @@ Cleaning output files: out/production/module3/foo/D.class End of files Compiling files: - module3/src/module3_d.kt + module3/src/d.kt End of files Exit code: OK ------------------------------------------ @@ -53,7 +53,7 @@ Cleaning output files: out/production/module4/foo/E.class End of files Compiling files: - module4/src/module4_e.kt + module4/src/e.kt End of files Exit code: OK ------------------------------------------ @@ -64,21 +64,21 @@ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_aKt.class + out/production/module2/foo/AKt.class End of files Compiling files: - module2/src/module2_a.kt + module2/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_bKt.class + out/production/module2/foo/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log index f73f3de34d0..75af85fd9a8 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -4,14 +4,14 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module1/src/module1_D.kt - module2/src/module2_B.kt - module3/src/module3_C.kt - module4/src/module4_E.kt - module5/src/module5_F.kt + module1/src/D.kt + module2/src/B.kt + module3/src/C.kt + module4/src/E.kt + module5/src/F.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: @@ -20,13 +20,13 @@ Cleaning output files: out/production/module3/foo/C.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Compiling files: - module3/src/module3_C.kt + module3/src/C.kt End of files Compiling files: - module1/src/module1_D.kt + module1/src/D.kt End of files Exit code: ABORT ------------------------------------------ @@ -39,18 +39,18 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module2/src/module2_B.kt + module2/src/B.kt End of files Compiling files: - module3/src/module3_C.kt + module3/src/C.kt End of files Compiling files: - module1/src/module1_A.kt - module1/src/module1_D.kt + module1/src/A.kt + module1/src/D.kt End of files Marked as dirty by Kotlin: - module4/src/module4_E.kt - module5/src/module5_F.kt + module4/src/E.kt + module5/src/F.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE @@ -59,7 +59,7 @@ Cleaning output files: out/production/module4/foo/E.class End of files Compiling files: - module4/src/module4_E.kt + module4/src/E.kt End of files Exit code: OK ------------------------------------------ @@ -67,7 +67,7 @@ Cleaning output files: out/production/module5/foo/F.class End of files Compiling files: - module5/src/module5_F.kt + module5/src/F.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log index a5bdbe5bd98..3b75376e9c1 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log @@ -4,23 +4,23 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_createADefault.kt - module2/src/module2_createANonDefault.kt + module2/src/createADefault.kt + module2/src/createANonDefault.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_createADefaultKt.class - out/production/module2/foo/Module2_createANonDefaultKt.class + out/production/module2/foo/CreateADefaultKt.class + out/production/module2/foo/CreateANonDefaultKt.class End of files Compiling files: - module2/src/module2_createADefault.kt - module2/src/module2_createANonDefault.kt + module2/src/createADefault.kt + module2/src/createANonDefault.kt End of files Exit code: ABORT ------------------------------------------ @@ -32,7 +32,7 @@ Too many arguments for public constructor A() defined in foo.A Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module2/src/module2_createADefault.kt + module2/src/createADefault.kt End of files Exit code: OK ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log index fd6e6c52645..33fd6c80e21 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log @@ -4,23 +4,23 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_createADefault.kt - module2/src/module2_createANonDefault.kt + module2/src/createADefault.kt + module2/src/createANonDefault.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/foo/Module2_createADefaultKt.class - out/production/module2/foo/Module2_createANonDefaultKt.class + out/production/module2/foo/CreateADefaultKt.class + out/production/module2/foo/CreateANonDefaultKt.class End of files Compiling files: - module2/src/module2_createADefault.kt - module2/src/module2_createANonDefault.kt + module2/src/createADefault.kt + module2/src/createANonDefault.kt End of files Exit code: ABORT ------------------------------------------ @@ -32,7 +32,7 @@ No value passed for parameter x Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module2/src/module2_createANonDefault.kt + module2/src/createANonDefault.kt End of files Exit code: OK ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log index 23d3560344a..165fd9620e4 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -4,13 +4,13 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_AChild.kt - module3/src/module3_AGrandChild.kt - module3/src/module3_importAGrandChild.kt - module4/src/module4_importAGrandChild.kt + module2/src/AChild.kt + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt + module4/src/importAGrandChild.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE @@ -19,7 +19,7 @@ Cleaning output files: out/production/module2/foo/AChild.class End of files Compiling files: - module2/src/module2_AChild.kt + module2/src/AChild.kt End of files Exit code: ABORT ------------------------------------------ @@ -33,19 +33,19 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_AChild.kt - module3/src/module3_AGrandChild.kt - module3/src/module3_importAGrandChild.kt - module4/src/module4_importAGrandChild.kt + module2/src/AChild.kt + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt + module4/src/importAGrandChild.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module2/src/module2_AChild.kt + module2/src/AChild.kt End of files Exit code: OK ------------------------------------------ @@ -53,13 +53,13 @@ Cleaning output files: out/production/module3/foo/AGrandChild.class End of files Compiling files: - module3/src/module3_AGrandChild.kt - module3/src/module3_importAGrandChild.kt + module3/src/AGrandChild.kt + module3/src/importAGrandChild.kt End of files Exit code: OK ------------------------------------------ Compiling files: - module4/src/module4_importAGrandChild.kt + module4/src/importAGrandChild.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log index fe2e77d7cc9..5e7cec4c4b0 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -4,12 +4,12 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_AChild.kt - module2/src/module2_importA.kt - module3/src/module3_importAChild.kt + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE @@ -18,8 +18,8 @@ Cleaning output files: out/production/module2/foo/AChild.class End of files Compiling files: - module2/src/module2_AChild.kt - module2/src/module2_importA.kt + module2/src/AChild.kt + module2/src/importA.kt End of files Exit code: ABORT ------------------------------------------ @@ -34,24 +34,24 @@ Cleaning output files: out/production/module1/foo/A.class End of files Compiling files: - module1/src/module1_A.kt + module1/src/A.kt End of files Marked as dirty by Kotlin: - module2/src/module2_AChild.kt - module2/src/module2_importA.kt - module3/src/module3_importAChild.kt + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Compiling files: - module2/src/module2_AChild.kt - module2/src/module2_importA.kt + module2/src/AChild.kt + module2/src/importA.kt End of files Exit code: OK ------------------------------------------ Compiling files: - module3/src/module3_importAChild.kt + module3/src/importAChild.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log index aae52d91530..6a59313759a 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log @@ -5,7 +5,7 @@ Cleaning output files: out/production/module2/b/BB.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ @@ -14,7 +14,7 @@ Cleaning output files: out/production/module1/a/AA.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log index 62a6f378609..208566fb345 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log @@ -5,10 +5,10 @@ Cleaning output files: out/production/module2/b/BB.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Marked as dirty by Kotlin: - module1/src/module1_a.kt + module1/src/a.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: @@ -16,7 +16,7 @@ Cleaning output files: out/production/module1/a/AA.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index a1121057132..848f3a8fddf 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -2,10 +2,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_aKt.class + out/production/module1/test/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index 49b9b6ede95..955b8c2b4ec 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -2,20 +2,20 @@ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log index 5bf4d44488b..ba77cb16739 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log @@ -2,10 +2,10 @@ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log index 80367355c9a..26e8255c4d6 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -2,27 +2,27 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class - out/production/module1/c/Module1_c2Kt.class + out/production/module1/a/AKt.class + out/production/module1/c/C2Kt.class End of files Compiling files: - module1/src/module1_a.kt - module1/src/module1_c2.kt + module1/src/a.kt + module1/src/c2.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/c/Module1_c1Kt.class + out/production/module1/c/C1Kt.class out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Compiling files: - module1/src/module1_c1.kt + module1/src/c1.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log index 5f2902249a4..dadff13db49 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log @@ -2,12 +2,12 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class - out/production/module1/c/Module1_c2Kt.class + out/production/module1/a/AKt.class + out/production/module1/c/C2Kt.class End of files Compiling files: - module1/src/module1_a.kt - module1/src/module1_c2.kt + module1/src/a.kt + module1/src/c2.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 632ed20af04..4077bcfe970 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -2,10 +2,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_constKt.class + out/production/module1/test/ConstKt.class End of files Compiling files: - module1/src/module1_const.kt + module1/src/const.kt End of files Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ @@ -15,7 +15,7 @@ Cleaning output files: out/production/module2/usage/Usage.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log index 26e3e9444c3..9b0544e9a09 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log @@ -2,21 +2,21 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_constKt.class + out/production/module1/test/ConstKt.class End of files Compiling files: - module1/src/module1_const.kt + module1/src/const.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/test/Module1_constKt.class + out/production/module1/test/ConstKt.class End of files Compiling files: - module1/src/module1_const.kt + module1/src/const.kt End of files Exit code: OK ------------------------------------------ @@ -24,7 +24,7 @@ Cleaning output files: out/production/module2/usage/Usage.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log index 461fca20478..0af338460eb 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log @@ -4,16 +4,16 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log index c66be0707fa..95ae71bdc8e 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log @@ -4,20 +4,20 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log index a59a38584ff..9d45f067205 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log @@ -2,19 +2,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log index 8057ad99b15..7001866e2ad 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log @@ -2,23 +2,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log index 461fca20478..0af338460eb 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log @@ -4,16 +4,16 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log index c66be0707fa..95ae71bdc8e 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log @@ -4,20 +4,20 @@ Cleaning output files: out/production/module1/a/A.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log index a59a38584ff..9d45f067205 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log @@ -2,19 +2,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log index 8057ad99b15..7001866e2ad 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log @@ -2,23 +2,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index e2d78e0affb..7b0bdb5d27c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -2,23 +2,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/inline/Module1_inlineKt.class + out/production/module1/inline/InlineKt.class End of files Compiling files: - module1/src/module1_inline.kt + module1/src/inline.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usage.kt + module2/src/usage.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageKt.class + out/production/module2/usage/UsageKt.class End of files Compiling files: - module2/src/module2_usage.kt + module2/src/usage.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index 111b7e68719..9dfc11cb6f8 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -2,23 +2,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/inline/Module1_inlineFKt.class + out/production/module1/inline/InlineFKt.class End of files Compiling files: - module1/src/module1_inlineF.kt + module1/src/inlineF.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usageF.kt + module2/src/usageF.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageFKt.class + out/production/module2/usage/UsageFKt.class End of files Compiling files: - module2/src/module2_usageF.kt + module2/src/usageF.kt End of files Exit code: OK ------------------------------------------ @@ -27,23 +27,23 @@ Exit code: OK Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/inline/Module1_inlineGKt.class + out/production/module1/inline/InlineGKt.class End of files Compiling files: - module1/src/module1_inlineG.kt + module1/src/inlineG.kt End of files Marked as dirty by Kotlin: - module2/src/module2_usageG.kt + module2/src/usageG.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/usage/Module2_usageGKt.class + out/production/module2/usage/UsageGKt.class End of files Compiling files: - module2/src/module2_usageG.kt + module2/src/usageG.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index e7962572eca..a90dd2ca872 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -3,19 +3,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log index c7045de8aab..ab205a45bd4 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log @@ -3,23 +3,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index 97d0b6d11e8..6cded04bbb9 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -3,22 +3,22 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class + out/production/module1/a/AKt.class out/production/module1/a/ClassAnnotation.class out/production/module1/a/FileAnnotation.class - out/production/module1/a/Module1_aKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ABORT ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log index b4c4f0f17d3..691b823d0bc 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log @@ -3,15 +3,15 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class + out/production/module1/a/AKt.class out/production/module1/a/ClassAnnotation.class out/production/module1/a/FileAnnotation.class - out/production/module1/a/Module1_aKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE @@ -19,10 +19,10 @@ Exit code: NOTHING_DONE Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ABORT ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log index 8808e560689..4cfb676fca6 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log @@ -3,23 +3,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class + out/production/module1/a/AKt.class out/production/module1/a/InternalA.class out/production/module1/a/InternalClassAnnotation.class out/production/module1/a/InternalFileAnnotation.class - out/production/module1/a/Module1_aKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: ABORT ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index 888b57a1c66..9919e125aa3 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -3,10 +3,10 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index 0a7146547b9..47d0811cf99 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -3,19 +3,19 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log index 73b0b03f420..2504e97f8ca 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log @@ -3,23 +3,23 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 23ad69e9bbc..412224b0f46 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -2,36 +2,36 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt + module2/src/b.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Marked as dirty by Kotlin: - module3/src/module3_c.kt + module3/src/c.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/Module3_cKt.class + out/production/module3/c/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index c5d46a2cdad..1e5cd25f8ff 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -3,28 +3,28 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/Module3_cKt.class + out/production/module3/c/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log index 99c74cffa62..74815f1a93b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log @@ -3,33 +3,33 @@ Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class - out/production/module1/a/Module1_aKt.class + out/production/module1/a/AKt.class End of files Compiling files: - module1/src/module1_a.kt + module1/src/a.kt End of files Marked as dirty by Kotlin: - module2/src/module2_b.kt - module3/src/module3_c.kt + module2/src/b.kt + module3/src/c.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/Module3_cKt.class + out/production/module3/c/CKt.class End of files Compiling files: - module3/src/module3_c.kt + module3/src/c.kt End of files Exit code: OK ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module - out/production/module2/b/Module2_bKt.class + out/production/module2/b/BKt.class End of files Compiling files: - module2/src/module2_b.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ From 486b6cd2e0a3d56f07dc91b52bb6850c2affc3ea Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 28 Mar 2016 03:04:46 +0300 Subject: [PATCH 0820/1557] Refactor: move allVersions() to jps-plugin since it is jps specific Original commit: 4c782dbfcc24072fae60a745d41fdd6989da6c63 --- .../jps/incremental/CacheVersionProvider.kt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt index 81652efe9aa..31696d0f7f0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionProvider.kt @@ -19,7 +19,10 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.jps.builders.BuildTarget import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.kotlin.incremental.* +import org.jetbrains.kotlin.incremental.CacheVersion +import org.jetbrains.kotlin.incremental.dataContainerCacheVersion +import org.jetbrains.kotlin.incremental.experimentalCacheVersion +import org.jetbrains.kotlin.incremental.normalCacheVersion import java.io.File @@ -33,5 +36,15 @@ class CacheVersionProvider(private val paths: BuildDataPaths) { fun dataContainerVersion(): CacheVersion = dataContainerCacheVersion(KotlinDataContainerTarget.dataRoot) - fun allVersions(targets: Iterable): Iterable = allCachesVersions(KotlinDataContainerTarget.dataRoot, targets.map { it.dataRoot } ) + fun allVersions(targets: Iterable): Iterable { + val versions = arrayListOf() + versions.add(dataContainerCacheVersion(KotlinDataContainerTarget.dataRoot)) + + for (dataRoot in targets.map { it.dataRoot }) { + versions.add(normalCacheVersion(dataRoot)) + versions.add(experimentalCacheVersion(dataRoot)) + } + + return versions + } } \ No newline at end of file From 30f2dd068451c776d6b16c5aca65f40aac54ed15 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 14 Mar 2016 15:52:40 +0300 Subject: [PATCH 0821/1557] Test: use one function to find test's build log for jps and gradle Original commit: c1a61b17c7817fa17cea9617fbdc193cd1409f9e --- .../jps/build/AbstractIncrementalJpsTest.kt | 18 +++++++----------- .../experimentalIncrementalCompilationTests.kt | 4 +++- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index d822f30e170..9c1a215df5d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -74,8 +74,6 @@ abstract class AbstractIncrementalJpsTest( val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" - - private val BUILD_LOG_FILE_NAME = "build.log" } protected open val enableExperimentalIncrementalCompilation = false @@ -90,7 +88,8 @@ abstract class AbstractIncrementalJpsTest( protected var mapWorkingToOriginalFile: MutableMap = hashMapOf() - protected open val experimentalBuildLogFileName = "experimental-ic-build.log" + protected open val buildLogFinder: BuildLogFinder + get() = BuildLogFinder(isExperimentalEnabled = enableExperimentalIncrementalCompilation) private fun enableDebugLogging() { com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java) @@ -274,18 +273,15 @@ abstract class AbstractIncrementalJpsTest( initialMake() val otherMakeResults = performModificationsAndMake(moduleNames) - - val buildLogFile = File(testDataDir, BUILD_LOG_FILE_NAME) - val experimentalBuildLog = File(testDataDir, experimentalBuildLogFileName) - + val buildLogFile = buildLogFinder.findBuildLog(testDataDir) val logs = createBuildLog(otherMakeResults) - if (enableExperimentalIncrementalCompilation && experimentalBuildLog.exists()) { - UsefulTestCase.assertSameLinesWithFile(experimentalBuildLog.absolutePath, logs) - } - else if (buildLogFile.exists() || !allowNoBuildLogFileInTestData) { + if (buildLogFile != null && buildLogFile.exists()) { UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs) } + else if (!allowNoBuildLogFileInTestData) { + throw IllegalStateException("No build log file in $testDataDir") + } if (!enableExperimentalIncrementalCompilation && File(testDataDir, "dont-check-caches-in-non-experimental-ic.txt").exists()) return diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt index 8dae89c9540..8841eaceb01 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.kotlin.incremental.testingUtils.BuildLogFinder import org.jetbrains.kotlin.jps.incremental.CacheVersionProvider abstract class AbstractExperimentalIncrementalJpsTest : AbstractIncrementalJpsTest() { @@ -40,7 +41,8 @@ abstract class AbstractExperimentalIncrementalCacheVersionChangedTest : Abstract } abstract class AbstractDataContainerVersionChangedTest : AbstractExperimentalIncrementalCacheVersionChangedTest() { - override val experimentalBuildLogFileName = "data-container-version-build.log" + override val buildLogFinder: BuildLogFinder + get() = BuildLogFinder(isExperimentalEnabled = true, isDataContainerBuildLogEnabled = true) override fun getVersions(cacheVersionProvider: CacheVersionProvider, targets: Iterable) = listOf(cacheVersionProvider.dataContainerVersion()) From e67975010265808ac0fe5b0b157f928e47e3d2ca Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 15 Mar 2016 00:12:35 +0300 Subject: [PATCH 0822/1557] Test: override build.log in gradle IC tests Original commit: 61814eb23f19f044bf239f105e8ea5376af165f3 --- .../enumEntryAdded/gradle-build.log | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log new file mode 100644 index 00000000000..6d78e93fdff --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/gradle-build.log @@ -0,0 +1,35 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/Enum.class +End of files +Exit code: NOTHING_DONE +------------------------------------------ +Compiling files: + src/Enum.java +End of files +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/UseKt.class +End of files +Compiling files: + src/use.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +When expression must be exhaustive, add necessary 'C' branch or 'else' branch instead + +================ Step #2 ================= + +Cleaning output files: + out/production/module/Enum.class +End of files +Compiling files: + src/use.kt +End of files +Exit code: OK +------------------------------------------ +Compiling files: + src/Enum.java +End of files \ No newline at end of file From 2d1d2b58f3628f1ad5dfde0d4874067090dd5f93 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 29 Mar 2016 14:13:59 +0300 Subject: [PATCH 0823/1557] Fix double quotes in diagnostic messages For diagnostics without any parameters, the given text is simply rendered as a String, so no symbols should be escaped. For diagnostics with parameters, the format in java.text.MessageFormat is used, so one single quote is erased and two single quotes become one single quote in the rendered text. Original commit: 8316953259669822fc27400c4ac7733490128635 --- .../incremental/classHierarchyAffected/enumEntryAdded/build.log | 2 +- .../classHierarchyAffected/sealedClassImplAdded/build.log | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log index b8d96cbc562..ff1a4bbd2cb 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -26,7 +26,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -when expression must be exhaustive, add necessary 'C' branch or 'else' branch instead +'when' expression must be exhaustive, add necessary 'C' branch or 'else' branch instead ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log index eaaa6d520ec..5ea3c686357 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded/build.log @@ -22,7 +22,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -when expression must be exhaustive, add necessary 'is C' branch or 'else' branch instead +'when' expression must be exhaustive, add necessary 'is C' branch or 'else' branch instead ================ Step #2 ================= From 87dc2c92ca33a7b7864b2e9eea212db8de907b8f Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Thu, 10 Mar 2016 14:17:28 +0300 Subject: [PATCH 0824/1557] Improve message clarity for WRONG_NUMBER_OF_TYPE_ARGUMENTS diagnostics #KT-9887 Fixed Original commit: 7de171efdac1c7b54da7248ebddcc71f8e3be32e --- .../typeParameterListChanged/build.log | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log index 3064a4ed62a..9202c3caec9 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged/build.log @@ -51,16 +51,16 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Type argument expected -Type argument expected -Type argument expected +One type argument expected for class A defined in foo +One type argument expected for class A defined in foo +One type argument expected for class A defined in foo Type inference failed: Not enough information to infer parameter T in constructor A() Please specify it explicitly. Type inference failed: Not enough information to infer parameter T in constructor A() Please specify it explicitly. Type inference failed: Not enough information to infer parameter T in constructor A() Please specify it explicitly. -Type argument expected +One type argument expected for class A defined in foo ================ Step #2 ================= From c63eb0aec96dac440bceb8c4dd5a736508b01e71 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 23 Dec 2015 18:14:00 +0300 Subject: [PATCH 0825/1557] Set-up usage for kotlin-test lib Original commit: 31da7662c54ae7f226fc32aaf3020f5eead2af2d --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 8 +++----- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 9c1a215df5d..eeef1b5268d 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -59,8 +59,6 @@ import java.io.File import java.io.PrintStream import java.util.* import kotlin.properties.Delegates -import kotlin.test.assertEquals -import kotlin.test.assertFalse abstract class AbstractIncrementalJpsTest( private val allowNoFilesWithSuffixInTestData: Boolean = false, @@ -189,7 +187,7 @@ abstract class AbstractIncrementalJpsTest( UsefulTestCase.assertSameLinesWithFile(initBuildLogFile.absolutePath, makeResult.log) } else { - assertFalse(makeResult.makeFailed, "Initial make failed:\n$makeResult") + assertFalse("Initial make failed:\n$makeResult", makeResult.makeFailed) } return makeResult @@ -212,8 +210,8 @@ abstract class AbstractIncrementalJpsTest( } val rebuildResult = rebuild() - assertEquals(rebuildResult.makeFailed, makeOverallResult.makeFailed, - "Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult") + assertEquals("Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult", + rebuildResult.makeFailed, makeOverallResult.makeFailed) if (!outAfterMake.exists()) { assertFalse(outDir.exists()) diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index ad8ca19e874..9c0abbfcce8 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -57,8 +57,6 @@ import java.io.* import java.util.* import java.util.regex.Pattern import java.util.zip.ZipOutputStream -import kotlin.test.assertFalse -import kotlin.test.assertTrue class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { companion object { From 7e0a39e2d6f53a1e2a0d2d720812a51ce906553b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 7 Dec 2015 16:04:06 +0300 Subject: [PATCH 0826/1557] Prepare building plugins modules against 1.8 JDK Original commit: ef13e8f5bb391acca8438455b44057c7e627fd44 --- jps/jps-plugin/bare-plugin/bare-plugin.iml | 2 +- jps/jps-plugin/jps-plugin.iml | 2 +- .../kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/bare-plugin/bare-plugin.iml b/jps/jps-plugin/bare-plugin/bare-plugin.iml index 9d0cabb35a3..11e5df07c16 100644 --- a/jps/jps-plugin/bare-plugin/bare-plugin.iml +++ b/jps/jps-plugin/bare-plugin/bare-plugin.iml @@ -5,7 +5,7 @@ - + diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index f884b9bd6b7..b65f871c29b 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -6,7 +6,7 @@ - + diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml index a6a5f690c4a..68b46d7bc6b 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml +++ b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml @@ -5,7 +5,7 @@ - + From 72b18cd2e8bab457d699f128c382a674db75dac0 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 10 Dec 2015 14:52:57 +0300 Subject: [PATCH 0827/1557] Extract jps-tests to separate module Remove dependency to idea-full to build jps-plugin with Java 1.6 Original commit: 46b5305666639c561250fec444b998001687220c --- jps/jps-plugin/jps-plugin.iml | 7 +------ jps/jps-plugin/jps-tests/jps-tests.iml | 21 +++++++++++++++++++ ...tractIncrementalCacheVersionChangedTest.kt | 0 .../jps/build/AbstractIncrementalJpsTest.kt | 0 .../AbstractIncrementalLazyCachesTest.kt | 0 .../build/AbstractKotlinJpsBuildTestCase.java | 0 .../jps/build/AbstractLookupTrackerTest.kt | 0 ...aContainerVersionChangedTestGenerated.java | 0 ...lChangeIncrementalOptionTestGenerated.java | 0 ...entalCacheVersionChangedTestGenerated.java | 0 ...perimentalIncrementalJpsTestGenerated.java | 0 ...talIncrementalLazyCachesTestGenerated.java | 0 ...entalCacheVersionChangedTestGenerated.java | 0 .../build/IncrementalConstantSearchTest.kt | 0 .../build/IncrementalJpsTestGenerated.java | 0 .../IncrementalLazyCachesTestGenerated.java | 0 .../IncrementalProjectPathCaseChangedTest.kt | 0 .../kotlin/jps/build/KotlinJpsBuildTest.kt | 6 +++--- .../jps/build/LookupTrackerTestGenerated.java | 0 .../jps/build/SimpleKotlinJpsBuildTest.kt | 0 ...experimentalIncrementalCompilationTests.kt | 0 .../jps/build/incrementalCustomTests.kt | 0 .../AbstractProtoComparisonTest.kt | 0 .../ProtoComparisonTestGenerated.java | 0 .../kotlin/jvm/compiler/ClasspathOrderTest.kt | 0 .../modules/KotlinModuleXmlGeneratorTest.java | 0 .../kannotator-jps-plugin-test.iml | 4 ++-- 27 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 jps/jps-plugin/jps-tests/jps-tests.iml rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt (98%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt (100%) rename jps/jps-plugin/{ => jps-tests}/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java (100%) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index b65f871c29b..b7f14f215a5 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -4,20 +4,15 @@ - - + - - - - diff --git a/jps/jps-plugin/jps-tests/jps-tests.iml b/jps/jps-plugin/jps-tests/jps-tests.iml new file mode 100644 index 00000000000..688da04d865 --- /dev/null +++ b/jps/jps-plugin/jps-tests/jps-tests.iml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalCacheVersionChangedTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalProjectPathCaseChangedTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt similarity index 98% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 9c0abbfcce8..ddac1034704 100644 --- a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -131,7 +131,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { private fun assertFilesExistInOutput(module: JpsModule, vararg relativePaths: String) { for (path in relativePaths) { val outputFile = findFileInOutputDir(module, path) - assertTrue(outputFile.exists(), "Output not written: " + outputFile.absolutePath + "\n Directory contents: \n" + dirContents(outputFile.parentFile)) + assertTrue("Output not written: " + outputFile.absolutePath + "\n Directory contents: \n" + dirContents(outputFile.parentFile), outputFile.exists()) } } @@ -149,7 +149,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val outputDir = File(JpsPathUtil.urlToPath(outputUrl)) for (path in relativePaths) { val outputFile = File(outputDir, path) - assertFalse(outputFile.exists(), "Output directory \"" + outputFile.absolutePath + "\" contains \"" + path + "\"") + assertFalse("Output directory \"" + outputFile.absolutePath + "\" contains \"" + path + "\"", outputFile.exists()) } } @@ -860,7 +860,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { Operation.CHANGE -> touch(file) Operation.DELETE -> - assertTrue(file.delete(), "Can not delete file \"" + file.absolutePath + "\"") + assertTrue("Can not delete file \"" + file.absolutePath + "\"", file.exists()) else -> fail("Unknown operation") } diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/experimentalIncrementalCompilationTests.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/incrementalCustomTests.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt diff --git a/jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java similarity index 100% rename from jps/jps-plugin/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/modules/KotlinModuleXmlGeneratorTest.java diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml index 68b46d7bc6b..f760b123905 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml +++ b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml @@ -7,11 +7,11 @@ - - + + \ No newline at end of file From 6329e6ed9bc662e5b6f14a1afe971b29a9620b26 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 15 Mar 2016 16:50:20 +0300 Subject: [PATCH 0828/1557] Remove duplicate build-common dependency Original commit: 4c81cc802bd8078f6fcac3580134f78852441b5c --- .../kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml | 1 - 1 file changed, 1 deletion(-) diff --git a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml index f760b123905..4a98e226204 100644 --- a/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml +++ b/jps/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml @@ -11,7 +11,6 @@ - \ No newline at end of file From ea14bae514ca29fb926f1a8e19ad61e6fe454e98 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 6 Apr 2016 21:34:37 +0300 Subject: [PATCH 0829/1557] Temporary ad-hock jps-tests enable with testdata modification Original commit: 46a1028494b17b2562baa5624f14bee9466cc948 --- .../module1Modified/build.log | 20 ++++++------- .../data-container-version-build.log | 30 +++++++++---------- .../cacheVersionChanged/withError/build.log | 24 +++++++-------- .../multiModuleCircular/build.log | 14 ++++----- .../build.log | 4 +-- .../multiModule/twoDependants/build.log | 18 +++++------ .../twoDependants/experimental-ic-build.log | 18 +++++------ .../kotlinUsedInJava/funRenamed/build.log | 4 +-- .../methodAddedInSuper/build.log | 3 +- .../propertyRenamed/build.log | 4 +-- 10 files changed, 68 insertions(+), 71 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index ded55f46d67..67e562b20bd 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -1,15 +1,5 @@ ================ Step #1 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Cleaning output files: - out/production/module4/module4/D.class -End of files -Compiling files: - module4/src/d.kt -End of files -Exit code: OK ------------------------------------------- Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -38,3 +28,13 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/d.kt +End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log index cb0f7a4ec83..163d054d0b9 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -1,20 +1,5 @@ ================ Step #1 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Cleaning output files: - out/production/module4/module4/D.class -End of files -Compiling files: - module4/src/d.kt -End of files -Marked as dirty by Kotlin: - module1/src/a.kt - module2/src/b.kt - module3/src/c.kt - module4/src/d.kt -Exit code: OK ------------------------------------------- Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -23,6 +8,11 @@ End of files Compiling files: module1/src/a.kt End of files +Marked as dirty by Kotlin: + module1/src/a.kt + module2/src/b.kt + module3/src/c.kt + module4/src/d.kt Exit code: OK ------------------------------------------ Cleaning output files: @@ -43,3 +33,13 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/d.kt +End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log index f2b67ca3ace..53abd8d0f27 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -1,15 +1,5 @@ ================ Step #1 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Cleaning output files: - out/production/module4/module4/D.class -End of files -Compiling files: - module4/src/d.kt -End of files -Exit code: OK ------------------------------------------- Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -27,10 +17,6 @@ Name expected ================ Step #2 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- Compiling files: module1/src/a.kt module1/src/f.kt @@ -55,3 +41,13 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/d.kt +End of files +Exit code: OK +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log index 75af85fd9a8..546018cf81f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -19,15 +19,15 @@ Cleaning output files: out/production/module2/foo/B.class out/production/module3/foo/C.class End of files +Compiling files: + module1/src/D.kt +End of files Compiling files: module2/src/B.kt End of files Compiling files: module3/src/C.kt End of files -Compiling files: - module1/src/D.kt -End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED @@ -38,16 +38,16 @@ This type is final, so it cannot be inherited from Cleaning output files: out/production/module1/foo/A.class End of files +Compiling files: + module1/src/A.kt + module1/src/D.kt +End of files Compiling files: module2/src/B.kt End of files Compiling files: module3/src/C.kt End of files -Compiling files: - module1/src/A.kt - module1/src/D.kt -End of files Marked as dirty by Kotlin: module4/src/E.kt module5/src/F.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log index 26e8255c4d6..8492947881b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -19,10 +19,10 @@ Cleaning output files: out/production/module2/b/BKt.class End of files Compiling files: - module2/src/b.kt + module1/src/c1.kt End of files Compiling files: - module1/src/c1.kt + module2/src/b.kt End of files Exit code: OK ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index 1e5cd25f8ff..b80a977a499 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -10,15 +10,6 @@ Compiling files: End of files Exit code: OK ------------------------------------------ -Cleaning output files: - out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/CKt.class -End of files -Compiling files: - module3/src/c.kt -End of files -Exit code: OK ------------------------------------------- Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -28,3 +19,12 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/c/CKt.class +End of files +Compiling files: + module3/src/c.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log index 74815f1a93b..3537a221734 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log @@ -15,15 +15,6 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ -Cleaning output files: - out/production/module3/META-INF/module3.kotlin_module - out/production/module3/c/CKt.class -End of files -Compiling files: - module3/src/c.kt -End of files -Exit code: OK ------------------------------------------- Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -33,3 +24,12 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module + out/production/module3/c/CKt.class +End of files +Compiling files: + module3/src/c.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log index cb63f56fc99..964b7dddef9 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/build.log @@ -19,5 +19,5 @@ Compiling files: End of files COMPILATION FAILED cannot find symbol -symbol : method f(java.lang.String) -location: class test.FunKt + symbol: method f(java.lang.String) + location: class test.FunKt \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log index c1d74686c36..4012e1613ad 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/build.log @@ -17,4 +17,5 @@ Compiling files: src/Sub.java End of files COMPILATION FAILED -y() in Sub cannot override y() in Super; overridden method is final +y() in Sub cannot override y() in Super + overridden method is final \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log index 938f61c54ac..b4add23f8b0 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/build.log @@ -19,5 +19,5 @@ Compiling files: End of files COMPILATION FAILED cannot find symbol -symbol : method getProp() -location: class test.PropKt + symbol: method getProp() + location: class test.PropKt \ No newline at end of file From b2f2fb1f18b9d5d6d9a9ec9341a936d854a7dd04 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 6 Apr 2016 21:45:04 +0300 Subject: [PATCH 0830/1557] Fix bad test modification Original commit: 9e88db7e58a543832ec0933addee100c6a666733 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index ddac1034704..f848d7a9dbe 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -860,7 +860,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { Operation.CHANGE -> touch(file) Operation.DELETE -> - assertTrue("Can not delete file \"" + file.absolutePath + "\"", file.exists()) + assertTrue("Can not delete file \"" + file.absolutePath + "\"", file.delete()) else -> fail("Unknown operation") } From 72debcd1f23e9a68ada4662154fbac5734aa5cb9 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 7 Apr 2016 15:26:42 +0300 Subject: [PATCH 0831/1557] IC: improve logging in tests and fix DataContainerVersionChangedTestGenerated#testWithError Test logging improvements: * print which chunk building in the round for multimodule projects * print actions after cache changed Original commit: f5ca949f2cb221b9095d12e90b6962fff5a044b5 --- .../jps/build/AbstractIncrementalJpsTest.kt | 21 ++++++-- .../jetbrains/kotlin/jps/build/BuildLogger.kt | 15 ++---- .../kotlin/jps/build/FSOperationsHelper.kt | 4 +- .../kotlin/jps/build/KotlinBuilder.kt | 17 +++--- .../cacheVersionChanged/withError/build.log | 12 ++++- .../data-container-version-build.log | 53 ++++++++++++------- 6 files changed, 75 insertions(+), 47 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index eeef1b5268d..605a25549df 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -25,6 +25,7 @@ import org.apache.log4j.ConsoleAppender import org.apache.log4j.Level import org.apache.log4j.Logger import org.apache.log4j.PatternLayout +import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.BuildResult import org.jetbrains.jps.builders.CompileScopeTestBuilder @@ -34,16 +35,14 @@ import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase import org.jetbrains.jps.builders.java.dependencyView.Callbacks import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.cmdline.ProjectDescriptor -import org.jetbrains.jps.incremental.BuilderRegistry -import org.jetbrains.jps.incremental.IncProjectBuilder -import org.jetbrains.jps.incremental.ModuleBuildTarget -import org.jetbrains.jps.incremental.ModuleLevelBuilder +import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.testingUtils.* @@ -390,13 +389,13 @@ abstract class AbstractIncrementalJpsTest( preProcessSources(sourceDestinationDir) } - var moduleNames: Set? JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject).outputUrl = JpsPathUtil.pathToUrl(getAbsolutePath("out")) val jdk = addJdk("my jdk") val moduleDependencies = readModuleDependencies() mapWorkingToOriginalFile = hashMapOf() + val moduleNames: Set? if (moduleDependencies == null) { addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk) prepareModuleSources(moduleName = null) @@ -436,10 +435,22 @@ abstract class AbstractIncrementalJpsTest( private val dirtyFiles = ArrayList() + override fun actionsOnCacheVersionChanged(actions: List) { + if (actions.size > 1 && actions.any { it != CacheVersion.Action.DO_NOTHING }) { + logLine("Actions after cache changed: $actions") + } + } + override fun markedAsDirty(files: Iterable) { dirtyFiles.addAll(files) } + override fun buildStarted(context: CompileContext, chunk: ModuleChunk) { + if (context.projectDescriptor.project.modules.size > 1) { + logLine("Building ${chunk.modules.sortedBy { it.name }.joinToString { it.name }}") + } + } + override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) { if (dirtyFiles.isNotEmpty()) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/BuildLogger.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/BuildLogger.kt index 6b93c151f52..2de00f7aa69 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/BuildLogger.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/BuildLogger.kt @@ -16,20 +16,15 @@ package org.jetbrains.kotlin.jps.build +import org.jetbrains.jps.ModuleChunk +import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.incremental.ModuleLevelBuilder +import org.jetbrains.kotlin.incremental.CacheVersion import java.io.File interface BuildLogger { + fun actionsOnCacheVersionChanged(actions: List) + fun buildStarted(context: CompileContext, chunk: ModuleChunk) fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) fun markedAsDirty(files: Iterable) - - companion object { - val DO_NOTHING = object : BuildLogger { - override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) { - } - - override fun markedAsDirty(files: Iterable) { - } - } - } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt index 50786edee74..7ac1a28f3a5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt @@ -31,7 +31,7 @@ class FSOperationsHelper( internal var hasMarkedDirty = false private set - private val buildLogger = compileContext.testingContext?.buildLogger ?: BuildLogger.DO_NOTHING + private val buildLogger = compileContext.testingContext?.buildLogger fun markChunk(recursively: Boolean, kotlinOnly: Boolean, excludeFiles: Set = setOf()) { fun shouldMark(file: File): Boolean { @@ -56,7 +56,7 @@ class FSOperationsHelper( filesToMark.removeAll(excludeFiles) log.debug("Mark dirty: $filesToMark") - buildLogger.markedAsDirty(filesToMark) + buildLogger?.markedAsDirty(filesToMark) for (file in filesToMark) { if (!file.exists()) continue diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index f4aec197e4b..105dee96734 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -103,6 +103,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { override fun chunkBuildStarted(context: CompileContext, chunk: ModuleChunk) { super.chunkBuildStarted(context, chunk) + context.testingContext?.buildLogger?.buildStarted(context, chunk) + if (JavaBuilderUtil.isForcedRecompilationAllJavaModules(context)) return val targets = chunk.targets @@ -142,9 +144,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { LOG.info("Build result: " + actualExitCode) - context.testingContext?.run { - buildLogger.buildFinished(actualExitCode) - } + context.testingContext?.buildLogger?.buildFinished(actualExitCode) return actualExitCode } @@ -294,7 +294,11 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val hasKotlin = HasKotlinMarker(dataManager) val rebuildAfterCacheVersionChanged = RebuildAfterCacheVersionChangeMarker(dataManager) - for (status in actions.sorted()) { + val sortedActions = actions.sorted() + + context.testingContext?.buildLogger?.actionsOnCacheVersionChanged(sortedActions) + + for (status in sortedActions) { when (status) { CacheVersion.Action.REBUILD_ALL_KOTLIN -> { LOG.info("Kotlin global lookup map format changed, so rebuild all kotlin") @@ -879,8 +883,3 @@ private fun hasKotlinDirtyOrRemovedFiles( return chunk.targets.any { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isNotEmpty() } } -private inline fun Logger.debug(message: ()->String) { - if (isDebugEnabled) { - debug(message()) - } -} diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log index 53abd8d0f27..24be8877d3c 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -17,12 +19,15 @@ Name expected ================ Step #2 ================= +Building module1 Compiling files: module1/src/a.kt module1/src/f.kt End of files Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/BKt.class @@ -32,6 +37,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/module3/CKt.class @@ -41,6 +48,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/module4/D.class End of files @@ -49,5 +58,6 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module5 Exit code: NOTHING_DONE ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log index ffad4243995..1f7e6e48e2a 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log @@ -1,21 +1,7 @@ ================ Step #1 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Cleaning output files: - out/production/module4/module4/D.class -End of files -Compiling files: - module4/src/d.kt -End of files -Marked as dirty by Kotlin: - module1/src/a.kt - module1/src/f.kt - module2/src/b.kt - module3/src/c.kt - module4/src/d.kt -Exit code: OK ------------------------------------------- +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -26,6 +12,12 @@ Compiling files: module1/src/a.kt module1/src/f.kt End of files +Marked as dirty by Kotlin: + module1/src/a.kt + module1/src/f.kt + module2/src/b.kt + module3/src/c.kt + module4/src/d.kt Exit code: ABORT ------------------------------------------ COMPILATION FAILED @@ -33,16 +25,22 @@ Name expected ================ Step #2 ================= -Exit code: NOTHING_DONE ------------------------------------------- -Exit code: NOTHING_DONE ------------------------------------------- +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK] Compiling files: module1/src/a.kt module1/src/f.kt End of files +Marked as dirty by Kotlin: + module1/src/a.kt + module1/src/f.kt + module2/src/b.kt + module3/src/c.kt + module4/src/d.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/BKt.class @@ -52,6 +50,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/module3/CKt.class @@ -61,3 +61,16 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] +Cleaning output files: + out/production/module4/module4/D.class +End of files +Compiling files: + module4/src/d.kt +End of files +Exit code: OK +------------------------------------------ +Building module5 +Exit code: NOTHING_DONE +------------------------------------------ From 2b0487fe0054161e010d7b0b97ae6dc824f52950 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Fri, 8 Apr 2016 13:43:44 +0300 Subject: [PATCH 0832/1557] Minor: update testdata Original commit: 441a442f34fd4dffb27de3e37c89fc5d40ff2d10 --- .../clearedHasKotlin/build.log | 6 ++++++ .../exportedModule/build.log | 8 ++++++++ .../data-container-version-build.log | 8 ++++++++ .../javaOnlyModulesAreNotAffected/build.log | 6 ++++++ .../module1Modified/build.log | 11 ++++++++++- .../data-container-version-build.log | 11 ++++++++++- .../module2Modified/build.log | 4 ++++ .../data-container-version-build.log | 4 ++++ .../moduleWithConstantModified/build.log | 4 ++++ .../data-container-version-build.log | 4 ++++ .../moduleWithInlineModified/build.log | 4 ++++ .../data-container-version-build.log | 4 ++++ .../cacheVersionChanged/touchedFile/build.log | 1 + .../data-container-version-build.log | 1 + .../touchedOnlyJavaFile/build.log | 1 + .../data-container-version-build.log | 1 + .../untouchedFiles/build.log | 1 + .../data-container-version-build.log | 1 + .../experimentalOn/build.log | 12 ++++++++++++ .../experimentalOnJavaChanged/build.log | 6 ++++++ .../experimentalOnOff/build.log | 17 +++++++++++++++++ .../incrementalOff/build.log | 9 +++++++++ .../incrementalOffOn/build.log | 17 +++++++++++++++++ .../multiModuleCircular/build.log | 4 ++++ .../build.log | 4 ++++ .../build.log | 4 ++++ .../multiModuleExported/build.log | 6 ++++++ .../multiModuleSimple/build.log | 5 +++++ .../circularDependencyClasses/build.log | 1 + .../experimental-ic-build.log | 1 + .../build.log | 1 + .../build.log | 1 + .../experimental-ic-build.log | 1 + .../build.log | 1 + .../experimental-ic-build.log | 1 + .../multiModule/constantValueChanged/build.log | 2 ++ .../experimental-ic-build.log | 2 ++ .../multiModule/defaultParameterAdded/build.log | 2 ++ .../experimental-ic-build.log | 2 ++ .../build.log | 2 ++ .../experimental-ic-build.log | 2 ++ .../defaultParameterRemoved/build.log | 2 ++ .../experimental-ic-build.log | 2 ++ .../build.log | 2 ++ .../experimental-ic-build.log | 2 ++ .../multiModule/inlineFunctionInlined/build.log | 2 ++ .../inlineFunctionTwoPackageParts/build.log | 4 ++++ .../moveFileToAnotherModule/build.log | 2 ++ .../experimental-ic-build.log | 2 ++ .../multiModule/simpleDependency/build.log | 2 ++ .../simpleDependency/experimental-ic-build.log | 2 ++ .../build.log | 2 ++ .../experimental-ic-build.log | 2 ++ .../build.log | 2 ++ .../simpleDependencyUnchanged/build.log | 2 ++ .../multiModule/transitiveDependency/build.log | 3 +++ .../experimental-ic-build.log | 3 +++ .../multiModule/transitiveInlining/build.log | 3 +++ .../multiModule/twoDependants/build.log | 3 +++ .../twoDependants/experimental-ic-build.log | 5 ++++- 60 files changed, 227 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log index c2086b69a47..dcdf52d9ec2 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/C.class End of files @@ -8,13 +9,16 @@ Exit code: NOTHING_DONE Compiling files: module1/src/C.java End of files +Building module2 Exit code: NOTHING_DONE ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ ================ Step #2 ================= +Building module1 Cleaning output files: out/production/module1/A.class End of files @@ -31,7 +35,9 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Exit code: NOTHING_DONE ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log index 10b162bd35e..dda4e0b18ad 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/a/A.class End of files @@ -8,6 +10,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/b/B.class End of files @@ -16,6 +20,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/c/C.class End of files @@ -24,6 +30,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/D/D.class End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log index aaaa056607b..f42c3fd9de2 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/exportedModule/data-container-version-build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module1/a/A.class End of files @@ -13,6 +15,8 @@ Marked as dirty by Kotlin: module4/src/D.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/b/B.class End of files @@ -21,6 +25,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/c/C.class End of files @@ -29,6 +35,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/D/D.class End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log index e6bdd80c5e7..2bada43544a 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/A.class End of files @@ -8,13 +9,16 @@ Exit code: NOTHING_DONE Compiling files: module1/src/A.java End of files +Building module2 Exit code: NOTHING_DONE ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ ================ Step #2 ================= +Building module1 Cleaning output files: out/production/module1/B.class End of files @@ -23,7 +27,9 @@ Exit code: NOTHING_DONE Compiling files: module1/src/B.java End of files +Building module2 Exit code: NOTHING_DONE ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log index 67e562b20bd..49c145f5a39 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -10,6 +12,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/BKt.class @@ -19,6 +23,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/module3/CKt.class @@ -28,6 +34,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/module4/D.class End of files @@ -36,5 +44,6 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module5 Exit code: NOTHING_DONE ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log index 163d054d0b9..aed2ed7538c 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module1Modified/data-container-version-build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -15,6 +17,8 @@ Marked as dirty by Kotlin: module4/src/d.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/BKt.class @@ -24,6 +28,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/module3/CKt.class @@ -33,6 +39,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/module4/D.class End of files @@ -41,5 +49,6 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module5 Exit code: NOTHING_DONE ------------------------------------------- \ No newline at end of file +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log index e683eb51ead..387f12ffca8 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -10,6 +12,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/BKt.class diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log index 93442154ba3..0c32827933a 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/module2Modified/data-container-version-build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/module1/A.class @@ -13,6 +15,8 @@ Marked as dirty by Kotlin: module2/src/b.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/module2/BKt.class diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log index 11aa2c27032..2c82d0bd8c1 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class @@ -9,6 +11,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/b/B.class End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log index 22017d936e8..6eb82eb7996 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified/data-container-version-build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class @@ -12,6 +14,8 @@ Marked as dirty by Kotlin: module2/src/B.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/b/B.class End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log index 4a0adc2e40a..8e9addf64de 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -10,6 +12,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/b/B.class End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log index e35086f3432..f762162fae9 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified/data-container-version-build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -13,6 +15,8 @@ Marked as dirty by Kotlin: module2/src/B.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/b/B.class End of files diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log index a16e3571f3f..781c9ca61d2 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log index 0fcf8fc80ca..9f939ce73a2 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedFile/data-container-version-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/other/OtherKt.class diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log index b5344359ac6..c48fd6f8bbc 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module/A.class out/production/module/META-INF/module.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log index cac3f45aa51..2a22b77369b 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile/data-container-version-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module/A.class out/production/module/META-INF/module.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log index 63704f89c81..961547cb08d 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class diff --git a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log index bc8ec716cf9..280d11f5d43 100644 --- a/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log +++ b/jps/jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles/data-container-version-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Actions after cache changed: [REBUILD_ALL_KOTLIN, DO_NOTHING] Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/test/AKt.class diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log index 0d14fe5c64f..b24d76c170f 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/foo/Z.class End of files @@ -15,6 +17,8 @@ Marked as dirty by Kotlin: module4/src/e.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class @@ -31,6 +35,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/foo/D.class End of files @@ -39,6 +45,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/foo/E.class End of files @@ -50,8 +58,10 @@ Exit code: OK ================ Step #2 ================= +Building module1 Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class @@ -62,7 +72,9 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ +Building module4 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log index a383c6b8b34..b484da53bbb 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/AKt.class out/production/module1/META-INF/module1.kotlin_module @@ -13,6 +15,8 @@ Marked as dirty by Kotlin: module3/src/d.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/B.class out/production/module2/CKt.class @@ -26,6 +30,8 @@ Exit code: OK Compiling files: module2/src/B.java End of files +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/DKt.class out/production/module3/META-INF/module3.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log index 5fb2084b8ca..962badeb481 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/build.log @@ -1,5 +1,7 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [REBUILD_ALL_KOTLIN, REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/foo/Z.class End of files @@ -15,6 +17,8 @@ Marked as dirty by Kotlin: module4/src/e.kt Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class @@ -31,6 +35,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/foo/D.class End of files @@ -39,6 +45,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/foo/E.class End of files @@ -50,8 +58,11 @@ Exit code: OK ================ Step #2 ================= +Building module1 +Actions after cache changed: [CLEAN_EXPERIMENTAL_CACHES, CLEAN_DATA_CONTAINER, DO_NOTHING] Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class @@ -62,15 +73,19 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ +Building module4 Exit code: NOTHING_DONE ------------------------------------------ ================ Step #3 ================= +Building module1 Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/A.class @@ -94,7 +109,9 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ +Building module4 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log index aad8e10a540..2649efb1346 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/build.log @@ -1,7 +1,10 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [CLEAN_NORMAL_CACHES, DO_NOTHING] Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/AKt.class @@ -13,15 +16,19 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ +Building module4 Exit code: NOTHING_DONE ------------------------------------------ ================ Step #2 ================= +Building module1 Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/AKt.class @@ -33,7 +40,9 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ +Building module4 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log index 6f5a9f3f178..e1d9eecfa4b 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/build.log @@ -1,7 +1,10 @@ ================ Step #1 ================= +Building module1 +Actions after cache changed: [CLEAN_NORMAL_CACHES, DO_NOTHING] Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/AKt.class @@ -13,13 +16,17 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ +Building module4 Exit code: NOTHING_DONE ------------------------------------------ ================ Step #2 ================= +Building module1 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module1/foo/Z.class End of files @@ -28,6 +35,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/AKt.class @@ -41,6 +50,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module3/foo/D.class End of files @@ -49,6 +60,8 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 +Actions after cache changed: [REBUILD_CHUNK, DO_NOTHING] Cleaning output files: out/production/module4/foo/E.class End of files @@ -60,8 +73,10 @@ Exit code: OK ================ Step #3 ================= +Building module1 Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/AKt.class @@ -82,7 +97,9 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ +Building module4 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log index 546018cf81f..60cda5933e7 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleCircular/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1, module2, module3 Cleaning output files: out/production/module1/foo/A.class End of files @@ -35,6 +36,7 @@ This type is final, so it cannot be inherited from ================ Step #2 ================= +Building module1, module2, module3 Cleaning output files: out/production/module1/foo/A.class End of files @@ -55,6 +57,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module4 Cleaning output files: out/production/module4/foo/E.class End of files @@ -63,6 +66,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module5 Cleaning output files: out/production/module5/foo/F.class End of files diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log index 3b75376e9c1..f20325065ed 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultArgumentInConstructorRemoved/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/foo/A.class End of files @@ -13,6 +14,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/CreateADefaultKt.class @@ -29,8 +31,10 @@ Too many arguments for public constructor A() defined in foo.A ================ Step #2 ================= +Building module1 Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Compiling files: module2/src/createADefault.kt End of files diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log index 33fd6c80e21..abd4f0e2b1b 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleDefaultValueInConstructorRemoved/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/foo/A.class End of files @@ -13,6 +14,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/foo/CreateADefaultKt.class @@ -29,8 +31,10 @@ No value passed for parameter x ================ Step #2 ================= +Building module1 Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Compiling files: module2/src/createANonDefault.kt End of files diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log index 165fd9620e4..c29b8374d1b 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/foo/A.class End of files @@ -15,6 +16,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/foo/AChild.class End of files @@ -29,6 +31,7 @@ Cannot access 'A': it is 'private' in file ================ Step #2 ================= +Building module1 Cleaning output files: out/production/module1/foo/A.class End of files @@ -44,11 +47,13 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Compiling files: module2/src/AChild.kt End of files Exit code: OK ------------------------------------------ +Building module3 Cleaning output files: out/production/module3/foo/AGrandChild.class End of files @@ -58,6 +63,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module4 Compiling files: module4/src/importAGrandChild.kt End of files diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log index 5e7cec4c4b0..e1585d4ab76 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/foo/A.class End of files @@ -14,6 +15,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/foo/AChild.class End of files @@ -30,6 +32,7 @@ Cannot access 'A': it is 'private' in file ================ Step #2 ================= +Building module1 Cleaning output files: out/production/module1/foo/A.class End of files @@ -44,12 +47,14 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Compiling files: module2/src/AChild.kt module2/src/importA.kt End of files Exit code: OK ------------------------------------------ +Building module3 Compiling files: module3/src/importAChild.kt End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log index 6a59313759a..c58da41ebcd 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1, module2 Cleaning output files: out/production/module2/b/B.class out/production/module2/b/BB.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log index 208566fb345..5635273b818 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyClasses/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1, module2 Cleaning output files: out/production/module2/b/B.class out/production/module2/b/BB.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log index 848f3a8fddf..f72749d18b0 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencySamePackageUnchanged/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1, module2 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/AKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log index 955b8c2b4ec..ea6970558f1 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1, module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log index ba77cb16739..e198f99e034 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyTopLevelFunctions/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1, module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log index 8492947881b..0788779c4ee 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1, module2 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log index dadff13db49..29e6af99f89 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/circularDependencyWithAccessToInternal/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1, module2 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log index 4077bcfe970..e4757362cf1 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/ConstKt.class @@ -11,6 +12,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/usage/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log index 9b0544e9a09..8372482bd22 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/constantValueChanged/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/test/ConstKt.class @@ -20,6 +21,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/usage/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log index 0af338460eb..823900e9c2d 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/a/A.class End of files @@ -8,6 +9,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log index 95ae71bdc8e..c564275c40e 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAdded/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/a/A.class End of files @@ -12,6 +13,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log index 9d45f067205..53a48c0d9f1 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class @@ -9,6 +10,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log index 7001866e2ad..341318a6b84 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterAddedForTopLevelFun/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class @@ -13,6 +14,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log index 0af338460eb..823900e9c2d 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/a/A.class End of files @@ -8,6 +9,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log index 95ae71bdc8e..c564275c40e 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemoved/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/a/A.class End of files @@ -12,6 +13,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log index 9d45f067205..53a48c0d9f1 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class @@ -9,6 +10,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log index 7001866e2ad..341318a6b84 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/defaultParameterRemovedForTopLevelFun/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class @@ -13,6 +14,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log index 7b0bdb5d27c..55bc9b6f591 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionInlined/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlineKt.class @@ -13,6 +14,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log index 9dfc11cb6f8..ef3b395e24c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/inlineFunctionTwoPackageParts/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlineFKt.class @@ -13,6 +14,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageFKt.class @@ -25,6 +27,7 @@ Exit code: OK ================ Step #2 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/inline/InlineGKt.class @@ -38,6 +41,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/usage/UsageGKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log index 38c05b916b0..74ac77bb357 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Compiling files: module1/src/b.kt End of files @@ -20,6 +21,7 @@ Cleaning output files: out/production/module2/b/B.class out/production/module2/b/BKt.class End of files +Building module2 Cleaning output files: out/production/module2/usage/UseClassBKt.class out/production/module2/usage/UseFunBKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log index e365cc0188c..533f1ecbd0a 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Compiling files: module1/src/b.kt End of files @@ -10,6 +11,7 @@ Cleaning output files: out/production/module2/b/B.class out/production/module2/b/BKt.class End of files +Building module2 Cleaning output files: out/production/module2/usage/UseClassBKt.class out/production/module2/usage/UseFunBKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log index a90dd2ca872..f296b0fb943 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -10,6 +11,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log index ab205a45bd4..6ddaba7c84b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependency/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -14,6 +15,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index 6cded04bbb9..6a53134aea2 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -12,6 +13,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log index 691b823d0bc..3c7f30277f0 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -16,6 +17,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log index 4cfb676fca6..eae1394f4a3 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -13,6 +14,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/B.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log index 9919e125aa3..5e8c7270385 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyUnchanged/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -10,5 +11,6 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log index 47d0811cf99..274d1daaa59 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -10,6 +11,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -19,5 +21,6 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log index 2504e97f8ca..4efd21570b5 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveDependency/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -14,6 +15,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -23,5 +25,6 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Exit code: NOTHING_DONE ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log index 412224b0f46..a164a0fe736 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/transitiveInlining/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/AKt.class @@ -13,6 +14,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -26,6 +28,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module3 Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/c/CKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log index b80a977a499..b6d4c85694c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -10,6 +11,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -19,6 +21,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/c/CKt.class diff --git a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log index 3537a221734..10e8f1351b5 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/twoDependants/experimental-ic-build.log @@ -1,5 +1,6 @@ ================ Step #1 ================= +Building module1 Cleaning output files: out/production/module1/META-INF/module1.kotlin_module out/production/module1/a/A.class @@ -15,6 +16,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Exit code: NOTHING_DONE ------------------------------------------ +Building module2 Cleaning output files: out/production/module2/META-INF/module2.kotlin_module out/production/module2/b/BKt.class @@ -24,6 +26,7 @@ Compiling files: End of files Exit code: OK ------------------------------------------ +Building module3 Cleaning output files: out/production/module3/META-INF/module3.kotlin_module out/production/module3/c/CKt.class @@ -32,4 +35,4 @@ Compiling files: module3/src/c.kt End of files Exit code: OK ------------------------------------------- \ No newline at end of file +------------------------------------------ From e18a666440c825a4c7d38ce59716a19d17b7c49c Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 7 Apr 2016 09:45:18 +0300 Subject: [PATCH 0833/1557] Extract tests-common module without any actual tests The main reasoning for the module is to avoid running any compiler tests while executing run configuration that searches tests across module dependencies. Original commit: 47c7181f2a70f987c278353a4c1b007c24a1af69 --- jps/jps-plugin/jps-tests/jps-tests.iml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/jps-tests.iml b/jps/jps-plugin/jps-tests/jps-tests.iml index 688da04d865..2f6d94239e8 100644 --- a/jps/jps-plugin/jps-tests/jps-tests.iml +++ b/jps/jps-plugin/jps-tests/jps-tests.iml @@ -13,7 +13,7 @@ - + From 6e4d8d16703fcacf545e078083641afc0e144499 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 24 Mar 2016 20:59:30 +0300 Subject: [PATCH 0834/1557] IC: take into account added and removed classes when calculate affected names Original commit: 51c6abdbed316b01d2943d6c9f048f87a0133880 --- .../jps/build/AbstractIncrementalJpsTest.kt | 6 +- ...perimentalIncrementalJpsTestGenerated.java | 84 +++++++++++++++++++ .../build/IncrementalJpsTestGenerated.java | 72 ++++++++++++++++ .../classHierarchyAffected/classRemoved/A.kt | 5 ++ .../classRemoved/A.kt.delete.1 | 0 .../classHierarchyAffected/classRemoved/B.kt | 5 ++ .../classRemoved/B.kt.new.2 | 5 ++ .../classHierarchyAffected/classRemoved/C.kt | 5 ++ .../classRemoved/build.log | 63 ++++++++++++++ .../classRemoved/createA.kt | 5 ++ .../classRemoved/createB.kt | 5 ++ .../classRemoved/createC.kt | 5 ++ .../classRemoved/funA.kt.new.2 | 7 ++ .../classRemoved/other.kt | 3 + .../classRemoved/useAfoo.kt | 7 ++ .../classRemoved/useBbar.kt | 7 ++ .../classRemoved/useCbaz.kt | 7 ++ .../classRemovedAndRestored/A.kt | 5 ++ .../classRemovedAndRestored/A.kt.delete.1 | 0 .../classRemovedAndRestored/A.kt.new.2 | 5 ++ .../classRemovedAndRestored/B.kt | 5 ++ .../classRemovedAndRestored/build.log | 64 ++++++++++++++ .../classRemovedAndRestored/createA.kt | 5 ++ .../classRemovedAndRestored/createB.kt | 5 ++ .../failCompilation.kt.new.3 | 3 + .../classRemovedAndRestored/other.kt | 3 + .../classRemovedAndRestored/useAfoo.kt | 7 ++ .../classRemovedAndRestored/useBbar.kt | 7 ++ .../classToPackageFacade/build.log | 1 + .../multiModule/classAdded/build.log | 53 ++++++++++++ .../multiModule/classAdded/dependencies.txt | 2 + .../classAdded/experimental-ic-build.log | 63 ++++++++++++++ .../multiModule/classAdded/module1_A.kt | 5 ++ .../multiModule/classAdded/module2_A.kt.new.1 | 5 ++ .../multiModule/classAdded/module2_B.kt | 5 ++ .../multiModule/classAdded/module2_createA.kt | 5 ++ .../multiModule/classAdded/module2_createB.kt | 5 ++ .../multiModule/classAdded/module2_other.kt | 3 + .../multiModule/classAdded/module2_useAfoo.kt | 7 ++ .../classAdded/module2_useAfoo.kt.new.2 | 7 ++ .../multiModule/classAdded/module2_useBbar.kt | 7 ++ .../multiModule/classRemoved/build.log | 65 ++++++++++++++ .../multiModule/classRemoved/dependencies.txt | 2 + .../classRemoved/experimental-ic-build.log | 73 ++++++++++++++++ .../multiModule/classRemoved/module1_A.kt | 5 ++ .../multiModule/classRemoved/module2_A.kt | 5 ++ .../classRemoved/module2_A.kt.delete.1 | 0 .../multiModule/classRemoved/module2_B.kt | 5 ++ .../classRemoved/module2_createA.kt | 5 ++ .../classRemoved/module2_createB.kt | 5 ++ .../module2_failCompilation.kt.new.4 | 3 + .../multiModule/classRemoved/module2_other.kt | 3 + .../classRemoved/module2_useAfoo.kt | 7 ++ .../classRemoved/module2_useAfoo.kt.new.2 | 7 ++ .../classRemoved/module2_useBbar.kt | 7 ++ .../copyFileToAnotherModule/build.log | 41 +++++++++ .../copyFileToAnotherModule/dependencies.txt | 2 + .../experimental-ic-build.log | 40 +++++++++ .../copyFileToAnotherModule/module1_a.kt | 6 ++ .../module1_b.kt.new.1 | 6 ++ .../module1_failCompilation.kt.new.2 | 3 + .../copyFileToAnotherModule/module2_b.kt | 6 ++ .../module2_useClassA.kt | 5 ++ .../module2_useClassB.kt | 5 ++ .../module2_useFunA.kt | 5 ++ .../module2_useFunB.kt | 5 ++ .../experimental-ic-build.log | 8 +- .../incremental/pureKotlin/addClass/A.kt.new | 3 + .../incremental/pureKotlin/addClass/build.log | 20 +++++ .../addClass/experimental-ic-build.log | 21 +++++ .../incremental/pureKotlin/addClass/funA.kt | 3 + .../incremental/pureKotlin/addClass/other.kt | 3 + .../incremental/pureKotlin/addClass/useA.kt | 7 ++ .../addFileWithFunctionOverload/build.log | 20 +++++ .../experimental-ic-build.log | 21 +++++ .../addFileWithFunctionOverload/foo1.kt | 3 + .../addFileWithFunctionOverload/foo2.kt.new | 3 + .../addFileWithFunctionOverload/other.kt | 3 + .../addFileWithFunctionOverload/use.kt | 7 ++ .../experimental-ic-build.log | 1 + .../pureKotlin/removeAndRestoreCompanion/A.kt | 8 ++ .../removeAndRestoreCompanion/A.kt.new.1 | 4 + .../removeAndRestoreCompanion/A.kt.new.2 | 8 ++ .../removeAndRestoreCompanion/build.log | 44 ++++++++++ .../experimental-ic-build.log | 41 +++++++++ .../removeAndRestoreCompanion/other.kt | 3 + .../removeAndRestoreCompanion/useA.kt | 7 ++ .../removeAndRestoreCompanion/useAbar.kt | 7 ++ .../removeAndRestoreCompanion/useAfoo.kt | 7 ++ .../A.kt | 8 ++ .../A.kt.new.1 | 4 + .../A.kt.new.2 | 8 ++ .../build.log | 53 ++++++++++++ .../experimental-ic-build.log | 57 +++++++++++++ .../getACompanion.kt | 5 ++ .../getACompanionShort.kt | 5 ++ .../other.kt | 3 + .../useACompanionImplicitly.kt | 7 ++ .../useACompanionShortImplicitly.kt | 7 ++ .../useAbarWithImplicitReceiver.kt | 7 ++ .../useAfooWithImplicitReceiver.kt | 7 ++ .../incremental/pureKotlin/removeClass/A.kt | 3 + .../pureKotlin/removeClass/A.kt.delete | 0 .../pureKotlin/removeClass/build.log | 22 +++++ .../removeClass/experimental-ic-build.log | 23 +++++ .../pureKotlin/removeClass/funA.kt | 4 + .../pureKotlin/removeClass/other.kt | 3 + .../pureKotlin/removeClass/useA.kt | 7 ++ .../removeClassInDefaultPackage/A.kt | 1 + .../removeClassInDefaultPackage/A.kt.delete | 0 .../removeClassInDefaultPackage/build.log | 22 +++++ .../experimental-ic-build.log | 23 +++++ .../removeClassInDefaultPackage/funA.kt | 2 + .../removeClassInDefaultPackage/other.kt | 3 + .../removeClassInDefaultPackage/useA.kt | 3 + .../removeFileWithFunctionOverload/build.log | 23 +++++ .../experimental-ic-build.log | 24 ++++++ .../removeFileWithFunctionOverload/foo1.kt | 3 + .../removeFileWithFunctionOverload/foo2.kt | 3 + .../foo2.kt.delete | 0 .../removeFileWithFunctionOverload/other.kt | 3 + .../removeFileWithFunctionOverload/use.kt | 7 ++ .../incremental/pureKotlin/renameClass/A.kt | 3 + .../pureKotlin/renameClass/A.kt.new | 3 + .../pureKotlin/renameClass/build.log | 25 ++++++ .../renameClass/experimental-ic-build.log | 27 ++++++ .../pureKotlin/renameClass/funs.kt | 4 + .../pureKotlin/renameClass/other.kt | 3 + .../pureKotlin/renameClass/useA.kt | 7 ++ .../pureKotlin/renameClass/useB.kt | 7 ++ .../renameFileWithFunctionOverload/build.log | 28 +++++++ .../experimental-ic-build.log | 25 ++++++ .../renameFileWithFunctionOverload/foo0.kt | 3 + .../renameFileWithFunctionOverload/foo1.kt | 3 + .../renameFileWithFunctionOverload/foo2.kt | 3 + .../foo2.kt.delete | 0 .../foo3.kt.new | 3 + .../renameFileWithFunctionOverload/other.kt | 3 + .../renameFileWithFunctionOverload/useF.kt | 7 ++ .../renameFileWithFunctionOverload/useG.kt | 7 ++ .../javaToKotlin/experimental-ic-build.log | 4 +- 141 files changed, 1646 insertions(+), 5 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/C.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createC.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/other.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3 create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_B.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_createA.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_createB.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_other.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useBbar.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module1_A.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt.delete.1 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_B.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createA.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createB.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_failCompilation.kt.new.4 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_other.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useBbar.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_a.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_b.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_failCompilation.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_b.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassA.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassB.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunA.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addClass/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addClass/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addClass/funA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addClass/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addClass/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClass/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClass/funA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClass/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClass/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameClass/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameClass/funs.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameClass/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useA.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useB.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 605a25549df..641dc532c0f 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -65,12 +65,12 @@ abstract class AbstractIncrementalJpsTest( private val allowNoBuildLogFileInTestData: Boolean = false ) : JpsBuildTestCase() { companion object { - val COMPILATION_FAILED = "COMPILATION FAILED" + private val COMPILATION_FAILED = "COMPILATION FAILED" // change to "/tmp" or anything when default is too long (for easier debugging) - val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) + private val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) - val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" + private val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" } protected open val enableExperimentalIncrementalCompilation = false diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index c3ca6dd14ba..c88cb6cc955 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -61,12 +61,30 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("classAdded") + public void testClassAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/classAdded/"); + doTest(fileName); + } + + @TestMetadata("classRemoved") + public void testClassRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/classRemoved/"); + doTest(fileName); + } + @TestMetadata("constantValueChanged") public void testConstantValueChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); doTest(fileName); } + @TestMetadata("copyFileToAnotherModule") + public void testCopyFileToAnotherModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/"); + doTest(fileName); + } + @TestMetadata("defaultParameterAdded") public void testDefaultParameterAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAdded/"); @@ -175,6 +193,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("addClass") + public void testAddClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addClass/"); + doTest(fileName); + } + + @TestMetadata("addFileWithFunctionOverload") + public void testAddFileWithFunctionOverload() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/"); + doTest(fileName); + } + @TestMetadata("allConstants") public void testAllConstants() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); @@ -743,6 +773,48 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("removeAndRestoreCompanion") + public void testRemoveAndRestoreCompanion() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/"); + doTest(fileName); + } + + @TestMetadata("removeAndRestoreCompanionWithImplicitUsages") + public void testRemoveAndRestoreCompanionWithImplicitUsages() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/"); + doTest(fileName); + } + + @TestMetadata("removeClass") + public void testRemoveClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeClass/"); + doTest(fileName); + } + + @TestMetadata("removeClassInDefaultPackage") + public void testRemoveClassInDefaultPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/"); + doTest(fileName); + } + + @TestMetadata("removeFileWithFunctionOverload") + public void testRemoveFileWithFunctionOverload() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/"); + doTest(fileName); + } + + @TestMetadata("renameClass") + public void testRenameClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/"); + doTest(fileName); + } + + @TestMetadata("renameFileWithFunctionOverload") + public void testRenameFileWithFunctionOverload() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/"); + doTest(fileName); + } + @TestMetadata("returnTypeChanged") public void testReturnTypeChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); @@ -1164,6 +1236,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("classRemoved") + public void testClassRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/"); + doTest(fileName); + } + + @TestMetadata("classRemovedAndRestored") + public void testClassRemovedAndRestored() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/"); + doTest(fileName); + } + @TestMetadata("classToPackageFacade") public void testClassToPackageFacade() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/"); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index da142333f80..23aba42cd33 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -61,12 +61,30 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("classAdded") + public void testClassAdded() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/classAdded/"); + doTest(fileName); + } + + @TestMetadata("classRemoved") + public void testClassRemoved() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/classRemoved/"); + doTest(fileName); + } + @TestMetadata("constantValueChanged") public void testConstantValueChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/constantValueChanged/"); doTest(fileName); } + @TestMetadata("copyFileToAnotherModule") + public void testCopyFileToAnotherModule() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/"); + doTest(fileName); + } + @TestMetadata("defaultParameterAdded") public void testDefaultParameterAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/multiModule/defaultParameterAdded/"); @@ -175,6 +193,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("addClass") + public void testAddClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addClass/"); + doTest(fileName); + } + + @TestMetadata("addFileWithFunctionOverload") + public void testAddFileWithFunctionOverload() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/"); + doTest(fileName); + } + @TestMetadata("allConstants") public void testAllConstants() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); @@ -743,6 +773,48 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("removeAndRestoreCompanion") + public void testRemoveAndRestoreCompanion() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/"); + doTest(fileName); + } + + @TestMetadata("removeAndRestoreCompanionWithImplicitUsages") + public void testRemoveAndRestoreCompanionWithImplicitUsages() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/"); + doTest(fileName); + } + + @TestMetadata("removeClass") + public void testRemoveClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeClass/"); + doTest(fileName); + } + + @TestMetadata("removeClassInDefaultPackage") + public void testRemoveClassInDefaultPackage() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/"); + doTest(fileName); + } + + @TestMetadata("removeFileWithFunctionOverload") + public void testRemoveFileWithFunctionOverload() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/"); + doTest(fileName); + } + + @TestMetadata("renameClass") + public void testRenameClass() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/"); + doTest(fileName); + } + + @TestMetadata("renameFileWithFunctionOverload") + public void testRenameFileWithFunctionOverload() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/"); + doTest(fileName); + } + @TestMetadata("returnTypeChanged") public void testReturnTypeChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt new file mode 100644 index 00000000000..19a6b32f38d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun foo() {} +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/A.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt new file mode 100644 index 00000000000..f0800c360d3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt @@ -0,0 +1,5 @@ +package foo + +open class B : A() { + fun bar() {} +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2 new file mode 100644 index 00000000000..00327a6911c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/B.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class B { + fun bar() {} +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/C.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/C.kt new file mode 100644 index 00000000000..a539cafa7f2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/C.kt @@ -0,0 +1,5 @@ +package foo + +class C : B() { + fun baz() {} +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log new file mode 100644 index 00000000000..ffa296c5f05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/build.log @@ -0,0 +1,63 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createA.kt + src/useAfoo.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/use/CreateAKt.class + out/production/module/use/UseAfooKt.class +End of files +Compiling files: + src/B.kt + src/createA.kt + src/useAfoo.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: A +Unresolved reference: A + +================ Step #2 ================= + +Compiling files: + src/B.kt + src/createA.kt + src/funA.kt + src/useAfoo.kt +End of files +Marked as dirty by Kotlin: + src/C.kt + src/createB.kt + src/createC.kt + src/useBbar.kt + src/useCbaz.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/C.class + out/production/module/use/CreateBKt.class + out/production/module/use/CreateCKt.class + out/production/module/use/UseBbarKt.class + out/production/module/use/UseCbazKt.class +End of files +Compiling files: + src/C.kt + src/createB.kt + src/createC.kt + src/useBbar.kt + src/useCbaz.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createA.kt new file mode 100644 index 00000000000..6821a4e06c0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createA.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createA() = A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createB.kt new file mode 100644 index 00000000000..743cd73cb57 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createB.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createB() = B() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createC.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createC.kt new file mode 100644 index 00000000000..403887a65ee --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/createC.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createC() = C() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2 new file mode 100644 index 00000000000..b878a6b5466 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/funA.kt.new.2 @@ -0,0 +1,7 @@ +package foo + +fun A(a: Int = 1) = AnotherA() + +class AnotherA { + fun foo() {} +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/other.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/other.kt new file mode 100644 index 00000000000..1d758703f95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt new file mode 100644 index 00000000000..ebac21a6cbe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useAfoo.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAfoo() { + createA().foo() +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt new file mode 100644 index 00000000000..cad51bcbad1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useBbar.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useBbar() { + createB().bar() +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt new file mode 100644 index 00000000000..72c907f222c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemoved/useCbaz.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useCbaz() { + createC().baz() +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt new file mode 100644 index 00000000000..19a6b32f38d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun foo() {} +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2 new file mode 100644 index 00000000000..19a6b32f38d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/A.kt.new.2 @@ -0,0 +1,5 @@ +package foo + +open class A { + fun foo() {} +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt new file mode 100644 index 00000000000..dede900d0bd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/B.kt @@ -0,0 +1,5 @@ +package foo + +class B : A() { + fun bar() {} +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log new file mode 100644 index 00000000000..83413c7c912 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/build.log @@ -0,0 +1,64 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: +End of files +Marked as dirty by Kotlin: + src/B.kt + src/createA.kt + src/useAfoo.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/B.class + out/production/module/use/CreateAKt.class + out/production/module/use/UseAfooKt.class +End of files +Compiling files: + src/B.kt + src/createA.kt + src/useAfoo.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: A +Unresolved reference: A + +================ Step #2 ================= + +Compiling files: + src/A.kt + src/B.kt + src/createA.kt + src/useAfoo.kt +End of files +Marked as dirty by Kotlin: + src/createB.kt + src/useBbar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/use/CreateBKt.class + out/production/module/use/UseBbarKt.class +End of files +Compiling files: + src/createB.kt + src/useBbar.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #3 ================= + +Compiling files: + src/failCompilation.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Expecting a top level declaration diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt new file mode 100644 index 00000000000..6821a4e06c0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createA.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createA() = A() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt new file mode 100644 index 00000000000..743cd73cb57 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/createB.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createB() = B() diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3 b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3 new file mode 100644 index 00000000000..fed605d81da --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/failCompilation.kt.new.3 @@ -0,0 +1,3 @@ +// TODO remove this file after IDEA-154389 will be fixed + +invalid_code diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt new file mode 100644 index 00000000000..1d758703f95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt new file mode 100644 index 00000000000..ebac21a6cbe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useAfoo.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAfoo() { + createA().foo() +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt new file mode 100644 index 00000000000..cad51bcbad1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored/useBbar.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useBbar() { + createB().bar() +} diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log index c1a17799b80..4e14747989d 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log @@ -9,6 +9,7 @@ Compiling files: src/APartG.kt End of files Marked as dirty by Kotlin: + src/AChild.kt src/useF.kt src/useG.kt Exit code: ADDITIONAL_PASS_REQUIRED diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/build.log b/jps/jps-plugin/testData/incremental/multiModule/classAdded/build.log new file mode 100644 index 00000000000..46c607d8c12 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/build.log @@ -0,0 +1,53 @@ +================ Step #1 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/B.class + out/production/module2/other/OtherKt.class + out/production/module2/use/CreateAKt.class + out/production/module2/use/CreateBKt.class + out/production/module2/use/UseAfooKt.class + out/production/module2/use/UseBbarKt.class +End of files +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/other.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: foo + +================ Step #2 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/foo/A.class +End of files +Compiling files: + module2/src/A.kt + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/other.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/classAdded/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/classAdded/experimental-ic-build.log new file mode 100644 index 00000000000..7e91e1f8b82 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/experimental-ic-build.log @@ -0,0 +1,63 @@ +================ Step #1 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/A.kt +End of files +Marked as dirty by Kotlin: + module1/src/A.kt + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/B.class + out/production/module2/use/CreateAKt.class + out/production/module2/use/CreateBKt.class + out/production/module2/use/UseAfooKt.class + out/production/module2/use/UseBbarKt.class +End of files +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: foo + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Exit code: OK +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/foo/A.class +End of files +Compiling files: + module2/src/A.kt + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module1_A.kt new file mode 100644 index 00000000000..19a6b32f38d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module1_A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun foo() {} +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_A.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_A.kt.new.1 new file mode 100644 index 00000000000..14b753925c5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_A.kt.new.1 @@ -0,0 +1,5 @@ +package foo + +open class A { + fun boo() {} +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_B.kt b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_B.kt new file mode 100644 index 00000000000..dede900d0bd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_B.kt @@ -0,0 +1,5 @@ +package foo + +class B : A() { + fun bar() {} +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_createA.kt b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_createA.kt new file mode 100644 index 00000000000..6821a4e06c0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_createA.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createA() = A() diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_createB.kt b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_createB.kt new file mode 100644 index 00000000000..743cd73cb57 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_createB.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createB() = B() diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_other.kt b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_other.kt new file mode 100644 index 00000000000..1d758703f95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt new file mode 100644 index 00000000000..ebac21a6cbe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAfoo() { + createA().foo() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt.new.2 new file mode 100644 index 00000000000..2896471b644 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useAfoo.kt.new.2 @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAfoo() { + createA().boo() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useBbar.kt b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useBbar.kt new file mode 100644 index 00000000000..cad51bcbad1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classAdded/module2_useBbar.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useBbar() { + createB().bar() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/build.log b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/build.log new file mode 100644 index 00000000000..4ccb04b77f1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/build.log @@ -0,0 +1,65 @@ +================ Step #1 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Cleaning output files: + out/production/module2/foo/A.class +End of files +Building module2 +Compiling files: +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/B.class + out/production/module2/other/OtherKt.class + out/production/module2/use/CreateAKt.class + out/production/module2/use/CreateBKt.class + out/production/module2/use/UseAfooKt.class + out/production/module2/use/UseBbarKt.class +End of files +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/other.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: boo + +================ Step #2 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/createB.kt + module2/src/other.kt + module2/src/useAfoo.kt + module2/src/useBbar.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #3 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/failCompilation.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Expecting a top level declaration diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..020f7c40e01 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/experimental-ic-build.log @@ -0,0 +1,73 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Exit code: OK +------------------------------------------ +Cleaning output files: + out/production/module2/foo/A.class +End of files +Building module2 +Compiling files: +End of files +Marked as dirty by Kotlin: + module1/src/A.kt + module2/src/B.kt + module2/src/createA.kt + module2/src/useAfoo.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/B.class + out/production/module2/use/CreateAKt.class + out/production/module2/use/UseAfooKt.class +End of files +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/useAfoo.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: boo + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Exit code: OK +------------------------------------------ +Building module2 +Compiling files: + module2/src/B.kt + module2/src/createA.kt + module2/src/useAfoo.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #3 ================= + +Building module1 +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/failCompilation.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Expecting a top level declaration diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module1_A.kt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module1_A.kt new file mode 100644 index 00000000000..19a6b32f38d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module1_A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun foo() {} +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt new file mode 100644 index 00000000000..14b753925c5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt @@ -0,0 +1,5 @@ +package foo + +open class A { + fun boo() {} +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt.delete.1 b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_A.kt.delete.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_B.kt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_B.kt new file mode 100644 index 00000000000..dede900d0bd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_B.kt @@ -0,0 +1,5 @@ +package foo + +class B : A() { + fun bar() {} +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createA.kt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createA.kt new file mode 100644 index 00000000000..6821a4e06c0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createA.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createA() = A() diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createB.kt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createB.kt new file mode 100644 index 00000000000..743cd73cb57 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_createB.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun createB() = B() diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_failCompilation.kt.new.4 b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_failCompilation.kt.new.4 new file mode 100644 index 00000000000..5974f44fb71 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_failCompilation.kt.new.4 @@ -0,0 +1,3 @@ +// TODO remove this file after IDEA-154390 will be fixed + +invalid_code diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_other.kt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_other.kt new file mode 100644 index 00000000000..1d758703f95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt new file mode 100644 index 00000000000..2896471b644 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAfoo() { + createA().boo() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt.new.2 new file mode 100644 index 00000000000..ebac21a6cbe --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useAfoo.kt.new.2 @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAfoo() { + createA().foo() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useBbar.kt b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useBbar.kt new file mode 100644 index 00000000000..cad51bcbad1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/classRemoved/module2_useBbar.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useBbar() { + createB().bar() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log new file mode 100644 index 00000000000..8dda87a5c9d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/build.log @@ -0,0 +1,41 @@ +================ Step #1 ================= + +Building module1 +Compiling files: + module1/src/b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/a/A.class + out/production/module1/a/AKt.class +End of files +Compiling files: + module1/src/a.kt +End of files +Exit code: OK +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/UseClassBKt.class + out/production/module2/usage/UseFunBKt.class +End of files +Compiling files: + module2/src/useClassB.kt + module2/src/useFunB.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Building module1 +Compiling files: + module1/src/failCompilation.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Expecting a top level declaration diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/dependencies.txt new file mode 100644 index 00000000000..827bf04cc58 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/dependencies.txt @@ -0,0 +1,2 @@ +module1-> +module2->module1 diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/experimental-ic-build.log new file mode 100644 index 00000000000..b10de0a77e1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/experimental-ic-build.log @@ -0,0 +1,40 @@ +================ Step #1 ================= + +Building module1 +Compiling files: + module1/src/b.kt +End of files +Marked as dirty by Kotlin: + module2/src/b.kt + module2/src/useClassB.kt + module2/src/useFunB.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/b/B.class + out/production/module2/b/BKt.class + out/production/module2/usage/UseClassBKt.class + out/production/module2/usage/UseFunBKt.class +End of files +Compiling files: + module2/src/b.kt + module2/src/useClassB.kt + module2/src/useFunB.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Building module1 +Compiling files: + module1/src/failCompilation.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Expecting a top level declaration diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_a.kt b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_a.kt new file mode 100644 index 00000000000..a3470c00a84 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_a.kt @@ -0,0 +1,6 @@ +package a + +class A + +fun a() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_b.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_b.kt.new.1 new file mode 100644 index 00000000000..7965b9e82a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_b.kt.new.1 @@ -0,0 +1,6 @@ +package b + +class B + +fun b() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_failCompilation.kt.new.2 b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_failCompilation.kt.new.2 new file mode 100644 index 00000000000..07014f41b99 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module1_failCompilation.kt.new.2 @@ -0,0 +1,3 @@ +// TODO remove this file after IDEA-154394 will be fixed + +invalid_code diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_b.kt b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_b.kt new file mode 100644 index 00000000000..7965b9e82a5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_b.kt @@ -0,0 +1,6 @@ +package b + +class B + +fun b() { +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassA.kt b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassA.kt new file mode 100644 index 00000000000..a6e5135a4b4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassA.kt @@ -0,0 +1,5 @@ +package usage + +fun useClassA() { + a.A() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassB.kt b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassB.kt new file mode 100644 index 00000000000..568e8076a09 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useClassB.kt @@ -0,0 +1,5 @@ +package usage + +fun useClassB() { + b.B() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunA.kt b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunA.kt new file mode 100644 index 00000000000..9cee04d3276 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunA.kt @@ -0,0 +1,5 @@ +package usage + +fun useFunA() { + a.a() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunB.kt b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunB.kt new file mode 100644 index 00000000000..bb4d7bca61f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/copyFileToAnotherModule/module2_useFunB.kt @@ -0,0 +1,5 @@ +package usage + +fun useFunB() { + b.b() +} diff --git a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log index 533f1ecbd0a..757cb7c283c 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/moveFileToAnotherModule/experimental-ic-build.log @@ -4,7 +4,13 @@ Building module1 Compiling files: module1/src/b.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + module2/src/b.kt + module2/src/useClassB.kt + module2/src/useFunB.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE ------------------------------------------ Cleaning output files: out/production/module2/META-INF/module2.kotlin_module diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addClass/A.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/A.kt.new new file mode 100644 index 00000000000..c31fc881e2b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/A.kt.new @@ -0,0 +1,3 @@ +package foo + +class A diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/build.log new file mode 100644 index 00000000000..5a960463450 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/FunAKt.class + out/production/module/other/OtherKt.class + out/production/module/use/UseAKt.class +End of files +Compiling files: + src/funA.kt + src/other.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addClass/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/experimental-ic-build.log new file mode 100644 index 00000000000..9d2a2de8931 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/experimental-ic-build.log @@ -0,0 +1,21 @@ +================ Step #1 ================= + +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/funA.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/FunAKt.class + out/production/module/use/UseAKt.class +End of files +Compiling files: + src/funA.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addClass/funA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/funA.kt new file mode 100644 index 00000000000..65abdd939e7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/funA.kt @@ -0,0 +1,3 @@ +package foo + +fun A(a: Int = 1){} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/other.kt new file mode 100644 index 00000000000..d3689e2ea8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addClass/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/useA.kt new file mode 100644 index 00000000000..9f7e7f2a233 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addClass/useA.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useA() { + A() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log new file mode 100644 index 00000000000..d91362e7c4c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Compiling files: + src/foo2.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo1Kt.class + out/production/module/other/OtherKt.class + out/production/module/use/UseKt.class +End of files +Compiling files: + src/foo1.kt + src/other.kt + src/use.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/experimental-ic-build.log new file mode 100644 index 00000000000..3d8ecd171a1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/experimental-ic-build.log @@ -0,0 +1,21 @@ +================ Step #1 ================= + +Compiling files: + src/foo2.kt +End of files +Marked as dirty by Kotlin: + src/foo1.kt + src/use.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo1Kt.class + out/production/module/use/UseKt.class +End of files +Compiling files: + src/foo1.kt + src/use.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt new file mode 100644 index 00000000000..bd7697f4035 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo1.kt @@ -0,0 +1,3 @@ +package foo + +fun f(a: Any) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new new file mode 100644 index 00000000000..ac48e24c9e5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/foo2.kt.new @@ -0,0 +1,3 @@ +package foo + +fun f(a: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt new file mode 100644 index 00000000000..d3689e2ea8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt new file mode 100644 index 00000000000..e9dbe9f4ac1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addFileWithFunctionOverload/use.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useA() { + f(1) +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log index 015c0970896..8de8f77c492 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithChangingPackage/experimental-ic-build.log @@ -9,6 +9,7 @@ Compiling files: src/bar/a.kt End of files Marked as dirty by Kotlin: + src/useClass.kt src/useFun.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt new file mode 100644 index 00000000000..2f7dd0ca36f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt @@ -0,0 +1,8 @@ +package foo + +class A { + companion object { + val bar = 1 + fun foo() {} + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1 new file mode 100644 index 00000000000..78fd9a12499 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.1 @@ -0,0 +1,4 @@ +package foo + +class A { +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2 new file mode 100644 index 00000000000..2f7dd0ca36f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/A.kt.new.2 @@ -0,0 +1,8 @@ +package foo + +class A { + companion object { + val bar = 1 + fun foo() {} + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log new file mode 100644 index 00000000000..31986a634a4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/build.log @@ -0,0 +1,44 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A$Companion.class + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/use/UseAKt.class + out/production/module/use/UseAbarKt.class + out/production/module/use/UseAfooKt.class +End of files +Compiling files: + src/other.kt + src/useA.kt + src/useAbar.kt + src/useAfoo.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: bar +Unresolved reference: foo + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/other.kt + src/useA.kt + src/useAbar.kt + src/useAfoo.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log new file mode 100644 index 00000000000..6da65110b2a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log @@ -0,0 +1,41 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A$Companion.class + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/useAbar.kt + src/useAfoo.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/use/UseAbarKt.class + out/production/module/use/UseAfooKt.class +End of files +Compiling files: + src/useAbar.kt + src/useAfoo.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: bar +Unresolved reference: foo + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/useAbar.kt + src/useAfoo.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt new file mode 100644 index 00000000000..1d758703f95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt new file mode 100644 index 00000000000..9f7e7f2a233 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useA.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useA() { + A() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt new file mode 100644 index 00000000000..3b225c94df4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAbar.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAbar() { + A.bar +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt new file mode 100644 index 00000000000..ab54273a874 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/useAfoo.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAfoo() { + A.foo() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt new file mode 100644 index 00000000000..2f7dd0ca36f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt @@ -0,0 +1,8 @@ +package foo + +class A { + companion object { + val bar = 1 + fun foo() {} + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1 new file mode 100644 index 00000000000..78fd9a12499 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.1 @@ -0,0 +1,4 @@ +package foo + +class A { +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2 new file mode 100644 index 00000000000..2f7dd0ca36f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/A.kt.new.2 @@ -0,0 +1,8 @@ +package foo + +class A { + companion object { + val bar = 1 + fun foo() {} + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log new file mode 100644 index 00000000000..c27e845833a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/build.log @@ -0,0 +1,53 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A$Companion.class + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/other/OtherKt.class + out/production/module/use/GetACompanionKt.class + out/production/module/use/GetACompanionShortKt.class + out/production/module/use/UseACompanionImplicitlyKt.class + out/production/module/use/UseACompanionShortImplicitlyKt.class + out/production/module/use/UseAbarWithImplicitReceiverKt.class + out/production/module/use/UseAfooWithImplicitReceiverKt.class +End of files +Compiling files: + src/getACompanion.kt + src/getACompanionShort.kt + src/other.kt + src/useACompanionImplicitly.kt + src/useACompanionShortImplicitly.kt + src/useAbarWithImplicitReceiver.kt + src/useAfooWithImplicitReceiver.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: Companion +Please specify constructor invocation; classifier 'A' does not have a companion object + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/getACompanion.kt + src/getACompanionShort.kt + src/other.kt + src/useACompanionImplicitly.kt + src/useACompanionShortImplicitly.kt + src/useAbarWithImplicitReceiver.kt + src/useAfooWithImplicitReceiver.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log new file mode 100644 index 00000000000..f76979cc10a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/experimental-ic-build.log @@ -0,0 +1,57 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A$Companion.class + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/getACompanion.kt + src/getACompanionShort.kt + src/useACompanionImplicitly.kt + src/useACompanionShortImplicitly.kt + src/useAbarWithImplicitReceiver.kt + src/useAfooWithImplicitReceiver.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/use/GetACompanionKt.class + out/production/module/use/GetACompanionShortKt.class + out/production/module/use/UseACompanionImplicitlyKt.class + out/production/module/use/UseACompanionShortImplicitlyKt.class + out/production/module/use/UseAbarWithImplicitReceiverKt.class + out/production/module/use/UseAfooWithImplicitReceiverKt.class +End of files +Compiling files: + src/getACompanion.kt + src/getACompanionShort.kt + src/useACompanionImplicitly.kt + src/useACompanionShortImplicitly.kt + src/useAbarWithImplicitReceiver.kt + src/useAfooWithImplicitReceiver.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: Companion +Please specify constructor invocation; classifier 'A' does not have a companion object + +================ Step #2 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt + src/getACompanion.kt + src/getACompanionShort.kt + src/useACompanionImplicitly.kt + src/useACompanionShortImplicitly.kt + src/useAbarWithImplicitReceiver.kt + src/useAfooWithImplicitReceiver.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt new file mode 100644 index 00000000000..07be111bdc8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanion.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun getACompanion() = A.Companion diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt new file mode 100644 index 00000000000..c48c918a127 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/getACompanionShort.kt @@ -0,0 +1,5 @@ +package use + +import foo.* + +fun getACompanionShort() = A diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt new file mode 100644 index 00000000000..1d758703f95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt new file mode 100644 index 00000000000..aab5128d647 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionImplicitly.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useACompanionImplicitly() { + getACompanion() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt new file mode 100644 index 00000000000..fa3bd90b5a6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useACompanionShortImplicitly.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useACompanionShortImplicitly() { + getACompanionShort() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt new file mode 100644 index 00000000000..53ef3d00db9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAbarWithImplicitReceiver.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAbarWithImplicitReceiver() { + getACompanionShort().bar +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt new file mode 100644 index 00000000000..2326586ccf0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanionWithImplicitUsages/useAfooWithImplicitReceiver.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useAfooWithImplicitReceiver() { + getACompanion().foo() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt new file mode 100644 index 00000000000..c31fc881e2b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt @@ -0,0 +1,3 @@ +package foo + +class A diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/A.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log new file mode 100644 index 00000000000..66dd7f71a62 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/FunAKt.class + out/production/module/other/OtherKt.class + out/production/module/use/UseAKt.class +End of files +Compiling files: + src/funA.kt + src/other.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/experimental-ic-build.log new file mode 100644 index 00000000000..6b00e0c42bb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/experimental-ic-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: +End of files +Marked as dirty by Kotlin: + src/funA.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/FunAKt.class + out/production/module/use/UseAKt.class +End of files +Compiling files: + src/funA.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/funA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/funA.kt new file mode 100644 index 00000000000..7ac231ab2e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/funA.kt @@ -0,0 +1,4 @@ +package foo + +fun A(a: Int = 0) { +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/other.kt new file mode 100644 index 00000000000..d3689e2ea8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/useA.kt new file mode 100644 index 00000000000..9f7e7f2a233 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClass/useA.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useA() { + A() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt new file mode 100644 index 00000000000..83d15dc739b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt @@ -0,0 +1 @@ +class A diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/A.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log new file mode 100644 index 00000000000..613cac5f8b0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/A.class +End of files +Compiling files: +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/FunAKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseAKt.class + out/production/module/other/OtherKt.class +End of files +Compiling files: + src/funA.kt + src/other.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/experimental-ic-build.log new file mode 100644 index 00000000000..fe11b6430b9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/experimental-ic-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/A.class +End of files +Compiling files: +End of files +Marked as dirty by Kotlin: + src/funA.kt + src/useA.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/FunAKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseAKt.class +End of files +Compiling files: + src/funA.kt + src/useA.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt new file mode 100644 index 00000000000..95dc410cc52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/funA.kt @@ -0,0 +1,2 @@ +fun A(a: Int = 0) { +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt new file mode 100644 index 00000000000..d3689e2ea8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt new file mode 100644 index 00000000000..8dfb7d1395e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeClassInDefaultPackage/useA.kt @@ -0,0 +1,3 @@ +fun useA() { + A() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log new file mode 100644 index 00000000000..d1dd9f1c6c0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo2Kt.class +End of files +Compiling files: +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo1Kt.class + out/production/module/other/OtherKt.class + out/production/module/use/UseKt.class +End of files +Compiling files: + src/foo1.kt + src/other.kt + src/use.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/experimental-ic-build.log new file mode 100644 index 00000000000..7ca6023648d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/experimental-ic-build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo2Kt.class +End of files +Compiling files: +End of files +Marked as dirty by Kotlin: + src/foo1.kt + src/use.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo1Kt.class + out/production/module/use/UseKt.class +End of files +Compiling files: + src/foo1.kt + src/use.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt new file mode 100644 index 00000000000..bd7697f4035 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo1.kt @@ -0,0 +1,3 @@ +package foo + +fun f(a: Any) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt new file mode 100644 index 00000000000..ac48e24c9e5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt @@ -0,0 +1,3 @@ +package foo + +fun f(a: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/foo2.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt new file mode 100644 index 00000000000..d3689e2ea8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt new file mode 100644 index 00000000000..e9dbe9f4ac1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeFileWithFunctionOverload/use.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useA() { + f(1) +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt new file mode 100644 index 00000000000..c31fc881e2b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt @@ -0,0 +1,3 @@ +package foo + +class A diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt.new new file mode 100644 index 00000000000..f1e47bf2be3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/A.kt.new @@ -0,0 +1,3 @@ +package foo + +class B diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log new file mode 100644 index 00000000000..5cba12d7339 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/FunsKt.class + out/production/module/other/OtherKt.class + out/production/module/use/UseAKt.class + out/production/module/use/UseBKt.class +End of files +Compiling files: + src/funs.kt + src/other.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/experimental-ic-build.log new file mode 100644 index 00000000000..7bbc0435dff --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/experimental-ic-build.log @@ -0,0 +1,27 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/foo/A.class +End of files +Compiling files: + src/A.kt +End of files +Marked as dirty by Kotlin: + src/funs.kt + src/useA.kt + src/useB.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/FunsKt.class + out/production/module/use/UseAKt.class + out/production/module/use/UseBKt.class +End of files +Compiling files: + src/funs.kt + src/useA.kt + src/useB.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/funs.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/funs.kt new file mode 100644 index 00000000000..fb3931989a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/funs.kt @@ -0,0 +1,4 @@ +package foo + +fun A(a: Int = 1) {} +fun B(a: Int = 1) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/other.kt new file mode 100644 index 00000000000..d3689e2ea8b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useA.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useA.kt new file mode 100644 index 00000000000..9f7e7f2a233 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useA.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useA() { + A() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useB.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useB.kt new file mode 100644 index 00000000000..cd47d4827ef --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameClass/useB.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useB() { + B() +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log new file mode 100644 index 00000000000..d2afe11fa1b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo2Kt.class +End of files +Compiling files: + src/foo3.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo0Kt.class + out/production/module/foo/Foo1Kt.class + out/production/module/other/OtherKt.class + out/production/module/use/UseFKt.class + out/production/module/use/UseGKt.class +End of files +Compiling files: + src/foo0.kt + src/foo1.kt + src/other.kt + src/useF.kt + src/useG.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/experimental-ic-build.log new file mode 100644 index 00000000000..398d83e3118 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/experimental-ic-build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo2Kt.class +End of files +Compiling files: + src/foo3.kt +End of files +Marked as dirty by Kotlin: + src/foo1.kt + src/useF.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/Foo1Kt.class + out/production/module/use/UseFKt.class +End of files +Compiling files: + src/foo1.kt + src/useF.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt new file mode 100644 index 00000000000..64145697fef --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo0.kt @@ -0,0 +1,3 @@ +package foo + +fun g(a: Any) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt new file mode 100644 index 00000000000..bd7697f4035 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo1.kt @@ -0,0 +1,3 @@ +package foo + +fun f(a: Any) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt new file mode 100644 index 00000000000..ac48e24c9e5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt @@ -0,0 +1,3 @@ +package foo + +fun f(a: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo2.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new new file mode 100644 index 00000000000..ac48e24c9e5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/foo3.kt.new @@ -0,0 +1,3 @@ +package foo + +fun f(a: Int) {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt new file mode 100644 index 00000000000..1d758703f95 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/other.kt @@ -0,0 +1,3 @@ +package other + +fun f() {} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt new file mode 100644 index 00000000000..d88a974a775 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useF.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useF() { + f(1) +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt new file mode 100644 index 00000000000..541bd66e55b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/renameFileWithFunctionOverload/useG.kt @@ -0,0 +1,7 @@ +package use + +import foo.* + +fun useG() { + g(1) +} diff --git a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log index 6188d73bf81..55facf81191 100644 --- a/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin/experimental-ic-build.log @@ -6,7 +6,9 @@ End of files Compiling files: src/TheClass.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + src/usageInKotlin.kt +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module From 6666fa1c772e0aa53a51176dcdba3841dbe05729 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 11 Apr 2016 21:50:21 +0300 Subject: [PATCH 0835/1557] Workaround for building against jars from both JDK 6 and JDK 8 on TeamCity Original commit: 0cf1c8d9006b8dac972865d1ecc133cae7ac9b9c --- .../kotlin/jps/bothJdkClasspathPatcher.kt | 47 +++++++++++++++++++ .../jps/build/AbstractIncrementalJpsTest.kt | 5 ++ .../build/AbstractKotlinJpsBuildTestCase.java | 5 ++ 3 files changed, 57 insertions(+) create mode 100644 jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt new file mode 100644 index 00000000000..b45e10ff664 --- /dev/null +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt @@ -0,0 +1,47 @@ +/* + * Copyright 2010-2016 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.kotlin.jps + +import org.jetbrains.jps.cmdline.ClasspathBootstrap +import java.lang.reflect.Field +import java.lang.reflect.Modifier + +fun disableJava6FileManager() { + val fileManagerClass = ClasspathBootstrap.getOptimizedFileManagerClass() + if (fileManagerClass?.simpleName == "OptimizedFileManager") { + // JPS tests depends on idea.jar and can't be executed under Java 1.6 anymore. But currently TeamCity merges classpath from all + // dependencies in a one big mess with no differences between JDK and non-JDK jars. Such behaviour causes both + // JDK 8 and JDK 6 classes present in classpath. Next there's ClasspathBootstrap.OptimizedFileManagerClassHolder in idea + // that works through reflection and tries to choose correct FileManager that are not the same in JDK 6 and JDK 8. Choosing + // FileManager for JDK 6 leads to exceptions on Runtime as classes from JDK 8 goes first on teamcity. + // + // Here we disable JDK 6 FileManager with brute force. + val clazz = Class.forName("org.jetbrains.jps.cmdline.ClasspathBootstrap\$OptimizedFileManagerClassHolder") + setFinalStaticToNull(clazz.getDeclaredField("managerClass")) + setFinalStaticToNull(clazz.getDeclaredField("directoryCacheClearMethod")) + } +} + +private fun setFinalStaticToNull(field: Field) { + field.isAccessible = true; + + val modifiersField = (Field::class.java).getDeclaredField("modifiers") + modifiersField.isAccessible = true + modifiersField.setInt(field, field.modifiers and Modifier.FINAL.inv()) + + field.set(null, null) +} diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 641dc532c0f..9f6d141a814 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -46,6 +46,7 @@ import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.testingUtils.* +import org.jetbrains.kotlin.jps.disableJava6FileManager import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageProvider import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import org.jetbrains.kotlin.jps.incremental.getKotlinCache @@ -65,6 +66,10 @@ abstract class AbstractIncrementalJpsTest( private val allowNoBuildLogFileInTestData: Boolean = false ) : JpsBuildTestCase() { companion object { + init { + disableJava6FileManager() + } + private val COMPILATION_FAILED = "COMPILATION FAILED" // change to "/tmp" or anything when default is too long (for easier debugging) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index ede371c900a..0d24ce77667 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -31,6 +31,7 @@ import org.jetbrains.jps.model.library.JpsTypedLibrary; import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.jps.BothJdkClasspathPatcherKt; import org.jetbrains.kotlin.utils.PathUtil; import java.io.File; @@ -40,6 +41,10 @@ import java.util.Collection; public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { public static final String TEST_DATA_PATH = "jps-plugin/testData/"; + static { + BothJdkClasspathPatcherKt.disableJava6FileManager(); + } + protected File workDir; @Override From f1fcde76706d7b57452f7e7aab29cda321bf2377 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 18 Apr 2016 13:47:06 +0300 Subject: [PATCH 0836/1557] Do not store project in JPS tests after they're executed This saves a couple dozen megabytes currently Original commit: 2df8e56b94d74768687e5179baf3efd77ce55a57 --- .../jps/build/AbstractIncrementalJpsTest.kt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 9f6d141a814..30183d7a1fc 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -58,7 +58,7 @@ import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream import java.util.* -import kotlin.properties.Delegates +import kotlin.reflect.jvm.javaField abstract class AbstractIncrementalJpsTest( private val allowNoFilesWithSuffixInTestData: Boolean = false, @@ -80,13 +80,10 @@ abstract class AbstractIncrementalJpsTest( protected open val enableExperimentalIncrementalCompilation = false - protected var testDataDir: File by Delegates.notNull() - - protected var workDir: File by Delegates.notNull() - - protected var projectDescriptor: ProjectDescriptor by Delegates.notNull() - - protected var lookupsDuringTest: MutableSet by Delegates.notNull() + protected lateinit var testDataDir: File + protected lateinit var workDir: File + protected lateinit var projectDescriptor: ProjectDescriptor + protected lateinit var lookupsDuringTest: MutableSet protected var mapWorkingToOriginalFile: MutableMap = hashMapOf() @@ -105,7 +102,7 @@ abstract class AbstractIncrementalJpsTest( Logger.getRootLogger().addAppender(console) } - private val systemPropertiesBackup = run { + private var systemPropertiesBackup = run { val props = System.getProperties() val output = ByteArrayOutputStream() props.store(output, "System properties backup") @@ -132,6 +129,10 @@ abstract class AbstractIncrementalJpsTest( override fun tearDown() { restoreSystemProperties() + (AbstractIncrementalJpsTest::myProject).javaField!![this] = null + (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null + (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null + lookupsDuringTest.clear() super.tearDown() } From de7c790c1dbfbd4786c62fb72b4cc46510cf0f6d Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 21 Apr 2016 12:49:00 +0300 Subject: [PATCH 0837/1557] Use fq-names instead of descriptors when computing ambigious names Because there can be different descriptors that are essentially equal (from different modules) See J2K test: testNullableField Original commit: a1d4214a39fc0fe9f238966d7637b1bb8bc0ee0c --- .../pureKotlin/conflictingPlatformDeclarations/build.log | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log index c3d008be68b..6c49ba3e152 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/conflictingPlatformDeclarations/build.log @@ -12,8 +12,8 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: List): kotlin.Unit - fun function(list: List): kotlin.Unit + fun function(list: List): Unit + fun function(list: List): Unit Platform declaration clash: The following declarations have the same JVM signature (function(Ljava/util/List;)V): - fun function(list: List): kotlin.Unit - fun function(list: List): kotlin.Unit \ No newline at end of file + fun function(list: List): Unit + fun function(list: List): Unit \ No newline at end of file From 38e2b1c91ef6f06bee2bc7a7fcdcd51bc5cc539c Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Tue, 26 Apr 2016 23:30:42 +0300 Subject: [PATCH 0838/1557] Code cleanup: removed redundant semicolons Original commit: b551886889e82a4558aa5c366e693151ae3715ae --- .../org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt | 2 +- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 8 ++++---- .../kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 2 +- .../kotlin/jps/incremental/AbstractProtoComparisonTest.kt | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt index b45e10ff664..a27fba5990b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/bothJdkClasspathPatcher.kt @@ -37,7 +37,7 @@ fun disableJava6FileManager() { } private fun setFinalStaticToNull(field: Field) { - field.isAccessible = true; + field.isAccessible = true val modifiersField = (Field::class.java).getDeclaredField("modifiers") modifiersField.isAccessible = true diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 30183d7a1fc..78b37df8d93 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -96,7 +96,7 @@ abstract class AbstractIncrementalJpsTest( TestLoggerFactory.enableDebugLogging(myTestRootDisposable, "#org") val console = ConsoleAppender() - console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n"); + console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n") console.threshold = Level.ALL console.activateOptions() Logger.getRootLogger().addAppender(console) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index f848d7a9dbe..3f69c28f4cd 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -650,16 +650,16 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { val buildResult = BuildResult() val canceledStatus = object: CanceledStatus { - var checkFromIndex = 0; + var checkFromIndex = 0 override fun isCanceled(): Boolean { val messages = buildResult.getMessages(BuildMessage.Kind.INFO) for (i in checkFromIndex..messages.size - 1) { - if (messages.get(i).messageText.startsWith("Kotlin JPS plugin version")) return true; + if (messages.get(i).messageText.startsWith("Kotlin JPS plugin version")) return true } - checkFromIndex = messages.size; - return false; + checkFromIndex = messages.size + return false } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 23b1d45e2ff..124f60f8d93 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -69,7 +69,7 @@ class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { System.setProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "") System.setProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "") // spaces in the name to test proper file name handling - val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running"); + val flagFile = File.createTempFile("kotlin-jps - tests-", "-is-running") val logFile = File.createTempFile("kotlin-daemon", ".log") System.setProperty(COMPILE_DAEMON_CLIENT_ALIVE_PATH_PROPERTY, flagFile.absolutePath) System.setProperty(COMPILE_DAEMON_LOG_PATH_PROPERTY, logFile.loggerCompatiblePath) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 9cf233a9f79..8b7afbd6796 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -62,7 +62,7 @@ abstract class AbstractProtoComparisonTest : UsefulTestCase() { p.printDifference(oldClassMap[name]!!, newClassMap[name]!!) } - KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()); + KotlinTestUtils.assertEqualsToFile(File(testDataPath + File.separator + "result.out"), sb.toString()) } private fun compileFileAndGetClasses(testPath: String, testDir: File, prefix: String): List { From 03cb2f04fd8c60d3beabed3fbf2f398dffb90947 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 28 Apr 2016 22:47:42 +0300 Subject: [PATCH 0839/1557] Fix NoSuchMethodError when try to access in test to internal member from production for gradle projects imported into IDEA 16 or higher #KT-11993 Fixed Original commit: ed0fa2c26cd11b01c9a8fcc2c34b460e7b19387d --- .../build/KotlinBuilderModuleScriptGenerator.kt | 12 +++++++----- .../org/jetbrains/kotlin/modules/modulesUtil.kt | 17 ++++++++++++++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt index e4089a34907..500d7c50ecb 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilderModuleScriptGenerator.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -32,6 +32,7 @@ import org.jetbrains.kotlin.build.JvmSourceRoot import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.jps.build.JpsUtils.getAllDependencies import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder +import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.alwaysNull import java.io.File @@ -42,7 +43,7 @@ object KotlinBuilderModuleScriptGenerator { // TODO used reflection to be compatible with IDEA from both 143 and 144 branches, // TODO switch to directly using when "since-build" will be >= 144.3357.4 - private val getRelatedProductionModule: (JpsModule) -> JpsModule? = run { + internal val getRelatedProductionModule: (JpsModule) -> JpsModule? = run { val klass = try { Class.forName("org.jetbrains.jps.model.module.JpsTestModuleProperties") @@ -105,14 +106,15 @@ object KotlinBuilderModuleScriptGenerator { val targetType = target.targetType assert(targetType is JavaModuleBuildTargetType) + val targetId = TargetId(target) builder.addModule( - target.id, + targetId.name, outputDir.absolutePath, moduleSources, findSourceRoots(context, target), findClassPathRoots(target), - (targetType as JavaModuleBuildTargetType).typeId, - targetType.isTests, + targetId.type, + (targetType as JavaModuleBuildTargetType).isTests, // this excludes the output directories from the class path, to be removed for true incremental compilation outputDirs, friendDirs) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt index af1d570f297..3ada1c1c624 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/modules/modulesUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -17,6 +17,17 @@ package org.jetbrains.kotlin.modules import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.kotlin.jps.build.KotlinBuilderModuleScriptGenerator.getRelatedProductionModule -fun TargetId(moduleBuildTarget: ModuleBuildTarget): TargetId = - TargetId(moduleBuildTarget.id, moduleBuildTarget.targetType.typeId) +fun TargetId(moduleBuildTarget: ModuleBuildTarget): TargetId { + // Since IDEA 2016 each gradle source root is imported as a separate module. + // One gradle module X is imported as two JPS modules: + // 1. X-production with one production target; + // 2. X-test with one test target. + // This breaks kotlin code since internal members' names are mangled using module name. + // For example, a declaration of a function 'f' in 'X-production' becomes 'fXProduction', but a call 'f' in 'X-test' becomes 'fXTest()'. + // The workaround is to replace a name of such test target with the name of corresponding production module. + // See KT-11993. + val name = getRelatedProductionModule(moduleBuildTarget.module)?.name ?: moduleBuildTarget.id + return TargetId(name, moduleBuildTarget.targetType.typeId) +} From 26ed20a54b33dbe1c91744ac422e06366a131190 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 4 May 2016 22:41:07 +0300 Subject: [PATCH 0840/1557] Minor: add test for KT-11993 "NoSuchMethodError when testing internal symbols" Original commit: c11d504a26cbffd151b0b65e3abcfd93a8332b19 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 12 ++++++- .../kotlinProject.ipr | 32 +++++++++++++++++++ .../module1/module1.iml | 13 ++++++++ .../module1/src/foo.kt | 23 +++++++++++++ .../module2/module2.iml | 15 +++++++++ .../module2/test/bar.kt | 26 +++++++++++++++ 6 files changed, 120 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module1/module1.iml create mode 100644 jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module1/src/foo.kt create mode 100644 jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module2/module2.iml create mode 100644 jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module2/test/bar.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 3f69c28f4cd..024e486c2bb 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -54,6 +54,7 @@ import org.jetbrains.org.objectweb.asm.MethodVisitor import org.jetbrains.org.objectweb.asm.Opcodes import org.junit.Assert import java.io.* +import java.net.URLClassLoader import java.util.* import java.util.regex.Pattern import java.util.zip.ZipOutputStream @@ -532,6 +533,15 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { result.checkErrors() } + fun testInternalFromSpecialRelatedModule() { + initProject() + makeAll().assertSuccessful() + + val classpath = listOf("out/production/module1", "out/test/module2").map { File(workDir, it).toURI().toURL() }.toTypedArray() + val clazz = URLClassLoader(classpath).loadClass("test2.BarKt") + clazz.getMethod("box").invoke(null) + } + fun testCircularDependenciesInternalFromAnotherModule() { initProject() val result = makeAll() diff --git a/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/kotlinProject.ipr b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/kotlinProject.ipr new file mode 100644 index 00000000000..c1a403dd047 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/kotlinProject.ipr @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module1/module1.iml b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module1/module1.iml new file mode 100644 index 00000000000..3b1ba79ed61 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module1/module1.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module1/src/foo.kt b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module1/src/foo.kt new file mode 100644 index 00000000000..05a686274b7 --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module1/src/foo.kt @@ -0,0 +1,23 @@ +package test1 + +@Target(AnnotationTarget.FILE) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalFileAnnotation1() + +@Target(AnnotationTarget.CLASS) +@Retention(AnnotationRetention.SOURCE) +internal annotation class InternalClassAnnotation1() + +internal open class InternalClass1 + +abstract class ClassA1(internal val member: Int) + +abstract class ClassB1 { + internal abstract val member: Int + internal fun func() = 1 +} + +internal val internalProp = 1 + +internal fun internalFun() {} + diff --git a/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module2/module2.iml b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module2/module2.iml new file mode 100644 index 00000000000..427f7bce96f --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module2/module2.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module2/test/bar.kt b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module2/test/bar.kt new file mode 100644 index 00000000000..773dbd3ef8e --- /dev/null +++ b/jps/jps-plugin/testData/general/InternalFromSpecialRelatedModule/module2/test/bar.kt @@ -0,0 +1,26 @@ +// TODO uncomment annotations when KT-12199 will be fixed + +//@file:InternalFileAnnotation1 + +package test2 + +import test1.* + +internal class FromInternalClass1: InternalClass1() + +//@InternalClassAnnotation +class FromClassA1 : ClassA1(10) + +class FromClassB1 : ClassB1() { + internal override val member = 10 +} + +fun box() { + internalProp + internalFun() + + InternalClass1() + FromClassA1().member + FromClassB1().member + FromClassB1().func() +} From b637dbf6c23ad9a31ad6435e87445af9123fe575 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Tue, 26 Apr 2016 08:53:30 +0200 Subject: [PATCH 0841/1557] Implement graceful connection failure behavior on daemon connect and cancellation check Should fix (or actually - behave gracefully on) #EA-74003, #EA-74493, #EA-76032, #EA-76529, #EA-81295 Tests added Original commit: 1614aca48e299eca3609d0982903d717c828b8f7 --- .../compilerRunner/KotlinCompilerRunner.kt | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 6ea568067ad..a65d1cdeee1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -38,9 +38,11 @@ import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.progress.CompilationCanceledStatus +import org.jetbrains.kotlin.utils.rethrow import java.io.* import java.lang.reflect.Field import java.lang.reflect.Modifier +import java.rmi.ConnectException import java.util.* import java.util.concurrent.TimeUnit @@ -180,7 +182,8 @@ object KotlinCompilerRunner { argsArray: Array, environment: CompilerEnvironment, messageCollector: MessageCollector, - collector: OutputItemsCollector): Boolean { + collector: OutputItemsCollector, + retryOnConnectionError: Boolean = true): Boolean { if (isDaemonEnabled()) { @@ -202,7 +205,25 @@ object KotlinCompilerRunner { K2JS_COMPILER -> CompileService.TargetPlatform.JS else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName") } - val res = KotlinCompilerClient.incrementalCompile(connection.daemon, connection.sessionId, targetPlatform, argsArray, services, compilerOut, daemonOut) + + fun retryOrFalse(e: Exception): Boolean { + if (retryOnConnectionError) { + KotlinBuilder.LOG.debug("retrying once on daemon connection error: ${e.message}") + return tryCompileWithDaemon(compilerClassName, argsArray, environment, messageCollector, collector, retryOnConnectionError = false) + } + KotlinBuilder.LOG.info("daemon connection error: ${e.message}") + return false + } + + val res: Int = try { + KotlinCompilerClient.incrementalCompile(connection.daemon, connection.sessionId, targetPlatform, argsArray, services, compilerOut, daemonOut) + } + catch (e: java.rmi.ConnectException) { + return retryOrFalse(e) + } + catch (e: java.rmi.UnmarshalException) { + return retryOrFalse(e) + } processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) BufferedReader(StringReader(daemonOut.toString())).forEachLine { From cfb2a41ad2554bfe226e7d45949daf4f61e18e55 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 14 Feb 2016 18:01:39 +0300 Subject: [PATCH 0842/1557] Add MessageCollector#hasErrors, get rid of MessageSeverityCollector Also fix duplicated wrapping of a message collector into a message severity collector (in CLICompiler and in the beginning of doExecute in K2JVMCompiler/K2JSCompiler) Original commit: 3c81bb4bfcb0829ce9530f3399d4b08ef16c0f70 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 105dee96734..5edbe429833 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -689,8 +689,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { + private var hasErrors = false override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation) { + hasErrors = hasErrors or severity.isError var prefix = "" if (severity == EXCEPTION) { prefix = INTERNAL_ERROR_PREFIX @@ -705,6 +707,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { )) } + override fun hasErrors(): Boolean = hasErrors + private fun renderLocationIfNeeded(location: CompilerMessageLocation): String { if (location == CompilerMessageLocation.NO_LOCATION) return "" From 720c6791840ca04f98c762c74678f81ad655cdfa Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Wed, 18 May 2016 12:31:26 +0300 Subject: [PATCH 0843/1557] Introduce coroutine-related API into built-ins Original commit: e97376bb2cbf801a4af5f4d31d5c696b6f86876d --- .../lookupTracker/classifierMembers/foo.kt | 10 ++++----- .../lookupTracker/classifierMembers/usages.kt | 18 +++++++-------- .../conventions/delegateProperty.kt | 4 ++-- .../conventions/mathematicalLike.kt | 8 +++---- .../expressionType/inferredType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 +++++++++---------- .../lookupTracker/packageDeclarations/foo1.kt | 6 ++--- .../syntheticProperties/usages.kt | 14 ++++++------ 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 6b3b664e10e..cdd7fd5d862 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 4e17f29efae..4a4b3b6194c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo c:foo.A(O)*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vara() + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/foo - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/bar() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/foo + /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 9d1ba767cff..2ea6f5978c0 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,8 +20,8 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() /*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() /*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index de63e2b99ca..e2c0c6fbbfa 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.coroutines(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.coroutines(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.collections(times) p:kotlin.coroutines(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.collections(div) p:kotlin.coroutines(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index fb15d1dc4f4..e868c37a806 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -6,8 +6,8 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) /*p:foo*/fun useListOfA(a: /*p:foo*/List) {} /*p:foo*/fun useListOfB(b: /*p:foo*/List) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index b9495b2c69a..5684b9d30d2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -11,27 +11,27 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/IS() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/F - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/F + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index ce3b7606f8f..a6febbc6d6a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,7 +4,7 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:baz(B)*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ /*p:foo p:bar(A)*/a @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/MyClass() + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 49a068b5e1c..a0b0b2900d2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = /*p:foo*/KotlinClass() /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/setFoo(2) + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/setFoo(2) /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/boo = /*p:kotlin(Int)*/2 + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/boo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 } From f5b81b7935474c3ffdaff1d208a0c4c24be9eb8f Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 30 May 2016 14:35:54 +0300 Subject: [PATCH 0844/1557] Preserve sources properly for coroutine parts Otherwise incremental reporting leads to exception when inlining into coroutine body happens Original commit: 07592398c17451f8a47d4a09c0b3a01c1958ac70 --- ...perimentalIncrementalJpsTestGenerated.java | 6 +++++ .../build/IncrementalJpsTestGenerated.java | 6 +++++ .../inlineFunCallSite/coroutine/build.log | 24 +++++++++++++++++++ .../inlineFunCallSite/coroutine/inline.kt | 5 ++++ .../inlineFunCallSite/coroutine/inline.kt.new | 5 ++++ .../inlineFunCallSite/coroutine/usage.kt | 18 ++++++++++++++ 6 files changed, 64 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index c88cb6cc955..4daade82888 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1124,6 +1124,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("coroutine") + public void testCoroutine() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/coroutine/"); + doTest(fileName); + } + @TestMetadata("function") public void testFunction() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 23aba42cd33..bcc80c08637 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -1124,6 +1124,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("coroutine") + public void testCoroutine() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/coroutine/"); + doTest(fileName); + } + @TestMetadata("function") public void testFunction() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log new file mode 100644 index 00000000000..c8c6fee67d7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/Controller.class + out/production/module/usage/UsageKt$bar$1.class + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt new file mode 100644 index 00000000000..9c46b1383d6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(x: Int): Int { + return x - 1 +} diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new new file mode 100644 index 00000000000..7c3b34f3b5d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(x: Int): Int { + return x + 1 +} diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt new file mode 100644 index 00000000000..ed10ee21c2d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt @@ -0,0 +1,18 @@ +package usage + +fun async(coroutine x: Controller.() -> Continuation) { + x(Controller()).resume(Unit) +} + +class Controller { + suspend fun step(param: Int, next: Continuation) { + next.resume(param + 1) + } +} + +fun bar() { + async { + val result = step(1) + inline.f(result) + } +} From 7e1baf1a6931cfd7d5c916591fbb4db68f327d45 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Tue, 14 Jun 2016 21:09:42 +0300 Subject: [PATCH 0845/1557] JPS: don't consider that production target of module "B" is depends on test target of module "A" when "B" depends on "A" #KT-12595 Fixed Original commit: 0e428ca10cb92923ea177b0773d00a56e16c3de5 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 62 ++++++++++++++++++- .../kotlin/jps/build/KotlinBuilder.kt | 9 +-- .../general/GetDependentTargets/expected.txt | 42 +++++++++++++ .../general/GetDependentTargets/src/foo.kt | 3 + .../general/GetDependentTargets/test/test.kt | 3 + 5 files changed, 112 insertions(+), 7 deletions(-) create mode 100644 jps/jps-plugin/testData/general/GetDependentTargets/expected.txt create mode 100644 jps/jps-plugin/testData/general/GetDependentTargets/src/foo.kt create mode 100644 jps/jps-plugin/testData/general/GetDependentTargets/test/test.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 024e486c2bb..fa258d46e30 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -26,6 +26,7 @@ import com.intellij.testFramework.UsefulTestCase import com.intellij.util.ArrayUtil import com.intellij.util.containers.ContainerUtil import com.intellij.util.io.ZipUtil +import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.BuildResult import org.jetbrains.jps.builders.CompileScopeTestBuilder @@ -33,16 +34,23 @@ import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.builders.TestProjectBuilderLogger import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import org.jetbrains.jps.builders.logging.BuildLoggingManager +import org.jetbrains.jps.cmdline.ProjectDescriptor import org.jetbrains.jps.incremental.BuilderRegistry +import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.incremental.IncProjectBuilder +import org.jetbrains.jps.incremental.ModuleLevelBuilder import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage +import org.jetbrains.jps.model.JpsModuleRootModificationUtil +import org.jetbrains.jps.model.java.JavaSourceRootType import org.jetbrains.jps.model.java.JpsJavaDependencyScope import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil +import org.jetbrains.kotlin.incremental.CacheVersion +import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils @@ -754,18 +762,66 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { doTest() } + fun testGetDependentTargets() { + fun addModuleWithSourceAndTestRoot(name: String): JpsModule { + return addModule(name, "src/").apply { + contentRootsList.addUrl(JpsPathUtil.pathToUrl("test/")) + addSourceRoot(JpsPathUtil.pathToUrl("test/"), JavaSourceRootType.TEST_SOURCE) + } + } + + val a = addModuleWithSourceAndTestRoot("a") + val b = addModuleWithSourceAndTestRoot("b") + val c = addModuleWithSourceAndTestRoot("c") + val b2 = addModuleWithSourceAndTestRoot("b2") + val c2 = addModuleWithSourceAndTestRoot("c2") + + JpsModuleRootModificationUtil.addDependency(b, a, JpsJavaDependencyScope.COMPILE, /*exported =*/ true) + JpsModuleRootModificationUtil.addDependency(c, b, JpsJavaDependencyScope.COMPILE, /*exported =*/ false) + JpsModuleRootModificationUtil.addDependency(b2, a, JpsJavaDependencyScope.COMPILE, /*exported =*/ false) + JpsModuleRootModificationUtil.addDependency(c2, b2, JpsJavaDependencyScope.COMPILE, /*exported =*/ false) + + val actual = StringBuilder() + buildCustom(CanceledStatus.NULL, TestProjectBuilderLogger(), BuildResult()) { + project.setTestingContext(TestingContext(LookupTracker.DO_NOTHING, object: BuildLogger { + override fun buildStarted(context: CompileContext, chunk: ModuleChunk) { + actual.append("Targets dependent on ${chunk.targets.joinToString() }:\n") + actual.append(getDependentTargets(chunk, context).map { it.toString() }.sorted().joinToString("\n")) + actual.append("\n---------\n") + } + + override fun actionsOnCacheVersionChanged(actions: List) {} + override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) {} + override fun markedAsDirty(files: Iterable) {} + })) + } + + val expectedFile = File(getCurrentTestDataRoot(), "expected.txt") + + KotlinTestUtils.assertEqualsToFile(expectedFile, actual.toString()) + } + private fun BuildResult.checkErrors() { val actualErrors = getMessages(BuildMessage.Kind.ERROR) .map { it as CompilerMessage } .map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n") - val projectRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) - val expectedFile = File(projectRoot, "errors.txt") + val expectedFile = File(getCurrentTestDataRoot(), "errors.txt") KotlinTestUtils.assertEqualsToFile(expectedFile, actualErrors) } - private fun buildCustom(canceledStatus: CanceledStatus, logger: TestProjectBuilderLogger,buildResult: BuildResult) { + private fun getCurrentTestDataRoot() = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) + + private fun buildCustom( + canceledStatus: CanceledStatus, + logger: TestProjectBuilderLogger, + buildResult: BuildResult, + setupProject: ProjectDescriptor.() -> Unit = {} + ) { val scopeBuilder = CompileScopeTestBuilder.make().all() val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger)) + + descriptor.setupProject() + try { val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), this.myBuildParams, canceledStatus, null, true) builder.addMessageHandler(buildResult) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 5edbe429833..558f82c70ba 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -142,7 +142,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val actualExitCode = if (proposedExitCode == OK && fsOperations.hasMarkedDirty) ADDITIONAL_PASS_REQUIRED else proposedExitCode - LOG.info("Build result: " + actualExitCode) + LOG.debug("Build result: " + actualExitCode) context.testingContext?.buildLogger?.buildFinished(actualExitCode) @@ -820,14 +820,15 @@ private fun getIncrementalCaches(chunk: ModuleChunk, context: CompileContext): M return chunkCaches } -private fun getDependentTargets( +fun getDependentTargets( compilingChunk: ModuleChunk, context: CompileContext ): Set { - val classpathKind = JpsJavaClasspathKind.compile(compilingChunk.targets.any { it.isTests }) + val compilingChunkIsTests = compilingChunk.targets.any { it.isTests } + val classpathKind = JpsJavaClasspathKind.compile(compilingChunkIsTests) fun dependsOnCompilingChunk(target: BuildTarget<*>): Boolean { - if (target !is ModuleBuildTarget) return false + if (target !is ModuleBuildTarget || compilingChunkIsTests && !target.isTests) return false val dependencies = getDependenciesRecursively(target.module, classpathKind) return ContainerUtil.intersects(dependencies, compilingChunk.modules) diff --git a/jps/jps-plugin/testData/general/GetDependentTargets/expected.txt b/jps/jps-plugin/testData/general/GetDependentTargets/expected.txt new file mode 100644 index 00000000000..19377f83f9f --- /dev/null +++ b/jps/jps-plugin/testData/general/GetDependentTargets/expected.txt @@ -0,0 +1,42 @@ +Targets dependent on Module 'a' production: +Module 'a' tests +Module 'b' production +Module 'b' tests +Module 'b2' production +Module 'b2' tests +Module 'c' production +Module 'c' tests +--------- +Targets dependent on Module 'a' tests: +Module 'b' tests +Module 'b2' tests +Module 'c' tests +--------- +Targets dependent on Module 'b2' production: +Module 'b2' tests +Module 'c2' production +Module 'c2' tests +--------- +Targets dependent on Module 'b2' tests: +Module 'c2' tests +--------- +Targets dependent on Module 'c2' production: +Module 'c2' tests +--------- +Targets dependent on Module 'c2' tests: + +--------- +Targets dependent on Module 'b' production: +Module 'b' tests +Module 'c' production +Module 'c' tests +--------- +Targets dependent on Module 'b' tests: +Module 'c' tests +--------- +Targets dependent on Module 'c' production: +Module 'c' tests +--------- +Targets dependent on Module 'c' tests: + +--------- diff --git a/jps/jps-plugin/testData/general/GetDependentTargets/src/foo.kt b/jps/jps-plugin/testData/general/GetDependentTargets/src/foo.kt new file mode 100644 index 00000000000..a2c4e958bb5 --- /dev/null +++ b/jps/jps-plugin/testData/general/GetDependentTargets/src/foo.kt @@ -0,0 +1,3 @@ +fun foo() { + +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/GetDependentTargets/test/test.kt b/jps/jps-plugin/testData/general/GetDependentTargets/test/test.kt new file mode 100644 index 00000000000..839220d1002 --- /dev/null +++ b/jps/jps-plugin/testData/general/GetDependentTargets/test/test.kt @@ -0,0 +1,3 @@ +fun test() { + +} From babb4ddf878c98a63208d837ac8431e2f7c3bb43 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Thu, 23 Jun 2016 16:40:00 +0300 Subject: [PATCH 0846/1557] Inline properties support in incremental compilation Original commit: a09013358194d2540a10c19aa323195984acae20 --- ...perimentalIncrementalJpsTestGenerated.java | 48 +++++++++++++++++++ .../build/IncrementalJpsTestGenerated.java | 48 +++++++++++++++++++ .../inlineClassValProperty/Usage.kt | 5 ++ .../inlineClassValProperty/build.log | 20 ++++++++ .../inlineClassValProperty/inline.kt | 6 +++ .../inlineClassValProperty/inline.kt.new | 6 +++ .../inlineClassVarProperty/build.log | 21 ++++++++ .../inlineClassVarProperty/inline.kt | 9 ++++ .../inlineClassVarProperty/inline.kt.new | 9 ++++ .../inlineClassVarProperty/usage.kt | 5 ++ .../inlineClassVarProperty/usageNotChanged.kt | 5 ++ .../build.log | 22 +++++++++ .../inline.kt | 3 ++ .../inline.kt.new | 3 ++ .../usage.kt | 3 ++ .../inlineTopLevelValProperty/build.log | 22 +++++++++ .../inlineTopLevelValProperty/inline.kt | 4 ++ .../inlineTopLevelValProperty/inline.kt.new | 4 ++ .../inlineTopLevelValProperty/usage.kt | 3 ++ .../build.log | 22 +++++++++ .../inline.kt | 4 ++ .../inline.kt.new | 4 ++ .../usage.kt | 3 ++ .../inlineTopLevelVarProperty/build.log | 22 +++++++++ .../inlineTopLevelVarProperty/inline.kt | 5 ++ .../inlineTopLevelVarProperty/inline.kt.new | 5 ++ .../inlineTopLevelVarProperty/usage.kt | 5 ++ .../usageNotChanged.kt | 5 ++ .../topLevelFunctionWithJvmName/build.log | 20 ++++++++ .../experimental-ic-build.log | 22 +++++++++ .../topLevelFunctionWithJvmName/function.kt | 3 ++ .../function.kt.new | 3 ++ .../topLevelFunctionWithJvmName/usage.kt | 3 ++ .../topLevelPropertyWithJvmName/build.log | 20 ++++++++ .../experimental-ic-build.log | 22 +++++++++ .../topLevelPropertyWithJvmName/property.kt | 4 ++ .../property.kt.new | 4 ++ .../topLevelPropertyWithJvmName/usage.kt | 3 ++ 38 files changed, 425 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usageNotChanged.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usageNotChanged.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 4daade82888..c8b4fab5886 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -443,6 +443,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("inlineClassValProperty") + public void testInlineClassValProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/"); + doTest(fileName); + } + + @TestMetadata("inlineClassVarProperty") + public void testInlineClassVarProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); @@ -479,6 +491,30 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("inlineTopLevelFunctionWithJvmName") + public void testInlineTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValProperty") + public void testInlineTopLevelValProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValPropertyWithJvmName") + public void testInlineTopLevelValPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelVarProperty") + public void testInlineTopLevelVarProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); @@ -845,6 +881,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("topLevelFunctionWithJvmName") + public void testTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/"); + doTest(fileName); + } + @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); @@ -857,6 +899,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("topLevelPropertyWithJvmName") + public void testTopLevelPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/"); + doTest(fileName); + } + @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index bcc80c08637..cd72810ef37 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -443,6 +443,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineClassValProperty") + public void testInlineClassValProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/"); + doTest(fileName); + } + + @TestMetadata("inlineClassVarProperty") + public void testInlineClassVarProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); @@ -479,6 +491,30 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineTopLevelFunctionWithJvmName") + public void testInlineTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValProperty") + public void testInlineTopLevelValProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValPropertyWithJvmName") + public void testInlineTopLevelValPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelVarProperty") + public void testInlineTopLevelVarProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); @@ -845,6 +881,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("topLevelFunctionWithJvmName") + public void testTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/"); + doTest(fileName); + } + @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); @@ -857,6 +899,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("topLevelPropertyWithJvmName") + public void testTopLevelPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/"); + doTest(fileName); + } + @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/Usage.kt new file mode 100644 index 00000000000..dc4eb09fea5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/Usage.kt @@ -0,0 +1,5 @@ +package usage + +class Usage { + val x = inline.A().f +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/build.log new file mode 100644 index 00000000000..eb7f0e8375e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/inline/A.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/usage/Usage.class +End of files +Compiling files: + src/Usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt new file mode 100644 index 00000000000..bdf6a30ec34 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt @@ -0,0 +1,6 @@ +package inline + +class A { + inline val f: Int + get() = 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt.new new file mode 100644 index 00000000000..e3476a57ae1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt.new @@ -0,0 +1,6 @@ +package inline + +class A { + inline val f: Int + get() = 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/build.log new file mode 100644 index 00000000000..12ab1564d06 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/build.log @@ -0,0 +1,21 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/inline/A.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt new file mode 100644 index 00000000000..f5e8fa6a4b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt @@ -0,0 +1,9 @@ +package inline + +class A { + inline var f: Int + get() = 0 + set(p: Int) { + 0 + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new new file mode 100644 index 00000000000..05b3f2c0365 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new @@ -0,0 +1,9 @@ +package inline + +class A { + inline var f: Int + get() = 0 + set(p: Int) { + 1 + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usage.kt new file mode 100644 index 00000000000..131c1a19732 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun a() { + inline.A().f = 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usageNotChanged.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usageNotChanged.kt new file mode 100644 index 00000000000..1043725e397 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usageNotChanged.kt @@ -0,0 +1,5 @@ +package usage2 + +fun b() { + inline.A().f +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log new file mode 100644 index 00000000000..98c5e9ece93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt new file mode 100644 index 00000000000..dbc194da3a1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt @@ -0,0 +1,3 @@ +package inline + + @JvmName("test") inline fun g() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new new file mode 100644 index 00000000000..a7cdecaf3fb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new @@ -0,0 +1,3 @@ +package inline + +@JvmName("test") inline fun g() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt new file mode 100644 index 00000000000..abd575668fd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.g() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/build.log new file mode 100644 index 00000000000..98c5e9ece93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt new file mode 100644 index 00000000000..511d4f1d576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt @@ -0,0 +1,4 @@ +package inline + +inline val f: Int + get() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt.new new file mode 100644 index 00000000000..033295b3f34 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt.new @@ -0,0 +1,4 @@ +package inline + +inline val f: Int + get() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/usage.kt new file mode 100644 index 00000000000..b11c96eea3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.f \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log new file mode 100644 index 00000000000..98c5e9ece93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt new file mode 100644 index 00000000000..ced1160f719 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt @@ -0,0 +1,4 @@ +package inline + +inline val f: Int + @JvmName("getG") get() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new new file mode 100644 index 00000000000..7fe7e429c94 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new @@ -0,0 +1,4 @@ +package inline + +inline val f: Int + @JvmName("getG") get() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt new file mode 100644 index 00000000000..b11c96eea3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.f \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log new file mode 100644 index 00000000000..98c5e9ece93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt new file mode 100644 index 00000000000..e345852dbb9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline var f: Int + get() = 0 + set(p: Int) {0} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new new file mode 100644 index 00000000000..bf8d995196a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline var f: Int + get() = 0 + set(p: Int) { 1 } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usage.kt new file mode 100644 index 00000000000..8f373aa1881 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun a() { + inline.f = 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usageNotChanged.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usageNotChanged.kt new file mode 100644 index 00000000000..418b02b95f0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usageNotChanged.kt @@ -0,0 +1,5 @@ +package usage2 + +fun b() { + inline.f +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log new file mode 100644 index 00000000000..1462c579df1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/FunctionKt.class +End of files +Compiling files: + src/function.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log new file mode 100644 index 00000000000..cce51e9e605 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/FunctionKt.class +End of files +Compiling files: + src/function.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt new file mode 100644 index 00000000000..b548d641698 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt @@ -0,0 +1,3 @@ +package inline + +@JvmName("oldName") fun g() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new new file mode 100644 index 00000000000..1f04d228c28 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new @@ -0,0 +1,3 @@ +package inline + +@JvmName("newName") fun g() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt new file mode 100644 index 00000000000..abd575668fd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.g() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log new file mode 100644 index 00000000000..980c6527681 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/PropertyKt.class +End of files +Compiling files: + src/property.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log new file mode 100644 index 00000000000..c9ee99392d6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/PropertyKt.class +End of files +Compiling files: + src/property.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt new file mode 100644 index 00000000000..da702f5f509 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt @@ -0,0 +1,4 @@ +package test + +val g: Int + @JvmName("oldName") get() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new new file mode 100644 index 00000000000..39bbfb29c7e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new @@ -0,0 +1,4 @@ +package test + +val g: Int + @JvmName("newName") get() = 0 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt new file mode 100644 index 00000000000..06dfeea7c86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = test.g \ No newline at end of file From fc54e12f271176abfe720af4eca93ca7c566bec5 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Mon, 25 Apr 2016 13:40:52 +0300 Subject: [PATCH 0847/1557] KT-3008 Fix CLI and JPS tests related to JS translator Original commit: a9ed789727fd70f1bb7fb1dd672de3d960ee6a3c --- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index fa258d46e30..157a2ff444d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -82,20 +82,20 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { "$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "lib/kotlin.js", - "lib/stdlib.meta.js" + "lib/kotlin.meta.js" ) private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = hashSetOf( "$ADDITIONAL_MODULE_NAME.js", "$ADDITIONAL_MODULE_NAME.meta.js", "lib/kotlin.js", - "lib/stdlib.meta.js" + "lib/kotlin.meta.js" ) private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js") private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf( "$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "lib/kotlin.js", - "lib/stdlib.meta.js", + "lib/kotlin.meta.js", "lib/jslib-example.js", "lib/file0.js", "lib/dir/file1.js", @@ -107,7 +107,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { "$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "custom/kotlin.js", - "custom/stdlib.meta.js", + "custom/kotlin.meta.js", "custom/jslib-example.js", "custom/file0.js", "custom/dir/file1.js", From 993493dcc4367d06568b86abe40bef8f3037d56c Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 28 Jun 2016 13:00:35 +0300 Subject: [PATCH 0848/1557] Support type aliases in incremental compilation #KT-12871 Fixed Original commit: efe718602adbea6c7253ac89088a98b62b50a06b --- ...perimentalIncrementalJpsTestGenerated.java | 24 +++++++++++++++++++ .../build/IncrementalJpsTestGenerated.java | 24 +++++++++++++++++++ .../pureKotlin/addMemberTypeAlias/a.kt | 8 +++++++ .../pureKotlin/addMemberTypeAlias/a.kt.new | 11 +++++++++ .../pureKotlin/addMemberTypeAlias/a1Usage.kt | 5 ++++ .../pureKotlin/addMemberTypeAlias/a2Usage.kt | 5 ++++ .../pureKotlin/addMemberTypeAlias/build.log | 22 +++++++++++++++++ .../experimental-ic-build.log | 22 +++++++++++++++++ .../pureKotlin/addTopLevelTypeAlias/a.kt | 6 +++++ .../pureKotlin/addTopLevelTypeAlias/a.kt.new | 8 +++++++ .../addTopLevelTypeAlias/a1Usage.kt | 5 ++++ .../addTopLevelTypeAlias/a2Usage.kt | 5 ++++ .../pureKotlin/addTopLevelTypeAlias/build.log | 23 ++++++++++++++++++ .../experimental-ic-build.log | 23 ++++++++++++++++++ .../pureKotlin/removeMemberTypeAlias/a.kt | 11 +++++++++ .../pureKotlin/removeMemberTypeAlias/a.kt.new | 8 +++++++ .../removeMemberTypeAlias/a1Usage.kt | 5 ++++ .../removeMemberTypeAlias/a2Usage.kt | 5 ++++ .../removeMemberTypeAlias/build.log | 22 +++++++++++++++++ .../experimental-ic-build.log | 22 +++++++++++++++++ .../pureKotlin/removeTopLevelTypeAlias/a.kt | 9 +++++++ .../removeTopLevelTypeAlias/a.kt.new | 6 +++++ .../removeTopLevelTypeAlias/a1Usage.kt | 5 ++++ .../removeTopLevelTypeAlias/a2Usage.kt | 5 ++++ .../removeTopLevelTypeAlias/build.log | 23 ++++++++++++++++++ .../experimental-ic-build.log | 23 ++++++++++++++++++ 26 files changed, 335 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index c8b4fab5886..3e527eadfe8 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -205,6 +205,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("addMemberTypeAlias") + public void testAddMemberTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/"); + doTest(fileName); + } + + @TestMetadata("addTopLevelTypeAlias") + public void testAddTopLevelTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/"); + doTest(fileName); + } + @TestMetadata("allConstants") public void testAllConstants() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); @@ -839,6 +851,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("removeMemberTypeAlias") + public void testRemoveMemberTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/"); + doTest(fileName); + } + + @TestMetadata("removeTopLevelTypeAlias") + public void testRemoveTopLevelTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/"); + doTest(fileName); + } + @TestMetadata("renameClass") public void testRenameClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/"); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index cd72810ef37..47451ca06ab 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -205,6 +205,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("addMemberTypeAlias") + public void testAddMemberTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/"); + doTest(fileName); + } + + @TestMetadata("addTopLevelTypeAlias") + public void testAddTopLevelTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/"); + doTest(fileName); + } + @TestMetadata("allConstants") public void testAllConstants() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/allConstants/"); @@ -839,6 +851,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("removeMemberTypeAlias") + public void testRemoveMemberTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/"); + doTest(fileName); + } + + @TestMetadata("removeTopLevelTypeAlias") + public void testRemoveTopLevelTypeAlias() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/"); + doTest(fileName); + } + @TestMetadata("renameClass") public void testRenameClass() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/renameClass/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt new file mode 100644 index 00000000000..7563b0f4d1d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt @@ -0,0 +1,8 @@ +package a + +class Outer { + inner class B(x: String) + + fun A1(x: Any) = x + fun A2(x: Any) = x +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new new file mode 100644 index 00000000000..2f651d8a0c9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new @@ -0,0 +1,11 @@ +package a + +class Outer { + inner class B(x: String) + + typealias A1 = B + private typealias A2 = B + + fun A1(x: Any) = x + fun A2(x: Any) = x +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt new file mode 100644 index 00000000000..d61b70bda0c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a1Usage.kt @@ -0,0 +1,5 @@ +package usage + +fun bar() { + a.Outer().A1("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt new file mode 100644 index 00000000000..c06dc193b88 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a2Usage.kt @@ -0,0 +1,5 @@ +package usage + +fun baz() { + a.Outer().A2("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log new file mode 100644 index 00000000000..e7664fe6108 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/a/Outer$B.class + out/production/module/a/Outer.class +End of files +Compiling files: + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/A1UsageKt.class + out/production/module/usage/A2UsageKt.class +End of files +Compiling files: + src/a1Usage.kt + src/a2Usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log new file mode 100644 index 00000000000..523076d8fd0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/a/Outer$B.class + out/production/module/a/Outer.class +End of files +Compiling files: + src/a.kt +End of files +Marked as dirty by Kotlin: + src/a1Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/A1UsageKt.class +End of files +Compiling files: + src/a1Usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt new file mode 100644 index 00000000000..e7bbb5080ec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt @@ -0,0 +1,6 @@ +package a + +class B(x: String) + +fun A1(x: Any) = x +fun A2(x: Any) = x diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new new file mode 100644 index 00000000000..3e0d138c454 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a.kt.new @@ -0,0 +1,8 @@ +package a + +class B(x: String) +typealias A1 = B +private typealias A2 = B + +fun A1(x: Any) = x +fun A2(x: Any) = x diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt new file mode 100644 index 00000000000..78523ab3a17 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a1Usage.kt @@ -0,0 +1,5 @@ +package usage + +fun bar() { + a.A1("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt new file mode 100644 index 00000000000..eaf8e2a6247 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/a2Usage.kt @@ -0,0 +1,5 @@ +package usage + +fun baz() { + a.A2("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log new file mode 100644 index 00000000000..6996a4d490b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/a/AKt.class + out/production/module/a/B.class +End of files +Compiling files: + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/A1UsageKt.class + out/production/module/usage/A2UsageKt.class +End of files +Compiling files: + src/a1Usage.kt + src/a2Usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log new file mode 100644 index 00000000000..4f5133e9753 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addTopLevelTypeAlias/experimental-ic-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/a/AKt.class + out/production/module/a/B.class +End of files +Compiling files: + src/a.kt +End of files +Marked as dirty by Kotlin: + src/a1Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/A1UsageKt.class +End of files +Compiling files: + src/a1Usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt new file mode 100644 index 00000000000..2f651d8a0c9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt @@ -0,0 +1,11 @@ +package a + +class Outer { + inner class B(x: String) + + typealias A1 = B + private typealias A2 = B + + fun A1(x: Any) = x + fun A2(x: Any) = x +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new new file mode 100644 index 00000000000..7563b0f4d1d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt.new @@ -0,0 +1,8 @@ +package a + +class Outer { + inner class B(x: String) + + fun A1(x: Any) = x + fun A2(x: Any) = x +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt new file mode 100644 index 00000000000..d61b70bda0c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a1Usage.kt @@ -0,0 +1,5 @@ +package usage + +fun bar() { + a.Outer().A1("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt new file mode 100644 index 00000000000..c06dc193b88 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a2Usage.kt @@ -0,0 +1,5 @@ +package usage + +fun baz() { + a.Outer().A2("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log new file mode 100644 index 00000000000..e7664fe6108 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/a/Outer$B.class + out/production/module/a/Outer.class +End of files +Compiling files: + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/A1UsageKt.class + out/production/module/usage/A2UsageKt.class +End of files +Compiling files: + src/a1Usage.kt + src/a2Usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log new file mode 100644 index 00000000000..523076d8fd0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/a/Outer$B.class + out/production/module/a/Outer.class +End of files +Compiling files: + src/a.kt +End of files +Marked as dirty by Kotlin: + src/a1Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/A1UsageKt.class +End of files +Compiling files: + src/a1Usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt new file mode 100644 index 00000000000..8c7438ac921 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt @@ -0,0 +1,9 @@ +package a + +class B(x: String) + +typealias A1 = B +private typealias A2 = B + +fun A1(x: Any) = x +fun A2(x: Any) = x diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new new file mode 100644 index 00000000000..e7bbb5080ec --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a.kt.new @@ -0,0 +1,6 @@ +package a + +class B(x: String) + +fun A1(x: Any) = x +fun A2(x: Any) = x diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt new file mode 100644 index 00000000000..78523ab3a17 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a1Usage.kt @@ -0,0 +1,5 @@ +package usage + +fun bar() { + a.A1("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt new file mode 100644 index 00000000000..eaf8e2a6247 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/a2Usage.kt @@ -0,0 +1,5 @@ +package usage + +fun baz() { + a.A2("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log new file mode 100644 index 00000000000..6996a4d490b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/a/AKt.class + out/production/module/a/B.class +End of files +Compiling files: + src/a.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/A1UsageKt.class + out/production/module/usage/A2UsageKt.class +End of files +Compiling files: + src/a1Usage.kt + src/a2Usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log new file mode 100644 index 00000000000..4f5133e9753 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeTopLevelTypeAlias/experimental-ic-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/a/AKt.class + out/production/module/a/B.class +End of files +Compiling files: + src/a.kt +End of files +Marked as dirty by Kotlin: + src/a1Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/A1UsageKt.class +End of files +Compiling files: + src/a1Usage.kt +End of files +Exit code: OK +------------------------------------------ From d525cd15813e688fa91a4294af88312d65a730f7 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Sun, 26 Jun 2016 19:13:23 +0300 Subject: [PATCH 0849/1557] Fix for KT-11964: No TABLESWITCH in when on enum bytecode if enum constant is imported #KT-11964 Fixed Original commit: 3b419e8ba387ef203fd36b8994012dbe4e28c8a2 --- .../incremental/classHierarchyAffected/enumEntryAdded/build.log | 1 + .../classHierarchyAffected/enumEntryRemoved/build.log | 1 + .../withJava/javaUsedInKotlin/enumEntryAdded/build.log | 1 + .../withJava/javaUsedInKotlin/enumEntryRemoved/build.log | 1 + 4 files changed, 4 insertions(+) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log index ff1a4bbd2cb..6475e307e9f 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded/build.log @@ -16,6 +16,7 @@ Cleaning output files: out/production/module/GetRandomEnumEntryKt.class out/production/module/META-INF/module.kotlin_module out/production/module/UseEnumImplicitlyKt.class + out/production/module/UseKt$WhenMappings.class out/production/module/UseKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log index 41bafdcc2fb..e18e538942d 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved/build.log @@ -16,6 +16,7 @@ Cleaning output files: out/production/module/GetRandomEnumEntryKt.class out/production/module/META-INF/module.kotlin_module out/production/module/UseEnumImplicitlyKt.class + out/production/module/UseKt$WhenMappings.class out/production/module/UseKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log index 43d2c5501a4..f9695c15cb5 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded/build.log @@ -13,6 +13,7 @@ End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module + out/production/module/UseKt$WhenMappings.class out/production/module/UseKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log index fbad2c8600c..36bbe755ca3 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved/build.log @@ -10,6 +10,7 @@ Compiling files: End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module + out/production/module/UseKt$WhenMappings.class out/production/module/UseKt.class End of files Compiling files: From b6b3454e263a8b1825cd5b609be81e8369da8dff Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 28 Jun 2016 15:31:30 +0300 Subject: [PATCH 0850/1557] Do not consider fake variables for objects in :: resolution The main change is in NewResolutionOldInference.ResolutionKind.CallableReference, where createVariableProcessor creates a processor which no longer lists objects #KT-12322 Fixed Original commit: b44f060ffa41fce5ded42bbba62c80b3aac8586a --- .../incremental/lookupTracker/classifierMembers/usages.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 4a4b3b6194c..3c7b5c59828 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -12,13 +12,13 @@ import bar.* /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) /*p:foo c:foo.A(Companion)*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a + /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo c:foo.A(Companion)*/A./*c:foo.A c:foo.A.Companion*/Companion + /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo c:foo.A(O)*/A./*c:foo.A c:foo.A.Companion*/O + /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vala + /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vala /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 From 39740c34119dc6c585a530083f21684b5f6224c5 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 18 Jul 2016 13:21:08 +0200 Subject: [PATCH 0851/1557] delete work dir after each JPS test Original commit: b315a07f0da2237c0e10ca7906553511c3292891 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 78b37df8d93..2dc4b5a4432 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -16,6 +16,8 @@ package org.jetbrains.kotlin.jps.build +import com.intellij.openapi.Disposable +import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtilRt import com.intellij.testFramework.TestLoggerFactory @@ -271,6 +273,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun doTest(testDataPath: String) { testDataDir = File(testDataPath) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) + Disposer.register(myTestRootDisposable, Disposable { FileUtilRt.delete(workDir) }) val moduleNames = configureModules() initialMake() From b3a54cff83e6a8e5b48aec38c965e266f8a2cd69 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 21 Jul 2016 15:59:23 +0300 Subject: [PATCH 0852/1557] Improve error message for inaccessible invisible_fake members #KT-8989 Fixed Original commit: b6b2303aa759ba62c8665a7231b7725ce990bf17 --- .../CircularDependenciesInternalFromAnotherModule/errors.txt | 2 +- .../testData/general/InternalFromAnotherModule/errors.txt | 2 +- .../flagsAndMemberInSameClassChanged/build.log | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index c025526d7a1..b97a187c913 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -7,4 +7,4 @@ Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 Cannot access 'InternalClass2': it is 'internal' in 'test' at line 19, column 15 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 Cannot access 'InternalFileAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +Cannot access 'member': it is 'invisible (private in a supertype)' in 'ClassAA1' at line 27, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index d1920809ebf..e1be8b69b99 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -5,4 +5,4 @@ Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 Cannot access 'InternalTestAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible_fake' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +Cannot access 'member': it is 'invisible (private in a supertype)' in 'ClassAA1' at line 27, column 25 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index 5b6fbaf1784..edca3b9801d 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -38,7 +38,7 @@ Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file Cannot access 'A': it is 'private' in file Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? -Cannot access 'x': it is 'invisible_fake' in 'B' +Cannot access 'x': it is 'invisible (private in a supertype)' in 'B' Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #2 ================= From c22ccf58c0dfc9c844238739e45f4e6ed21bb448 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 21 Jul 2016 16:12:08 +0300 Subject: [PATCH 0853/1557] Remove quotes around visibility in invisible member diagnostic Original commit: 83000c50ff795086ff88fc4c19e09b0024690404 --- .../errors.txt | 12 +++++----- .../errors.txt | 8 +++---- .../InternalFromAnotherModule/errors.txt | 10 ++++----- .../classBecamePrivate/build.log | 22 +++++++++---------- .../constructorVisibilityChanged/build.log | 4 ++-- .../build.log | 8 +++---- .../multiModuleExported/build.log | 2 +- .../multiModuleSimple/build.log | 4 ++-- .../build.log | 14 ++++++------ .../experimental-ic-build.log | 14 ++++++------ .../build.log | 8 +++---- .../topLevelPrivateValUsageAdded/build.log | 2 +- 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt index b97a187c913..109a31fe488 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesInternalFromAnotherModule/errors.txt @@ -2,9 +2,9 @@ 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 19, column 15 -Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 -Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 -Cannot access 'InternalClass2': it is 'internal' in 'test' at line 19, column 15 -Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 -Cannot access 'InternalFileAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible (private in a supertype)' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +Cannot access 'InternalClass1': it is internal in 'test' at line 5, column 13 +Cannot access 'InternalClass1': it is internal in 'test' at line 8, column 36 +Cannot access 'InternalClass2': it is internal in 'test' at line 19, column 15 +Cannot access 'InternalClassAnnotation': it is internal in 'test' at line 10, column 2 +Cannot access 'InternalFileAnnotation': it is internal in 'test' at line 1, column 7 +Cannot access 'member': it is invisible (private in a supertype) in 'ClassAA1' at line 27, column 25 diff --git a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt index f6a8fb3be27..24037a41f50 100644 --- a/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt +++ b/jps/jps-plugin/testData/general/CircularDependenciesWrongInternalFromTests/errors.txt @@ -1,4 +1,4 @@ -Cannot access 'funA': it is 'internal' in 'test' at line 4, column 5 -Cannot access 'funB': it is 'internal' in 'test' at line 4, column 5 -Cannot access 'testFunA': it is 'internal' in 'test' at line 5, column 5 -Cannot access 'testFunB': it is 'internal' in 'test' at line 5, column 5 \ No newline at end of file +Cannot access 'funA': it is internal in 'test' at line 4, column 5 +Cannot access 'funB': it is internal in 'test' at line 4, column 5 +Cannot access 'testFunA': it is internal in 'test' at line 5, column 5 +Cannot access 'testFunB': it is internal in 'test' at line 5, column 5 \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt index e1be8b69b99..a0692a54537 100644 --- a/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt +++ b/jps/jps-plugin/testData/general/InternalFromAnotherModule/errors.txt @@ -1,8 +1,8 @@ 'internal open val member: Int defined in test.ClassBB1' has no access to 'internal abstract val member: Int defined in test.ClassB1', so it cannot override it at line 14, column 14 'public' subclass exposes its 'internal' supertype InternalClass1 at line 8, column 36 'public' subclass exposes its 'internal' supertype InternalClass2 at line 18, column 36 -Cannot access 'InternalClass1': it is 'internal' in 'test' at line 5, column 13 -Cannot access 'InternalClass1': it is 'internal' in 'test' at line 8, column 36 -Cannot access 'InternalClassAnnotation': it is 'internal' in 'test' at line 10, column 2 -Cannot access 'InternalTestAnnotation': it is 'internal' in 'test' at line 1, column 7 -Cannot access 'member': it is 'invisible (private in a supertype)' in 'ClassAA1' at line 27, column 25 \ No newline at end of file +Cannot access 'InternalClass1': it is internal in 'test' at line 5, column 13 +Cannot access 'InternalClass1': it is internal in 'test' at line 8, column 36 +Cannot access 'InternalClassAnnotation': it is internal in 'test' at line 10, column 2 +Cannot access 'InternalTestAnnotation': it is internal in 'test' at line 1, column 7 +Cannot access 'member': it is invisible (private in a supertype) in 'ClassAA1' at line 27, column 25 diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log index 51b1fa9217c..43fa0a23936 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate/build.log @@ -51,22 +51,22 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file 'public' subclass exposes its 'private' supertype A 'public' generic exposes its 'private' parameter bound type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file 'public' function exposes its 'private' parameter type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file 'public' function exposes its 'private' return type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file 'public' function exposes its 'private' return type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file 'public' function exposes its 'private' return type A ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log index d485c85a260..9c37cd50b36 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged/build.log @@ -23,8 +23,8 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access '': it is 'private' in 'A' -Cannot access '': it is 'private' in 'A' +Cannot access '': it is private in 'A' +Cannot access '': it is private in 'A' ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log index edca3b9801d..ac9509d8ef2 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged/build.log @@ -32,13 +32,13 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file 'public' subclass exposes its 'private' supertype A 'public' function exposes its 'private' return type A -Cannot access 'A': it is 'private' in file -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file +Cannot access 'A': it is private in file Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? -Cannot access 'x': it is 'invisible (private in a supertype)' in 'B' +Cannot access 'x': it is invisible (private in a supertype) in 'B' Only safe (?.) or non-null asserted (!!.) calls are allowed on a nullable receiver of type Any? ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log index c29b8374d1b..eadd060bf39 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleExported/build.log @@ -26,7 +26,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file 'public' subclass exposes its 'private' supertype A ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log index e1585d4ab76..5422b612067 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/multiModuleSimple/build.log @@ -26,9 +26,9 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file 'public' subclass exposes its 'private' supertype A -Cannot access 'A': it is 'private' in file +Cannot access 'A': it is private in file ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log index 6a53134aea2..e8d2aee5cc8 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/build.log @@ -25,11 +25,11 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'FileAnnotation': it is 'internal' in 'a' -Cannot access 'A': it is 'internal' in 'a' -Cannot access 'FileAnnotation': it is 'internal' in 'a' -Cannot access 'ClassAnnotation': it is 'internal' in 'a' -Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' 'public' function exposes its 'internal' parameter type A -Cannot access 'A': it is 'internal' in 'a' -Cannot access 'a': it is 'internal' in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'a': it is internal in 'a' diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log index 3c7f30277f0..21e1a572541 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal1/experimental-ic-build.log @@ -29,11 +29,11 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'FileAnnotation': it is 'internal' in 'a' -Cannot access 'A': it is 'internal' in 'a' -Cannot access 'FileAnnotation': it is 'internal' in 'a' -Cannot access 'ClassAnnotation': it is 'internal' in 'a' -Cannot access 'ClassAnnotation': it is 'internal' in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'FileAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' +Cannot access 'ClassAnnotation': it is internal in 'a' 'public' function exposes its 'internal' parameter type A -Cannot access 'A': it is 'internal' in 'a' -Cannot access 'a': it is 'internal' in 'a' +Cannot access 'A': it is internal in 'a' +Cannot access 'a': it is internal in 'a' diff --git a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log index eae1394f4a3..5b42ada687d 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/simpleDependencyErrorOnAccessToInternal2/build.log @@ -26,9 +26,9 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'InternalFileAnnotation': it is 'internal' in 'a' -Cannot access 'InternalFileAnnotation': it is 'internal' in 'a' -Cannot access 'InternalClassAnnotation': it is 'internal' in 'a' -Cannot access 'InternalClassAnnotation': it is 'internal' in 'a' +Cannot access 'InternalFileAnnotation': it is internal in 'a' +Cannot access 'InternalFileAnnotation': it is internal in 'a' +Cannot access 'InternalClassAnnotation': it is internal in 'a' +Cannot access 'InternalClassAnnotation': it is internal in 'a' Unresolved reference: InternalA Unresolved reference: internalA diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log index ff9f8b0eba6..30638dfb226 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPrivateValUsageAdded/build.log @@ -10,7 +10,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Cannot access 'foo': it is 'private' in file +Cannot access 'foo': it is private in file ================ Step #2 ================= From 904ee9896989e824f978df2413ef833d9ff53dbb Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sat, 31 Oct 2015 15:02:55 +0300 Subject: [PATCH 0854/1557] CLI, Ant: add kotlin-reflect.jar to classpath by default, support "-no-reflect" Note that now "-no-stdlib" implies "-no-reflect". #KT-13237 Fixed Original commit: 0d26087040b94acfff0434d1a12a2975ee8accd8 --- .../org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index a65d1cdeee1..6a27f7074b3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -289,6 +289,7 @@ object KotlinCompilerRunner { with(settings) { module = moduleFile.absolutePath noStdlib = true + noReflect = true noJdk = true } } From 57224b81e602c697416406141e073c92d8c8b98c Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 8 Aug 2016 16:08:34 +0200 Subject: [PATCH 0855/1557] Add settings to compiler to specify templates to load, add templates provider using the settings Original commit: ce6966b4868babb785e686e77c06fd58bbf06d25 --- .../src/org/jetbrains/kotlin/config/CompilerSettings.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 2d06cf18557..1fedf41bc12 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -18,6 +18,8 @@ package org.jetbrains.kotlin.config class CompilerSettings { var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS + var scriptTemplates: String = "" + var scriptTemplatesClasspath: String = "" var copyJsLibraryFiles: Boolean = true var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY From cd09fdd2be35020686e6e4b15f2a712d10e1d451 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 21 Jun 2016 21:19:14 +0300 Subject: [PATCH 0856/1557] Kapt: Analyze sources again if the received analysis result is 'RetryWithAdditionalJavaRoots'. -> Add additional Java roots to Java source roots and clear diagnostic messages before the next analysis round. (cherry picked from commit 17ad807) Original commit: 84d62f37ebcebb7938f763035444c37bec492027 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 558f82c70ba..0e42cb33ed9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -707,6 +707,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { )) } + override fun clear() { + hasErrors = false + } + override fun hasErrors(): Boolean = hasErrors private fun renderLocationIfNeeded(location: CompilerMessageLocation): String { From df295ddfc454494f1db91e53b7d4b1c4d2cf4627 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Wed, 31 Aug 2016 16:03:11 +0300 Subject: [PATCH 0857/1557] Set reference target and report custom error instead unresolved reference for cases: interface, generic parameter, object + invoke, class without companion. #KT-2787 Fixed. Original commit: bebc75c8ef43bccc9e52c5ecc1d92ba3f9e336f4 --- .../classHierarchyAffected/classBecameInterface/build.log | 8 ++++---- .../javaUsedInKotlin/samConversions/methodAdded/build.log | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log index da9c695e793..2cdbf5e2693 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface/build.log @@ -52,10 +52,10 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED This class does not have a constructor -Unresolved reference: A -Unresolved reference: A -Unresolved reference: A -Unresolved reference: A +Interface A does not have constructors +Interface A does not have constructors +Interface A does not have constructors +Interface A does not have constructors ================ Step #2 ================= diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index 33a8bd0d00d..e3554b2ccda 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -23,5 +23,5 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Unresolved reference: SamInterface -Unresolved reference: SamInterface +Interface SamInterface does not have constructors +Interface SamInterface does not have constructors \ No newline at end of file From 3ad7521a5456c61d6eebc4a442634935982baa03 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 31 Aug 2016 18:00:09 +0300 Subject: [PATCH 0858/1557] Drop kotlin-bare-plugin (KT-11859) Original commit: 9a54aa99faeebf9ced18aded0d843c6674d4e51f --- jps/jps-plugin/bare-plugin/bare-plugin.iml | 15 ------ .../bare-plugin/src/META-INF/plugin.xml | 22 --------- .../idea/bare/BareJpsPluginRegistrar.kt | 49 ------------------- 3 files changed, 86 deletions(-) delete mode 100644 jps/jps-plugin/bare-plugin/bare-plugin.iml delete mode 100644 jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml delete mode 100644 jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt diff --git a/jps/jps-plugin/bare-plugin/bare-plugin.iml b/jps/jps-plugin/bare-plugin/bare-plugin.iml deleted file mode 100644 index 11e5df07c16..00000000000 --- a/jps/jps-plugin/bare-plugin/bare-plugin.iml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml b/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml deleted file mode 100644 index 12898ea9244..00000000000 --- a/jps/jps-plugin/bare-plugin/src/META-INF/plugin.xml +++ /dev/null @@ -1,22 +0,0 @@ - - org.jetbrains.kotlin.bare - - Kotlin Bare Compiler for IntelliJ IDEA - - This plugin is only capable of compiling Kotlin code. All highlighting, inspections, refactorings are disabled.]]> - - @snapshot@ - JetBrains s.r.o. - - - - - - org.jetbrains.kotlin.idea.bare.BareJpsPluginRegistrar - - - diff --git a/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt b/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt deleted file mode 100644 index 5e1eab70fb0..00000000000 --- a/jps/jps-plugin/bare-plugin/src/org/jetbrains/kotlin/idea/bare/BareJpsPluginRegistrar.kt +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.idea.bare - -import com.intellij.compiler.server.CompileServerPlugin -import com.intellij.ide.plugins.PluginManager -import com.intellij.openapi.components.ApplicationComponent -import com.intellij.openapi.extensions.Extensions -import com.intellij.openapi.extensions.PluginId - -class BareJpsPluginRegistrar : ApplicationComponent { - override fun initComponent() { - val mainKotlinPlugin = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin")) - - if (mainKotlinPlugin != null && mainKotlinPlugin.isEnabled) { - // do nothing - } - else { - val compileServerPlugin = CompileServerPlugin() - compileServerPlugin.classpath = "jps/kotlin-jps-plugin.jar;kotlin-runtime.jar;kotlin-reflect.jar;kotlin-bare-plugin.jar" - compileServerPlugin.pluginDescriptor = PluginManager.getPlugin(PluginId.getId("org.jetbrains.kotlin.bare")) - - Extensions.getRootArea() - .getExtensionPoint(CompileServerPlugin.EP_NAME) - .registerExtension(compileServerPlugin) - } - } - - override fun disposeComponent() { - } - - override fun getComponentName(): String { - return javaClass.name - } -} From 291bc0c42c5ae45f212276a0f7af7dd62beb1c84 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Fri, 2 Sep 2016 20:15:32 +0300 Subject: [PATCH 0859/1557] Kapt: Provide SourceRetentionAnnotationHandler for incremental compilation. Collect annotations with the "SOURCE" retention. (cherry picked from commit 6ef66e7) Original commit: 975364b2ed86ca48d0d525fd1929595bd19e3034 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 0e42cb33ed9..55f18273a40 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -57,6 +57,7 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.components.SourceRetentionAnnotationHandler import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache @@ -206,7 +207,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val project = projectDescriptor.project val lookupTracker = getLookupTracker(project) val incrementalCaches = getIncrementalCaches(chunk, context) - val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) + val sourceRetentionAnnotationHandler = SourceRetentionAnnotationHandlerImpl() + val environment = createCompileEnvironment(incrementalCaches, lookupTracker, sourceRetentionAnnotationHandler, context) if (!environment.success()) { environment.reportErrorsTo(messageCollector) return ABORT @@ -409,11 +411,13 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun createCompileEnvironment( incrementalCaches: Map, lookupTracker: LookupTracker, + sourceRetentionAnnotationHandler: SourceRetentionAnnotationHandler?, context: CompileContext ): CompilerEnvironment { val compilerServices = Services.Builder() .register(IncrementalCompilationComponents::class.java, - IncrementalCompilationComponentsImpl(incrementalCaches.mapKeys { TargetId(it.key) }, lookupTracker)) + IncrementalCompilationComponentsImpl(incrementalCaches.mapKeys { TargetId(it.key) }, + lookupTracker, sourceRetentionAnnotationHandler)) .register(CompilationCanceledStatus::class.java, object : CompilationCanceledStatus { override fun checkCanceled() { if (context.cancelStatus.isCanceled) throw CompilationCanceledException() From 8c9bb043a28979685506491ecb089aa71e25514a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 6 Sep 2016 15:55:03 +0300 Subject: [PATCH 0860/1557] Remove source annotations when copy class with kapt2 Writing source annotations enables incremental compilation for kapt2. However they are not needed in bytecode, so we remove them when copying classes. # Conflicts: # compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.kt # compiler/frontend.java/src/org/jetbrains/kotlin/config/JVMConfigurationKeys.java Original commit: 6ebb50751cf256f4a18e3da4958c070d8a337570 --- .../kotlin/jps/build/KotlinBuilder.kt | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 55f18273a40..6a57f769cb3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -414,16 +414,20 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { sourceRetentionAnnotationHandler: SourceRetentionAnnotationHandler?, context: CompileContext ): CompilerEnvironment { - val compilerServices = Services.Builder() - .register(IncrementalCompilationComponents::class.java, - IncrementalCompilationComponentsImpl(incrementalCaches.mapKeys { TargetId(it.key) }, - lookupTracker, sourceRetentionAnnotationHandler)) - .register(CompilationCanceledStatus::class.java, object : CompilationCanceledStatus { - override fun checkCanceled() { - if (context.cancelStatus.isCanceled) throw CompilationCanceledException() - } - }) - .build() + val compilerServices = with(Services.Builder()) { + register(IncrementalCompilationComponents::class.java, + IncrementalCompilationComponentsImpl(incrementalCaches.mapKeys { TargetId(it.key) }, + lookupTracker)) + register(CompilationCanceledStatus::class.java, object : CompilationCanceledStatus { + override fun checkCanceled() { + if (context.cancelStatus.isCanceled) throw CompilationCanceledException() + } + }) + sourceRetentionAnnotationHandler?.let { + register(SourceRetentionAnnotationHandler::class.java, it) + } + build() + } return CompilerEnvironment.getEnvironmentFor( PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), From 866ea672d73a618b2140166953c7c8ede917a59a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 14 Sep 2016 13:18:09 +0300 Subject: [PATCH 0861/1557] Allow data classes to implement equals/hashCode/toString from base classes #KT-11306 Fixed Original commit: fea116f14e2fdae51f5a8441cf0faf2826902782 --- .../classSignatureChange/classFlagsChanged/result.out | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out index df8bc66d450..4e874a01529 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out @@ -5,9 +5,9 @@ changes in test/AnnotationFlagAdded: CLASS_SIGNATURE changes in test/AnnotationFlagRemoved: CLASS_SIGNATURE changes in test/AnnotationFlagUnchanged: NONE changes in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS - [component1, copy] + [component1, copy, equals, hashCode, toString] changes in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS - [component1, copy] + [component1, copy, equals, hashCode, toString] changes in test/DataFlagUnchanged: NONE changes in test/EnumFlagAdded: CLASS_SIGNATURE changes in test/EnumFlagRemoved: CLASS_SIGNATURE From 8e0160b87691ff71b41a3c6b1d0e717b8760923e Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Thu, 29 Sep 2016 14:28:03 +0300 Subject: [PATCH 0862/1557] JPS: don't consider that the module is not Kotlin JS until check all libraries. #KT-14082 Fixed Original commit: 797f7ab28e0fc10f3908d2b508d30e62b1417ac0 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 19 +++++++++- .../jetbrains/kotlin/jps/build/JpsUtils.java | 38 ++++++------------- 2 files changed, 28 insertions(+), 29 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 157a2ff444d..442035ed726 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -189,11 +189,17 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } } + annotation class WorkingDir(val name: String) + override fun setUp() { super.setUp() - val sourceFilesRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) + val currentTestMethod = this::class.members.firstOrNull { it.name == "test" + getTestName(false) } + val workingDirFromAnnotation = currentTestMethod?.annotations?.filterIsInstance()?.firstOrNull()?.name + val sourceFilesRoot = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + (workingDirFromAnnotation ?: getTestName(false))) workDir = AbstractKotlinJpsBuildTestCase.copyTestDataToTmpDir(sourceFilesRoot) orCreateProjectDir + + JpsUtils.resetCaches() } override fun tearDown() { @@ -276,6 +282,15 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { checkWhen(arrayOf(touch("src/test1.kt"), touch("module2/src/module2.kt")), null, k2jsOutput(PROJECT_NAME, ADDITIONAL_MODULE_NAME)) } + @WorkingDir("KotlinJavaScriptProjectWithTwoModules") + fun testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary() { + initProject() + createKotlinJavaScriptLibraryArchive() + addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + addKotlinJavaScriptStdlibDependency() + makeAll().assertSuccessful() + } + fun testKotlinJavaScriptProjectWithDirectoryAsStdlib() { initProject() val jslibJar = PathUtil.getKotlinPathsForDistDirectory().jsStdLibJarPath @@ -839,7 +854,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { private fun assertCanceled(buildResult: BuildResult) { val list = buildResult.getMessages(BuildMessage.Kind.INFO) - assertTrue("The build has been canceled".equals(list.last().messageText)) + assertTrue("The build has been canceled" == list.last().messageText) } private fun generateLongKotlinFile(filePath: String, packagename: String, className: String) { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java index 4ab593ed174..58058ec0573 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.jps.build; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.TestOnly; import org.jetbrains.jps.incremental.ModuleBuildTarget; import org.jetbrains.jps.model.java.JpsJavaClasspathKind; import org.jetbrains.jps.model.java.JpsJavaDependenciesEnumerator; @@ -27,8 +28,6 @@ import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.util.JpsPathUtil; import org.jetbrains.kotlin.utils.LibraryUtils; -import java.util.AbstractMap; -import java.util.Collections; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; @@ -36,8 +35,8 @@ import java.util.concurrent.ConcurrentHashMap; class JpsUtils { private JpsUtils() {} - private static final Map IS_KOTLIN_JS_MODULE_CACHE = createMapForCaching(); - private static final Map IS_KOTLIN_JS_STDLIB_JAR_CACHE = createMapForCaching(); + private static final Map IS_KOTLIN_JS_MODULE_CACHE = new ConcurrentHashMap(); + private static final Map IS_KOTLIN_JS_STDLIB_JAR_CACHE = new ConcurrentHashMap(); @NotNull static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { @@ -62,7 +61,10 @@ class JpsUtils { String url = root.getUrl(); Boolean cachedValue = IS_KOTLIN_JS_STDLIB_JAR_CACHE.get(url); - if (cachedValue != null) return cachedValue; + if (cachedValue != null) { + if (cachedValue.booleanValue()) return true; + else continue; + } boolean isKotlinJavascriptStdLibrary = LibraryUtils.isKotlinJavascriptStdLibrary(JpsPathUtil.urlToFile(url)); IS_KOTLIN_JS_STDLIB_JAR_CACHE.put(url, isKotlinJavascriptStdLibrary); @@ -72,27 +74,9 @@ class JpsUtils { return false; } - private static Map createMapForCaching() { - if ("true".equalsIgnoreCase(System.getProperty("kotlin.jps.tests"))) { - return new AbstractMap() { - @Override - public V put(K key, V value) { - return null; - } - - @Override - public V get(Object key) { - return null; - } - - @NotNull - @Override - public Set> entrySet() { - return Collections.emptySet(); - } - }; - } - - return new ConcurrentHashMap(); + @TestOnly + static void resetCaches() { + IS_KOTLIN_JS_MODULE_CACHE.clear(); + IS_KOTLIN_JS_STDLIB_JAR_CACHE.clear(); } } From d324df7f207332cb0d4a5fee357ef3c476a48bef Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 21 Sep 2016 18:12:24 +0300 Subject: [PATCH 0863/1557] KT-13961 REDECLARATION not reported on private-in-file 'foo' vs public 'foo' in different file Private-in-file declarations conflict with public overload-equivalent declarations in other files in the same package. Move functions for grouping possible redeclarations to OverloadResolver (since they are used only there). Refactor redeclarations / conflicting overloads reporting. Original commit: 06101dba52be8ea0a46ff48794be8f82261f9c90 --- .../secondaryConstructorAdded/build.log | 4 ++-- .../incremental/pureKotlin/classRedeclaration/build.log | 2 +- .../incremental/pureKotlin/funRedeclaration/build.log | 2 +- .../pureKotlin/funVsConstructorOverloadConflict/build.log | 2 +- .../incremental/pureKotlin/propertyRedeclaration/build.log | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log index 8ff9855fed1..97868ff01fe 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded/build.log @@ -9,7 +9,7 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public constructor A(x: String)' conflicts with another declaration in package '' +Conflicting overloads: public constructor A(x: String) defined in A, public fun A(x: String): A defined in root package ================ Step #2 ================= @@ -41,4 +41,4 @@ Compiling files: src/useA.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log index da4e0b01787..1e854056845 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classRedeclaration/build.log @@ -16,4 +16,4 @@ Exit code: ABORT ------------------------------------------ COMPILATION FAILED Redeclaration: Klass -Redeclaration: Klass +Redeclaration: Klass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log index cc75bbbadea..f79a79a7337 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funRedeclaration/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public fun function(): Unit' conflicts with another declaration in package 'test' \ No newline at end of file +Conflicting overloads: public fun function(): Unit defined in test, public fun function(): Unit defined in test \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log index e9e9b9c7459..dab333be49e 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/funVsConstructorOverloadConflict/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -'public constructor function()' conflicts with another declaration in package 'test' +Conflicting overloads: public constructor function() defined in test.function, public fun function(): Unit defined in test \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log index bb32f37092f..7839df62fd5 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/propertyRedeclaration/build.log @@ -10,4 +10,4 @@ End of files Exit code: ABORT ------------------------------------------ COMPILATION FAILED -Redeclaration: property +Conflicting declarations: public val property: Int, public val property: Int \ No newline at end of file From d3e4da3719de8ffcb822d7e16d5d107f996d4f48 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 16 Sep 2016 17:07:45 +0200 Subject: [PATCH 0864/1557] Add remote input stream support, plus minor tweaks Original commit: 042fc4fadcfc8b24f3fe6bb14f50cc2b3756294b --- .../kotlin/compilerRunner/KotlinCompilerRunner.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index 6a27f7074b3..d6fb529aa70 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -157,13 +157,8 @@ object KotlinCompilerRunner { val profiler = if (daemonOptions.reportPerf) WallAndThreadAndMemoryTotalProfiler(withGC = false) else DummyProfiler() profiler.withMeasure(null) { - fun newFlagFile(): File { - val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running") - flagFile.deleteOnExit() - return flagFile - } val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) - connection = DaemonConnection(daemon, daemon?.leaseCompileSession(newFlagFile().absolutePath)?.get() ?: CompileService.NO_SESSION) + connection = DaemonConnection(daemon, daemon?.leaseCompileSession(makeAutodeletingFlagFile("compiler-jps-session").absolutePath)?.get() ?: CompileService.NO_SESSION) } for (msg in daemonReportMessages) { From c5d50ce6d768e6301635c0890f7cbbdd33e3b07e Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Mon, 17 Oct 2016 12:16:13 +0300 Subject: [PATCH 0865/1557] Fix for KT-14012: Back-end (JVM) Internal error every first compilation after the source code change #KT-14012 Fixed Original commit: d48ef2efc7aeea888366991d5d2b699aeebd94d5 --- .../ExperimentalIncrementalJpsTestGenerated.java | 12 ++++++++++++ .../jps/build/IncrementalJpsTestGenerated.java | 12 ++++++++++++ .../publicPropertyWithPrivateSetter/build.log | 11 +++++++++++ .../publicPropertyWithPrivateSetter/prop1.kt | 4 ++++ .../publicPropertyWithPrivateSetter/prop2.kt | 6 ++++++ .../publicPropertyWithPrivateSetter/prop2.kt.new | 5 +++++ .../build.log | 11 +++++++++++ .../prop1.kt | 6 ++++++ .../prop2.kt | 6 ++++++ .../prop2.kt.new | 5 +++++ 10 files changed, 78 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 3e527eadfe8..47103158ce6 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -821,6 +821,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("publicPropertyWithPrivateSetter") + public void testPublicPropertyWithPrivateSetter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/"); + doTest(fileName); + } + + @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade") + public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/"); + doTest(fileName); + } + @TestMetadata("removeAndRestoreCompanion") public void testRemoveAndRestoreCompanion() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/"); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 47451ca06ab..27ef2946781 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -821,6 +821,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("publicPropertyWithPrivateSetter") + public void testPublicPropertyWithPrivateSetter() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/"); + doTest(fileName); + } + + @TestMetadata("publicPropertyWithPrivateSetterMultiFileFacade") + public void testPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/"); + doTest(fileName); + } + @TestMetadata("removeAndRestoreCompanion") public void testRemoveAndRestoreCompanion() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log new file mode 100644 index 00000000000..157ba41596f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test2/Prop2Kt.class +End of files +Compiling files: + src/prop2.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt new file mode 100644 index 00000000000..046382d5cc4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop1.kt @@ -0,0 +1,4 @@ +package test + +var property = 1 + private set \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt new file mode 100644 index 00000000000..5378c878b13 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt @@ -0,0 +1,6 @@ +package test2 +import test.* + +fun dummy() { + if (true) 1 else property +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new new file mode 100644 index 00000000000..7060f03a59b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/prop2.kt.new @@ -0,0 +1,5 @@ +package test + +fun dummy() { + if (true) 2 else property +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log new file mode 100644 index 00000000000..157ba41596f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test2/Prop2Kt.class +End of files +Compiling files: + src/prop2.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt new file mode 100644 index 00000000000..ebb7a7603e6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop1.kt @@ -0,0 +1,6 @@ +@file:JvmName("TTest") +@file:JvmMultifileClass +package test + +var property = 1 + private set \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt new file mode 100644 index 00000000000..5378c878b13 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt @@ -0,0 +1,6 @@ +package test2 +import test.* + +fun dummy() { + if (true) 1 else property +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new new file mode 100644 index 00000000000..7060f03a59b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/prop2.kt.new @@ -0,0 +1,5 @@ +package test + +fun dummy() { + if (true) 2 else property +} From 1b590006693b9df3047f2807764bd3d1fc4f5b1f Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Tue, 18 Oct 2016 15:23:29 +0300 Subject: [PATCH 0866/1557] Test data fix Original commit: c5e8139236660d18537ece947116bf787c9909d8 --- .../publicPropertyWithPrivateSetter/build.log | 9 +++++++++ .../experimental-ic-build.log | 11 +++++++++++ .../build.log | 10 ++++++++++ .../experimental-ic-build.log | 11 +++++++++++ 4 files changed, 41 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/experimental-ic-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log index 157ba41596f..ea5dcf8072f 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/build.log @@ -7,5 +7,14 @@ End of files Compiling files: src/prop2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Prop1Kt.class +End of files +Compiling files: + src/prop1.kt +End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/experimental-ic-build.log new file mode 100644 index 00000000000..157ba41596f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetter/experimental-ic-build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test2/Prop2Kt.class +End of files +Compiling files: + src/prop2.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log index 157ba41596f..967b20cf385 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/build.log @@ -7,5 +7,15 @@ End of files Compiling files: src/prop2.kt End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/TTest.class + out/production/module/test/TTest__Prop1Kt.class +End of files +Compiling files: + src/prop1.kt +End of files Exit code: OK ------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/experimental-ic-build.log new file mode 100644 index 00000000000..157ba41596f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/publicPropertyWithPrivateSetterMultiFileFacade/experimental-ic-build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test2/Prop2Kt.class +End of files +Compiling files: + src/prop2.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file From be828cd3cffe8438e17512354abc117346895612 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 18 Oct 2016 16:06:39 +0300 Subject: [PATCH 0867/1557] Fix incremental recompilation of JvmMultifileClass with top level function See 7a679eb and previous changes where this behavior was broken (this was untested, however). Fixes EA-90065 Original commit: 7b2a80ffa464991c5997e259b0976dd0c7d42222 --- ...perimentalIncrementalJpsTestGenerated.java | 6 +++++ .../build/IncrementalJpsTestGenerated.java | 6 +++++ .../a.kt | 4 +++ .../b.kt | 4 +++ .../b.kt.new | 5 ++++ .../build.log | 24 +++++++++++++++++ .../experimental-ic-build.log | 26 +++++++++++++++++++ .../usage.kt | 8 ++++++ 8 files changed, 83 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 47103158ce6..9cfdae0f0f9 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -581,6 +581,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("multifileClassAddTopLevelFunWithDefault") + public void testMultifileClassAddTopLevelFunWithDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/"); + doTest(fileName); + } + @TestMetadata("multifileClassFileAdded") public void testMultifileClassFileAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 27ef2946781..813be4e36f3 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -581,6 +581,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("multifileClassAddTopLevelFunWithDefault") + public void testMultifileClassAddTopLevelFunWithDefault() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/"); + doTest(fileName); + } + @TestMetadata("multifileClassFileAdded") public void testMultifileClassFileAdded() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt new file mode 100644 index 00000000000..63a63e173a0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/a.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun a() = "a" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt new file mode 100644 index 00000000000..dcb3f87f413 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt @@ -0,0 +1,4 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "" diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new new file mode 100644 index 00000000000..1aa2c839861 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/b.kt.new @@ -0,0 +1,5 @@ +@file:[JvmName("Test") JvmMultifileClass] +package test + +fun b() = "" +fun b(s: String = "") = s diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log new file mode 100644 index 00000000000..582ead1c07f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__BKt.class +End of files +Compiling files: + src/b.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/a.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log new file mode 100644 index 00000000000..b13957b6b52 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/experimental-ic-build.log @@ -0,0 +1,26 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__BKt.class +End of files +Compiling files: + src/b.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/a.kt + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt new file mode 100644 index 00000000000..7b1bf24bdd1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassAddTopLevelFunWithDefault/usage.kt @@ -0,0 +1,8 @@ +package usage + +import test.* + +fun usage() { + a() + b() +} From 49750cee02490dc45c672e9753cf7ca261edb663 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 21 Oct 2016 10:39:35 +0300 Subject: [PATCH 0868/1557] Extract platform-independent default imports to TargetPlatform.Default.defaultImports This is needed because SourceNavigationHelper uses default platform and it needs default imports to be able to resolve references (otherwise NavigateToLibrarySourceTestGenerated breaks) Original commit: 56e2173b3c780d37921b96e1964fb6fcc2551117 --- .../lookupTracker/classifierMembers/foo.kt | 10 ++++----- .../lookupTracker/classifierMembers/usages.kt | 18 +++++++-------- .../conventions/delegateProperty.kt | 4 ++-- .../conventions/mathematicalLike.kt | 8 +++---- .../expressionType/inferredType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 +++++++++---------- .../lookupTracker/packageDeclarations/foo1.kt | 6 ++--- .../syntheticProperties/usages.kt | 14 ++++++------ 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index cdd7fd5d862..78a468f61aa 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 3c7b5c59828..d6047d3d391 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/vara() + /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/X - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/foo - /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:foo.E*/bar() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/X + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/foo + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 2ea6f5978c0..6d784dfa75a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,8 +20,8 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() /*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() /*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index e2c0c6fbbfa..ce06ae4f2cf 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.coroutines(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.coroutines(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.jvm(times) p:kotlin.collections(times) p:kotlin.coroutines(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.jvm(div) p:kotlin.collections(div) p:kotlin.coroutines(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.coroutines(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.coroutines(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:java.lang(times) p:kotlin.jvm(times) p:kotlin.coroutines(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:java.lang(div) p:kotlin.jvm(div) p:kotlin.coroutines(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index e868c37a806..7ea4d569615 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -6,8 +6,8 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) /*p:foo*/fun useListOfA(a: /*p:foo*/List) {} /*p:foo*/fun useListOfB(b: /*p:foo*/List) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 5684b9d30d2..cded9192247 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -11,27 +11,27 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/C./*c:bar.C*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/F - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:foo p:baz p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:baz.E*/F + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index a6febbc6d6a..b8016ed2e60 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,7 +4,7 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:baz(B)*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ /*p:foo p:bar(A)*/a @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/MyClass() + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index a0b0b2900d2..87d4db68fb2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = /*p:foo*/KotlinClass() /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/setFoo(2) + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/setFoo(2) /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io*/boo = /*p:kotlin(Int)*/2 + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/boo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:JavaClass*/bazBaz + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.jvm p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 } From 40e9bfffe6add3ff38e2ae20e4257d19adce0ea9 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 14 Oct 2016 15:24:20 +0300 Subject: [PATCH 0869/1557] Import classes from kotlin.coroutines by default, add to default imports in JS Original commit: 6b6ddf5f75113f44331348a417f7b9f7350caddd --- .../lookupTracker/classifierMembers/foo.kt | 10 ++++----- .../lookupTracker/classifierMembers/usages.kt | 18 +++++++-------- .../conventions/delegateProperty.kt | 4 ++-- .../conventions/mathematicalLike.kt | 8 +++---- .../expressionType/inferredType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 +++++++++---------- .../lookupTracker/packageDeclarations/foo1.kt | 6 ++--- .../syntheticProperties/usages.kt | 14 ++++++------ 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 78a468f61aa..17c89e0a55b 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index d6047d3d391..e76140f88de 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/vara() + /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/foo - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:foo.E*/bar() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 6d784dfa75a..ca209a50e23 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,8 +20,8 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() /*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() /*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index ce06ae4f2cf..44e9f0a12b3 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.coroutines(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.coroutines(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:java.lang(times) p:kotlin.jvm(times) p:kotlin.coroutines(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:java.lang(div) p:kotlin.jvm(div) p:kotlin.coroutines(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.coroutines(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.coroutines(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.coroutines(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:java.lang(times) p:kotlin.jvm(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.coroutines(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:java.lang(div) p:kotlin.jvm(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index 7ea4d569615..cfddd0ab562 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -6,8 +6,8 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) /*p:foo*/fun useListOfA(a: /*p:foo*/List) {} /*p:foo*/fun useListOfB(b: /*p:foo*/List) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index cded9192247..703aa26548c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -11,27 +11,27 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/C./*c:bar.C*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:baz.E*/F - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index b8016ed2e60..906b1d3a540 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,7 +4,7 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:baz(B)*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ /*p:foo p:bar(A)*/a @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/MyClass() + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 87d4db68fb2..92874306470 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = /*p:foo*/KotlinClass() /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/setFoo(2) + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/setFoo(2) /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/bazBaz - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io*/boo = /*p:kotlin(Int)*/2 + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/boo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:JavaClass*/bazBaz - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/bazBaz + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.coroutines p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 } From d0aabc9936849744433868a917fe5d42db4d8626 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 19 Oct 2016 12:34:52 +0300 Subject: [PATCH 0870/1557] Kotlin Facet: Add compiler settings to facet configuration Original commit: ea13456bbaebb1346a8d37fb9627d495fdfe097a --- .../org/jetbrains/kotlin/config/CompilerSettings.kt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 1fedf41bc12..b985feadcdd 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -23,6 +23,16 @@ class CompilerSettings { var copyJsLibraryFiles: Boolean = true var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY + constructor() + + constructor(settings: CompilerSettings) { + additionalArguments = settings.additionalArguments + scriptTemplates = settings.scriptTemplates + scriptTemplatesClasspath = settings.scriptTemplatesClasspath + copyJsLibraryFiles = settings.copyJsLibraryFiles + outputDirectoryForJsLibraryFiles = settings.outputDirectoryForJsLibraryFiles + } + companion object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" private val DEFAULT_OUTPUT_DIRECTORY = "lib" From 618b48487444e5d032c1fedf9eb114e7d1710b0e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 25 Oct 2016 20:14:05 +0300 Subject: [PATCH 0871/1557] Add mock runtime to KotlinJpsBuildTest test cases To prevent test failures once the JVM compiler stops loading definitions of built-in declarations from itself and starts to rely on their presence in the library, that the compiled source code depends on Original commit: 0b59c71340a04ce4cd625cf507635d6dea4d7590 --- .../build/AbstractKotlinJpsBuildTestCase.java | 5 ++ .../kotlin/jps/build/KotlinJpsBuildTest.kt | 70 +++++++++++-------- 2 files changed, 44 insertions(+), 31 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index 0d24ce77667..fff2c55bdab 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -31,6 +31,7 @@ import org.jetbrains.jps.model.library.JpsTypedLibrary; import org.jetbrains.jps.model.library.sdk.JpsSdk; import org.jetbrains.jps.model.module.JpsModule; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.codegen.forTestCompile.ForTestCompileRuntime; import org.jetbrains.kotlin.jps.BothJdkClasspathPatcherKt; import org.jetbrains.kotlin.utils.PathUtil; @@ -80,6 +81,10 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { return jdk.getProperties(); } + protected JpsLibrary addKotlinMockRuntimeDependency() { + return addDependency(JpsJavaDependencyScope.COMPILE, myProject.getModules(), false, "kotlin-mock-runtime", ForTestCompileRuntime.mockRuntimeJarForTests()); + } + protected JpsLibrary addKotlinRuntimeDependency() { return addKotlinRuntimeDependency(myProject); } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 442035ed726..eccbf0d287d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -51,6 +51,7 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest.LibraryDependency.* import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils @@ -191,6 +192,13 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { annotation class WorkingDir(val name: String) + enum class LibraryDependency { + NONE, + JVM_MOCK_RUNTIME, + JVM_FULL_RUNTIME, + JS_STDLIB, + } + override fun setUp() { super.setUp() val currentTestMethod = this::class.members.firstOrNull { it.name == "test" + getTestName(false) } @@ -209,25 +217,30 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { override fun doGetProjectDir(): File = workDir - private fun initProject() { + private fun initProject(libraryDependency: LibraryDependency = NONE) { addJdk(JDK_NAME) loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr") + + when (libraryDependency) { + NONE -> {} + JVM_MOCK_RUNTIME -> addKotlinMockRuntimeDependency() + JVM_FULL_RUNTIME -> addKotlinRuntimeDependency() + JS_STDLIB -> addKotlinJavaScriptStdlibDependency() + } } fun doTest() { - initProject() + initProject(JVM_MOCK_RUNTIME) makeAll().assertSuccessful() } fun doTestWithRuntime() { - initProject() - addKotlinRuntimeDependency() + initProject(JVM_FULL_RUNTIME) makeAll().assertSuccessful() } fun doTestWithKotlinJavaScriptLibrary() { - initProject() - addKotlinJavaScriptStdlibDependency() + initProject(JS_STDLIB) createKotlinJavaScriptLibraryArchive() addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) makeAll().assertSuccessful() @@ -261,8 +274,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testKotlinJavaScriptProject() { - initProject() - addKotlinJavaScriptStdlibDependency() + initProject(JS_STDLIB) makeAll().assertSuccessful() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) @@ -270,8 +282,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testKotlinJavaScriptProjectWithTwoModules() { - initProject() - addKotlinJavaScriptStdlibDependency() + initProject(JS_STDLIB) makeAll().assertSuccessful() assertEquals(EXPECTED_JS_FILES_IN_OUTPUT_FOR_STDLIB_ONLY, contentOfOutputDir(PROJECT_NAME)) @@ -310,8 +321,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() { - initProject() - addKotlinJavaScriptStdlibDependency() + initProject(JS_STDLIB) addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY)) makeAll().assertSuccessful() @@ -341,8 +351,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testKotlinJavaScriptProjectWithLibraryAndErrors() { - initProject() - addKotlinJavaScriptStdlibDependency() + initProject(JS_STDLIB) createKotlinJavaScriptLibraryArchive() addKotlinJavaScriptDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) makeAll().assertFailed() @@ -506,7 +515,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testCircularDependenciesDifferentPackages() { - initProject() + initProject(JVM_MOCK_RUNTIME) val result = makeAll() // Check that outputs are located properly @@ -520,7 +529,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testCircularDependenciesSamePackage() { - initProject() + initProject(JVM_MOCK_RUNTIME) val result = makeAll() result.assertSuccessful() @@ -535,7 +544,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testCircularDependenciesSamePackageWithTests() { - initProject() + initProject(JVM_MOCK_RUNTIME) val result = makeAll() result.assertSuccessful() @@ -550,14 +559,14 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testInternalFromAnotherModule() { - initProject() + initProject(JVM_MOCK_RUNTIME) val result = makeAll() result.assertFailed() result.checkErrors() } fun testInternalFromSpecialRelatedModule() { - initProject() + initProject(JVM_MOCK_RUNTIME) makeAll().assertSuccessful() val classpath = listOf("out/production/module1", "out/test/module2").map { File(workDir, it).toURI().toURL() }.toTypedArray() @@ -566,21 +575,21 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testCircularDependenciesInternalFromAnotherModule() { - initProject() + initProject(JVM_MOCK_RUNTIME) val result = makeAll() result.assertFailed() result.checkErrors() } fun testCircularDependenciesWrongInternalFromTests() { - initProject() + initProject(JVM_MOCK_RUNTIME) val result = makeAll() result.assertFailed() result.checkErrors() } fun testCircularDependencyWithReferenceToOldVersionLib() { - initProject() + initProject(JVM_MOCK_RUNTIME) val libraryJar = MockLibraryUtil.compileLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib", false, false) @@ -604,8 +613,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testAccessToInternalInProductionFromTests() { - initProject() - + initProject(JVM_MOCK_RUNTIME) val result = makeAll() result.assertSuccessful() } @@ -651,7 +659,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { fun testCancelLongKotlinCompilation() { generateLongKotlinFile("Foo.kt", "foo", "Foo") - initProject() + initProject(JVM_MOCK_RUNTIME) val INITIAL_DELAY = 2000 @@ -675,7 +683,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testCancelKotlinCompilation() { - initProject() + initProject(JVM_MOCK_RUNTIME) makeAll().assertSuccessful() val module = myProject.modules.get(0) @@ -704,7 +712,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testFileDoesNotExistWarning() { - initProject() + initProject(JVM_MOCK_RUNTIME) AbstractKotlinJpsBuildTestCase.addDependency( JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "LibraryWithBadRoots", @@ -729,7 +737,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testCodeInKotlinPackage() { - initProject() + initProject(JVM_MOCK_RUNTIME) val result = makeAll() result.assertFailed() @@ -739,7 +747,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testDoNotCreateUselessKotlinIncrementalCaches() { - initProject() + initProject(JVM_MOCK_RUNTIME) makeAll().assertSuccessful() val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot @@ -748,7 +756,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testDoNotCreateUselessKotlinIncrementalCachesForDependentTargets() { - initProject() + initProject(JVM_MOCK_RUNTIME) makeAll().assertSuccessful() checkWhen(touch("src/utils.kt"), null, packageClasses("kotlinProject", "src/utils.kt", "_DefaultPackage")) @@ -759,7 +767,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { } fun testKotlinProjectWithEmptyProductionOutputDir() { - initProject() + initProject(JVM_MOCK_RUNTIME) val result = makeAll() result.assertFailed() result.checkErrors() From 9ebc6a18a1dd3c57681be3ed04db593c6b14f382 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 3 Oct 2016 21:35:41 +0300 Subject: [PATCH 0872/1557] Refactoring: introduce IncReporter to report IC progress Original commit: fafde1e9488a2b335f505bffe3eedbbcb97adb82 --- .../kotlin/jps/build/KotlinBuilder.kt | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 6a57f769cb3..1c9d32d930c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -788,6 +788,17 @@ private fun CompilationResult.doProcessChanges( } } +private class JpsIncReporter : IncReporter() { + override fun report(message: ()->String) { + if (KotlinBuilder.LOG.isDebugEnabled) { + KotlinBuilder.LOG.debug(message()) + } + } + + override fun pathsAsString(files: Iterable): String = + files.map { it.canonicalPath }.joinToString() +} + private fun CompilationResult.doProcessChangesUsingLookups( compiledFiles: Set, dataManager: BuildDataManager, @@ -796,16 +807,16 @@ private fun CompilationResult.doProcessChangesUsingLookups( ) { val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) val allCaches = caches.flatMap { it.thisWithDependentCaches } - val logAction = { logStr: String -> KotlinBuilder.LOG.debug(logStr) } + val reporter = JpsIncReporter() - logAction("Start processing changes") + reporter.report { "Start processing changes" } - val (dirtyLookupSymbols, dirtyClassFqNames) = getDirtyData(allCaches, logAction) - val dirtyFiles = mapLookupSymbolsToFiles(lookupStorage, dirtyLookupSymbols, logAction) + - mapClassesFqNamesToFiles(allCaches, dirtyClassFqNames, logAction) + val (dirtyLookupSymbols, dirtyClassFqNames) = getDirtyData(allCaches, reporter) + val dirtyFiles = mapLookupSymbolsToFiles(lookupStorage, dirtyLookupSymbols, reporter) + + mapClassesFqNamesToFiles(allCaches, dirtyClassFqNames, reporter) fsOperations.markFiles(dirtyFiles.asIterable(), excludeFiles = compiledFiles) - logAction("End of processing changes") + reporter.report { "End of processing changes" } } private fun getLookupTracker(project: JpsProject): LookupTracker { From 45ea680ec8187adba40229296253630a960626cf Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 13 Oct 2016 16:22:06 +0300 Subject: [PATCH 0873/1557] Groundwork for using IC without Gradle Original commit: 7c16d086aa669407f3a50019a1762076cf7d1689 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1c9d32d930c..45d378514d6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -794,9 +794,6 @@ private class JpsIncReporter : IncReporter() { KotlinBuilder.LOG.debug(message()) } } - - override fun pathsAsString(files: Iterable): String = - files.map { it.canonicalPath }.joinToString() } private fun CompilationResult.doProcessChangesUsingLookups( From c86d06ae4feaf25af93bdd9b9e0051114fe641ed Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 27 Oct 2016 23:52:21 +0300 Subject: [PATCH 0874/1557] Gradle IC: support multifile classes Original commit: 151cf7d073bc8935b522ca645eb4f222aa6ae0f9 --- .../experimentalOn/expected-kotlin-caches.txt | 4 ++ .../expected-kotlin-caches.txt | 3 ++ .../gradle-build.log | 52 +++++++++++++++++++ .../experimental-expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 3 +- .../experimental-expected-kotlin-caches.txt | 3 +- .../experimental-expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 3 +- .../experimental-expected-kotlin-caches.txt | 3 +- .../gradle-build.log | 12 +++++ .../multifileClassFileAdded/gradle-build.log | 8 +++ .../gradle-build.log | 8 +++ .../pureKotlin/multifileClassRemoved/dummy.kt | 3 ++ 14 files changed, 101 insertions(+), 4 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt index 17c6e62dbff..286057c136b 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt @@ -8,6 +8,7 @@ Module 'module1' production experimental-format-version.txt format-version.txt class-fq-name-to-source.tab + internal-name-to-source.tab proto.tab source-to-classes.tab Module 'module1' tests @@ -15,6 +16,7 @@ Module 'module2' production experimental-format-version.txt format-version.txt class-fq-name-to-source.tab + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab @@ -25,6 +27,7 @@ Module 'module3' production experimental-format-version.txt format-version.txt class-fq-name-to-source.tab + internal-name-to-source.tab proto.tab source-to-classes.tab Module 'module3' tests @@ -32,6 +35,7 @@ Module 'module4' production experimental-format-version.txt format-version.txt class-fq-name-to-source.tab + internal-name-to-source.tab proto.tab source-to-classes.tab Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt index 76de4a21c66..f5cb5275720 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module1' production experimental-format-version.txt format-version.txt + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab @@ -14,6 +15,7 @@ Module 'module1' tests Module 'module2' production experimental-format-version.txt format-version.txt + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab @@ -21,6 +23,7 @@ Module 'module2' tests Module 'module3' production experimental-format-version.txt format-version.txt + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log new file mode 100644 index 00000000000..2c5aa067235 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged/gradle-build.log @@ -0,0 +1,52 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/B.class +End of files +Compiling files: + src/B.kt +End of files +Marked as dirty by Kotlin: + src/C.kt + src/getListOfB.kt + src/getListOfC.kt + src/useListOfAWithListOfB.kt + src/useListOfAWithListOfC.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/C.class + out/production/module/GetListOfBKt.class + out/production/module/GetListOfCKt.class + out/production/module/META-INF/module.kotlin_module + out/production/module/UseListOfAWithListOfBKt.class + out/production/module/UseListOfAWithListOfCKt.class +End of files +Compiling files: + src/C.kt + src/getListOfB.kt + src/getListOfC.kt + src/useListOfAWithListOfB.kt + src/useListOfAWithListOfC.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Type mismatch: inferred type is List but List was expected +Type mismatch: inferred type is List but List was expected + +================ Step #2 ================= + +Cleaning output files: + out/production/module/B.class +End of files +Compiling files: + src/B.kt + src/C.kt + src/getListOfB.kt + src/getListOfC.kt + src/useListOfAWithListOfB.kt + src/useListOfAWithListOfC.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt index 0889bb8f6ae..bf5b0abf716 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt @@ -8,6 +8,7 @@ Module 'module' production experimental-format-version.txt format-version.txt class-fq-name-to-source.tab + internal-name-to-source.tab proto.tab source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt index 700ec2032f6..076178b6fc5 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt @@ -8,6 +8,7 @@ Module 'module' production experimental-format-version.txt format-version.txt class-fq-name-to-source.tab + internal-name-to-source.tab proto.tab source-to-classes.tab subtypes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt index dcd8748a3fa..093875fd5ed 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt @@ -8,7 +8,8 @@ Module 'module' production experimental-format-version.txt format-version.txt constants.tab + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt index 670ef919aaa..14f66d6ef09 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt @@ -7,7 +7,8 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt index 36458852656..a33c2237216 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt @@ -8,6 +8,7 @@ Module 'module' production experimental-format-version.txt format-version.txt inline-functions.tab + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt index b947e922a24..a33c2237216 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt @@ -8,7 +8,8 @@ Module 'module' production experimental-format-version.txt format-version.txt inline-functions.tab + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt index 670ef919aaa..14f66d6ef09 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt @@ -7,7 +7,8 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + internal-name-to-source.tab package-parts.tab proto.tab source-to-classes.tab -Module 'module' tests +Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log new file mode 100644 index 00000000000..3d440011e9b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/moveFileWithoutChangingPackage/gradle-build.log @@ -0,0 +1,12 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/baz/AKt.class + out/production/module/baz/Foo.class +End of files +Compiling files: + src/bar/a.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log new file mode 100644 index 00000000000..32399a71bd8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileAdded/gradle-build.log @@ -0,0 +1,8 @@ +================ Step #1 ================= + +Compiling files: + src/a.kt + src/b.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log new file mode 100644 index 00000000000..32399a71bd8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassFileChanged/gradle-build.log @@ -0,0 +1,8 @@ +================ Step #1 ================= + +Compiling files: + src/a.kt + src/b.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt new file mode 100644 index 00000000000..9448caad874 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/dummy.kt @@ -0,0 +1,3 @@ +package foo + +fun dummy() {} \ No newline at end of file From 56a067cb1c42951d556e5c259e1ed45a0dac702b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 27 Oct 2016 23:52:39 +0300 Subject: [PATCH 0875/1557] Gradle IC: fix converting class to package facade Original commit: f01a956a8b3ad91140bddcd3a6393353c74515e2 --- .../classToPackageFacade/build.log | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log index 4e14747989d..435ae8dc53e 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/classToPackageFacade/build.log @@ -10,24 +10,32 @@ Compiling files: End of files Marked as dirty by Kotlin: src/AChild.kt + src/getA.kt + src/getAChild.kt src/useF.kt src/useG.kt + src/useH.kt + src/useJ.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/AChild.class + out/production/module/GetAChildKt.class out/production/module/GetAKt.class out/production/module/META-INF/module.kotlin_module out/production/module/UseFKt.class out/production/module/UseGKt.class out/production/module/UseHKt.class + out/production/module/UseJKt.class End of files Compiling files: src/AChild.kt src/getA.kt + src/getAChild.kt src/useF.kt src/useG.kt src/useH.kt + src/useJ.kt End of files Exit code: ABORT ------------------------------------------ @@ -50,22 +58,10 @@ Compiling files: src/AChild.kt src/APartF.kt src/APartG.kt + src/getAChild.kt src/useF.kt src/useG.kt -End of files -Marked as dirty by Kotlin: - src/getAChild.kt - src/useJ.kt -Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------- -Cleaning output files: - out/production/module/GetAChildKt.class - out/production/module/META-INF/module.kotlin_module - out/production/module/UseJKt.class -End of files -Compiling files: - src/getAChild.kt src/useJ.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file From 9185cd4537f2e44c89d6575f3d5a0abb7b37fd87 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 27 Oct 2016 16:33:20 +0300 Subject: [PATCH 0876/1557] Gradle IC: treat companion object change as class signature change Original commit: fc1af746c6a8505e82bdebaed709dffd1fbebdf2 --- .../classWithCompanionObjectChanged/result.out | 6 +++--- .../companionObjectToSimpleObject/build.log | 1 + .../removeAndRestoreCompanion/experimental-ic-build.log | 6 +++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out index bc754441fa2..692a5dbb8eb 100644 --- a/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged/result.out @@ -2,11 +2,11 @@ REMOVED: class ClassWithChangedCompanionObject$FirstName.class REMOVED: class ClassWithRemovedCompanionObject$Companion.class ADDED: class ClassWithAddedCompanionObject$Companion.class ADDED: class ClassWithChangedCompanionObject$SecondName.class -changes in test/ClassWithAddedCompanionObject: MEMBERS +changes in test/ClassWithAddedCompanionObject: CLASS_SIGNATURE, MEMBERS [Companion] -changes in test/ClassWithChangedCompanionObject: MEMBERS +changes in test/ClassWithChangedCompanionObject: CLASS_SIGNATURE, MEMBERS [FirstName, SecondName] changes in test/ClassWithChangedVisibilityForCompanionObject.Companion: CLASS_SIGNATURE changes in test/ClassWithChangedVisibilityForCompanionObject: NONE -changes in test/ClassWithRemovedCompanionObject: MEMBERS +changes in test/ClassWithRemovedCompanionObject: CLASS_SIGNATURE, MEMBERS [Companion] diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log index 32bc9b36144..6888cded901 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject/build.log @@ -10,6 +10,7 @@ End of files Marked as dirty by Kotlin: src/companionExtension.kt src/companionReferenceExplicit.kt + src/companionReferenceImplicit.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log index 6da65110b2a..27e070aa859 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeAndRestoreCompanion/experimental-ic-build.log @@ -8,16 +8,19 @@ Compiling files: src/A.kt End of files Marked as dirty by Kotlin: + src/useA.kt src/useAbar.kt src/useAfoo.kt Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module + out/production/module/use/UseAKt.class out/production/module/use/UseAbarKt.class out/production/module/use/UseAfooKt.class End of files Compiling files: + src/useA.kt src/useAbar.kt src/useAfoo.kt End of files @@ -34,8 +37,9 @@ Cleaning output files: End of files Compiling files: src/A.kt + src/useA.kt src/useAbar.kt src/useAfoo.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file From 5c65266354145789a9eedb9512421f4badec55ce Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 26 Oct 2016 14:50:11 +0300 Subject: [PATCH 0877/1557] Refactoring: Move facet configuration classes to idea-jps-common module Original commit: a6dbdbd3e548edcf347b234fcac66da1afae6f03 --- jps/jps-common/idea-jps-common.iml | 2 + .../kotlin/config/DescriptionAware.kt | 37 +++++++ .../kotlin/config/KotlinFacetSettings.kt | 103 ++++++++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/DescriptionAware.kt create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt diff --git a/jps/jps-common/idea-jps-common.iml b/jps/jps-common/idea-jps-common.iml index 8902bc86b9b..914a19b4ad5 100644 --- a/jps/jps-common/idea-jps-common.iml +++ b/jps/jps-common/idea-jps-common.iml @@ -9,5 +9,7 @@ + + \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/DescriptionAware.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/DescriptionAware.kt new file mode 100644 index 00000000000..346a984832e --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/DescriptionAware.kt @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2016 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. + */ + +/* + * Copyright 2010-2016 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.kotlin.config; + +interface DescriptionAware { + val description: String +} \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt new file mode 100644 index 00000000000..a2db9376e59 --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -0,0 +1,103 @@ +/* + * Copyright 2010-2016 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. + */ + +/* + * Copyright 2010-2016 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.kotlin.config + +import com.intellij.util.xmlb.annotations.Property +import com.intellij.util.xmlb.annotations.Transient +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments + +enum class LanguageLevel(override val description: String) : DescriptionAware { + KOTLIN_1_0("1.0"), + KOTLIN_1_1("1.1") +} + +sealed class TargetPlatformKind( + val version: Version, + val name: String +) : DescriptionAware { + override val description = "$name ${version.description}" + + companion object { + val ALL_PLATFORMS: List> by lazy { JVMPlatform.JVM_PLATFORMS + JSPlatform } + } +} + +object NoVersion : DescriptionAware { + override val description = "" +} + +enum class JVMVersion(override val description: String) : DescriptionAware { + JVM_1_6("1.6"), + JVM_1_8("1.8") +} + +class JVMPlatform(version: JVMVersion) : TargetPlatformKind(version, "JVM") { + companion object { + val JVM_PLATFORMS by lazy { JVMVersion.values().map(::JVMPlatform) } + + operator fun get(version: JVMVersion) = JVM_PLATFORMS[version.ordinal] + } +} + +object JSPlatform : TargetPlatformKind(NoVersion, "JavaScript") + +data class KotlinVersionInfo( + var languageLevel: LanguageLevel? = null, + var apiLevel: LanguageLevel? = null, + @get:Transient var targetPlatformKindKind: TargetPlatformKind<*>? = null +) { + // To be serialized + var targetPlatformName: String + get() = targetPlatformKindKind?.description ?: "" + set(value) { + targetPlatformKindKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value } + } +} + +class KotlinCompilerInfo { + // To be serialized + @Property private var _commonCompilerArguments: CommonCompilerArguments.DummyImpl? = null + @get:Transient var commonCompilerArguments: CommonCompilerArguments? + get() = _commonCompilerArguments + set(value) { + _commonCompilerArguments = value as? CommonCompilerArguments.DummyImpl + } + var k2jsCompilerArguments: K2JSCompilerArguments? = null + var compilerSettings: CompilerSettings? = null +} + +class KotlinFacetSettings { + var versionInfo = KotlinVersionInfo() + var compilerInfo = KotlinCompilerInfo() +} \ No newline at end of file From 140071e3d13d4d952776dfebcc9c2881538fdfc7 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 26 Oct 2016 12:18:50 +0300 Subject: [PATCH 0878/1557] Convert to Kotlin: JpsKotlinCompilerSettings.java (rename to .kt) Original commit: 7cb2f04d24854184d502016004ce7c7f5328217e --- ...psKotlinCompilerSettings.java => JpsKotlinCompilerSettings.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/{JpsKotlinCompilerSettings.java => JpsKotlinCompilerSettings.kt} (100%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt From dd56ae957dab6d0865851b0a0091b07c7293ac77 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 26 Oct 2016 12:21:47 +0300 Subject: [PATCH 0879/1557] Convert to Kotlin: JpsKotlinCompilerSettings.java Original commit: b88573e6a806c55686148d0fb5f0937abaa29fea --- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 125 +++++++----------- .../Kotlin2JsCompilerArgumentsSerializer.java | 2 +- ...Kotlin2JvmCompilerArgumentsSerializer.java | 2 +- ...tlinCommonCompilerArgumentsSerializer.java | 2 +- .../KotlinCompilerSettingsSerializer.java | 2 +- 5 files changed, 53 insertions(+), 80 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 6095da08422..e3dc4de3717 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -14,98 +14,71 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps; +package org.jetbrains.kotlin.jps -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jps.model.JpsElementChildRole; -import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.ex.JpsElementBase; -import org.jetbrains.jps.model.ex.JpsElementChildRoleBase; -import org.jetbrains.kotlin.config.CompilerSettings; +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jps.model.ex.JpsElementBase +import org.jetbrains.jps.model.ex.JpsElementChildRoleBase +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.config.CompilerSettings -public class JpsKotlinCompilerSettings extends JpsElementBase { - static final JpsElementChildRole ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings"); +class JpsKotlinCompilerSettings : JpsElementBase() { + private var commonCompilerArguments: CommonCompilerArguments = CommonCompilerArguments.DummyImpl() + private var k2JvmCompilerArguments = K2JVMCompilerArguments() + private var k2JsCompilerArguments = K2JSCompilerArguments() + private var compilerSettings = CompilerSettings() - @NotNull - private CommonCompilerArguments commonCompilerArguments = new CommonCompilerArguments.DummyImpl(); - @NotNull - private K2JVMCompilerArguments k2JvmCompilerArguments = new K2JVMCompilerArguments(); - @NotNull - private K2JSCompilerArguments k2JsCompilerArguments = new K2JSCompilerArguments(); - @NotNull - private CompilerSettings compilerSettings = new CompilerSettings(); - - @NotNull - @Override - public JpsKotlinCompilerSettings createCopy() { - JpsKotlinCompilerSettings copy = new JpsKotlinCompilerSettings(); - copy.commonCompilerArguments = this.commonCompilerArguments; - copy.k2JvmCompilerArguments = this.k2JvmCompilerArguments; - copy.k2JsCompilerArguments = this.k2JsCompilerArguments; - copy.compilerSettings = this.compilerSettings; - return copy; + override fun createCopy(): JpsKotlinCompilerSettings { + val copy = JpsKotlinCompilerSettings() + copy.commonCompilerArguments = this.commonCompilerArguments + copy.k2JvmCompilerArguments = this.k2JvmCompilerArguments + copy.k2JsCompilerArguments = this.k2JsCompilerArguments + copy.compilerSettings = this.compilerSettings + return copy } - @Override - public void applyChanges(@NotNull JpsKotlinCompilerSettings modified) { + override fun applyChanges(modified: JpsKotlinCompilerSettings) { // do nothing } - @NotNull - public static JpsKotlinCompilerSettings getSettings(@NotNull JpsProject project) { - JpsKotlinCompilerSettings settings = project.getContainer().getChild(ROLE); - if (settings == null) { - settings = new JpsKotlinCompilerSettings(); + companion object { + internal val ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings") + + fun getSettings(project: JpsProject) = project.container.getChild(ROLE) ?: JpsKotlinCompilerSettings() + + fun getOrCreateSettings(project: JpsProject): JpsKotlinCompilerSettings { + var settings = project.container.getChild(ROLE) + if (settings == null) { + settings = JpsKotlinCompilerSettings() + project.container.setChild(ROLE, settings) + } + return settings } - return settings; - } - @NotNull - public static JpsKotlinCompilerSettings getOrCreateSettings(@NotNull JpsProject project) { - JpsKotlinCompilerSettings settings = project.getContainer().getChild(ROLE); - if (settings == null) { - settings = new JpsKotlinCompilerSettings(); - project.getContainer().setChild(ROLE, settings); + fun getCommonCompilerArguments(project: JpsProject) = getSettings(project).commonCompilerArguments + + fun setCommonCompilerArguments(project: JpsProject, commonCompilerSettings: CommonCompilerArguments) { + getOrCreateSettings(project).commonCompilerArguments = commonCompilerSettings } - return settings; - } - @NotNull - public static CommonCompilerArguments getCommonCompilerArguments(@NotNull JpsProject project) { - return getSettings(project).commonCompilerArguments; - } + fun getK2JvmCompilerArguments(project: JpsProject) = getSettings(project).k2JvmCompilerArguments - public static void setCommonCompilerArguments(@NotNull JpsProject project, @NotNull CommonCompilerArguments commonCompilerSettings) { - getOrCreateSettings(project).commonCompilerArguments = commonCompilerSettings; - } + fun setK2JvmCompilerArguments(project: JpsProject, k2JvmCompilerArguments: K2JVMCompilerArguments) { + getOrCreateSettings(project).k2JvmCompilerArguments = k2JvmCompilerArguments + } - @NotNull - public static K2JVMCompilerArguments getK2JvmCompilerArguments(@NotNull JpsProject project) { - return getSettings(project).k2JvmCompilerArguments; - } + fun getK2JsCompilerArguments(project: JpsProject) = getSettings(project).k2JsCompilerArguments - public static void setK2JvmCompilerArguments(@NotNull JpsProject project, @NotNull K2JVMCompilerArguments k2JvmCompilerArguments) { - getOrCreateSettings(project).k2JvmCompilerArguments = k2JvmCompilerArguments; - } + fun setK2JsCompilerArguments(project: JpsProject, k2JsCompilerArguments: K2JSCompilerArguments) { + getOrCreateSettings(project).k2JsCompilerArguments = k2JsCompilerArguments + } - @NotNull - public static K2JSCompilerArguments getK2JsCompilerArguments(@NotNull JpsProject project) { - return getSettings(project).k2JsCompilerArguments; - } + fun getCompilerSettings(project: JpsProject) = getSettings(project).compilerSettings - public static void setK2JsCompilerArguments(@NotNull JpsProject project, @NotNull K2JSCompilerArguments k2JsCompilerArguments) { - getOrCreateSettings(project).k2JsCompilerArguments = k2JsCompilerArguments; - } - - @NotNull - public static CompilerSettings getCompilerSettings(@NotNull JpsProject project) { - return getSettings(project).compilerSettings; - } - - public static void setCompilerSettings(@NotNull JpsProject project, @NotNull CompilerSettings compilerSettings) { - getOrCreateSettings(project).compilerSettings = compilerSettings; + fun setCompilerSettings(project: JpsProject, compilerSettings: CompilerSettings) { + getOrCreateSettings(project).compilerSettings = compilerSettings + } } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java index 10ead8134d8..2a098665b5b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java @@ -39,7 +39,7 @@ class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer settings = new K2JSCompilerArguments(); } - JpsKotlinCompilerSettings.setK2JsCompilerArguments(project, settings); + JpsKotlinCompilerSettings.Companion.setK2JsCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java index 09f10c25233..cb394b79ca4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java @@ -39,7 +39,7 @@ class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerialize settings = new K2JVMCompilerArguments(); } - JpsKotlinCompilerSettings.setK2JvmCompilerArguments(project, settings); + JpsKotlinCompilerSettings.Companion.setK2JvmCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java index 70c60de3245..e1899e8075b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java @@ -39,7 +39,7 @@ class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSeriali settings = new CommonCompilerArguments.DummyImpl(); } - JpsKotlinCompilerSettings.setCommonCompilerArguments(project, settings); + JpsKotlinCompilerSettings.Companion.setCommonCompilerArguments(project, settings); } @Override diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java index c27f8cbbc6e..f72373f68a0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java @@ -39,7 +39,7 @@ class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer { settings = new CompilerSettings(); } - JpsKotlinCompilerSettings.setCompilerSettings(project, settings); + JpsKotlinCompilerSettings.Companion.setCompilerSettings(project, settings); } @Override From 9bc4742202de46885a1676892853cbd7e9063a7d Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 26 Oct 2016 12:35:23 +0300 Subject: [PATCH 0880/1557] Convert to Kotlin: Compiler arguments/settings JPS serializers (rename to .kt) Original commit: 9e4fcf9731b1a3a1367114a80dc4fc22c1806921 --- ...ntsSerializer.java => Kotlin2JsCompilerArgumentsSerializer.kt} | 0 ...tsSerializer.java => Kotlin2JvmCompilerArgumentsSerializer.kt} | 0 ...Serializer.java => KotlinCommonCompilerArgumentsSerializer.kt} | 0 ...ettingsSerializer.java => KotlinCompilerSettingsSerializer.kt} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/{Kotlin2JsCompilerArgumentsSerializer.java => Kotlin2JsCompilerArgumentsSerializer.kt} (100%) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/{Kotlin2JvmCompilerArgumentsSerializer.java => Kotlin2JvmCompilerArgumentsSerializer.kt} (100%) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/{KotlinCommonCompilerArgumentsSerializer.java => KotlinCommonCompilerArgumentsSerializer.kt} (100%) rename jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/{KotlinCompilerSettingsSerializer.java => KotlinCompilerSettingsSerializer.kt} (100%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt From a95fff6dec60e230330f0a6e841ce0c81f6e7adf Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 26 Oct 2016 12:37:59 +0300 Subject: [PATCH 0881/1557] Convert to Kotlin: Compiler arguments/settings JPS serializers Original commit: b6de7d350351264b6e63a360b8d159b8f2481849 --- .../Kotlin2JsCompilerArgumentsSerializer.kt | 41 +++++++----------- .../Kotlin2JvmCompilerArgumentsSerializer.kt | 41 +++++++----------- ...KotlinCommonCompilerArgumentsSerializer.kt | 42 ++++++++----------- .../model/KotlinCompilerSettingsSerializer.kt | 41 +++++++----------- 4 files changed, 64 insertions(+), 101 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt index 2a098665b5b..6f5001e7b3b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.kt @@ -14,35 +14,24 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.model; +package org.jetbrains.kotlin.jps.model -import com.intellij.util.xmlb.XmlSerializer; -import org.jdom.Element; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments; -import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; -import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; +import com.intellij.util.xmlb.XmlSerializer +import org.jdom.Element +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE +import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION +import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings -import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION; - -class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { - Kotlin2JsCompilerArgumentsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION); +internal class Kotlin2JsCompilerArgumentsSerializer : JpsProjectExtensionSerializer(KOTLIN_COMPILER_SETTINGS_FILE, + KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION) { + override fun loadExtension(project: JpsProject, componentTag: Element) { + val settings = XmlSerializer.deserialize(componentTag, K2JSCompilerArguments::class.java) ?: K2JSCompilerArguments() + JpsKotlinCompilerSettings.setK2JsCompilerArguments(project, settings) } - @Override - public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { - K2JSCompilerArguments settings = XmlSerializer.deserialize(componentTag, K2JSCompilerArguments.class); - if (settings == null) { - settings = new K2JSCompilerArguments(); - } - - JpsKotlinCompilerSettings.Companion.setK2JsCompilerArguments(project, settings); - } - - @Override - public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + override fun saveExtension(project: JpsProject, componentTag: Element) { } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt index cb394b79ca4..ed27868a3c6 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.kt @@ -14,35 +14,26 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.model; +package org.jetbrains.kotlin.jps.model -import com.intellij.util.xmlb.XmlSerializer; -import org.jdom.Element; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments; -import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; -import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; +import com.intellij.util.xmlb.XmlSerializer +import org.jdom.Element +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer +import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings -import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION; +import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE +import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION -class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { - Kotlin2JvmCompilerArgumentsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION); +internal class Kotlin2JvmCompilerArgumentsSerializer : JpsProjectExtensionSerializer(KOTLIN_COMPILER_SETTINGS_FILE, + KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION) { + + override fun loadExtension(project: JpsProject, componentTag: Element) { + val settings = XmlSerializer.deserialize(componentTag, K2JVMCompilerArguments::class.java) ?: K2JVMCompilerArguments() + JpsKotlinCompilerSettings.setK2JvmCompilerArguments(project, settings) } - @Override - public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { - K2JVMCompilerArguments settings = XmlSerializer.deserialize(componentTag, K2JVMCompilerArguments.class); - if (settings == null) { - settings = new K2JVMCompilerArguments(); - } - - JpsKotlinCompilerSettings.Companion.setK2JvmCompilerArguments(project, settings); - } - - @Override - public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + override fun saveExtension(project: JpsProject, componentTag: Element) { } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt index e1899e8075b..3c8b6490436 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt @@ -14,35 +14,27 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.model; +package org.jetbrains.kotlin.jps.model -import com.intellij.util.xmlb.XmlSerializer; -import org.jdom.Element; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments; -import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; -import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; +import com.intellij.util.xmlb.XmlSerializer +import org.jdom.Element +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer +import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings -import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION; -import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; +import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION +import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE -class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSerializer { - KotlinCommonCompilerArgumentsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION); +internal class KotlinCommonCompilerArgumentsSerializer : JpsProjectExtensionSerializer(KOTLIN_COMPILER_SETTINGS_FILE, + KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION) { + + override fun loadExtension(project: JpsProject, componentTag: Element) { + val settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl::class.java) + ?: CommonCompilerArguments.DummyImpl() + JpsKotlinCompilerSettings.setCommonCompilerArguments(project, settings) } - @Override - public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { - CommonCompilerArguments settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl.class); - if (settings == null) { - settings = new CommonCompilerArguments.DummyImpl(); - } - - JpsKotlinCompilerSettings.Companion.setCommonCompilerArguments(project, settings); - } - - @Override - public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + override fun saveExtension(project: JpsProject, componentTag: Element) { } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt index f72373f68a0..6dbf6c336bf 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.kt @@ -14,35 +14,26 @@ * limitations under the License. */ -package org.jetbrains.kotlin.jps.model; +package org.jetbrains.kotlin.jps.model -import com.intellij.util.xmlb.XmlSerializer; -import org.jdom.Element; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; -import org.jetbrains.kotlin.config.CompilerSettings; -import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings; +import com.intellij.util.xmlb.XmlSerializer +import org.jdom.Element +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer +import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings -import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE; -import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION; +import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE +import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION -class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer { - KotlinCompilerSettingsSerializer() { - super(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMPILER_SETTINGS_SECTION); +internal class KotlinCompilerSettingsSerializer : JpsProjectExtensionSerializer(KOTLIN_COMPILER_SETTINGS_FILE, + KOTLIN_COMPILER_SETTINGS_SECTION) { + + override fun loadExtension(project: JpsProject, componentTag: Element) { + val settings = XmlSerializer.deserialize(componentTag, CompilerSettings::class.java) ?: CompilerSettings() + JpsKotlinCompilerSettings.setCompilerSettings(project, settings) } - @Override - public void loadExtension(@NotNull JpsProject project, @NotNull Element componentTag) { - CompilerSettings settings = XmlSerializer.deserialize(componentTag, CompilerSettings.class); - if (settings == null) { - settings = new CompilerSettings(); - } - - JpsKotlinCompilerSettings.Companion.setCompilerSettings(project, settings); - } - - @Override - public void saveExtension(@NotNull JpsProject project, @NotNull Element componentTag) { + override fun saveExtension(project: JpsProject, componentTag: Element) { } } From 947a39f576722c2747baa69159bba8a10c99f417 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 27 Oct 2016 16:28:23 +0300 Subject: [PATCH 0882/1557] Kotlin Facet: Reuse JvmTarget and LanguageVersion in facet configuration Original commit: a2948a624f440ddbe1157239a1bdc6eb80d48e32 --- jps/jps-common/idea-jps-common.iml | 1 + .../kotlin/config/DescriptionAware.kt | 37 ------------------- .../kotlin/config/KotlinFacetSettings.kt | 21 +++-------- 3 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/DescriptionAware.kt diff --git a/jps/jps-common/idea-jps-common.iml b/jps/jps-common/idea-jps-common.iml index 914a19b4ad5..e38866647e8 100644 --- a/jps/jps-common/idea-jps-common.iml +++ b/jps/jps-common/idea-jps-common.iml @@ -11,5 +11,6 @@ + \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/DescriptionAware.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/DescriptionAware.kt deleted file mode 100644 index 346a984832e..00000000000 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/DescriptionAware.kt +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2010-2016 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. - */ - -/* - * Copyright 2010-2016 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.kotlin.config; - -interface DescriptionAware { - val description: String -} \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index a2db9376e59..1f5a591f091 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -36,11 +36,7 @@ import com.intellij.util.xmlb.annotations.Property import com.intellij.util.xmlb.annotations.Transient import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments - -enum class LanguageLevel(override val description: String) : DescriptionAware { - KOTLIN_1_0("1.0"), - KOTLIN_1_1("1.1") -} +import org.jetbrains.kotlin.utils.DescriptionAware sealed class TargetPlatformKind( val version: Version, @@ -57,24 +53,19 @@ object NoVersion : DescriptionAware { override val description = "" } -enum class JVMVersion(override val description: String) : DescriptionAware { - JVM_1_6("1.6"), - JVM_1_8("1.8") -} - -class JVMPlatform(version: JVMVersion) : TargetPlatformKind(version, "JVM") { +class JVMPlatform(version: JvmTarget) : TargetPlatformKind(version, "JVM") { companion object { - val JVM_PLATFORMS by lazy { JVMVersion.values().map(::JVMPlatform) } + val JVM_PLATFORMS by lazy { JvmTarget.values().map(::JVMPlatform) } - operator fun get(version: JVMVersion) = JVM_PLATFORMS[version.ordinal] + operator fun get(version: JvmTarget) = JVM_PLATFORMS[version.ordinal] } } object JSPlatform : TargetPlatformKind(NoVersion, "JavaScript") data class KotlinVersionInfo( - var languageLevel: LanguageLevel? = null, - var apiLevel: LanguageLevel? = null, + var languageLevel: LanguageVersion? = null, + var apiLevel: LanguageVersion? = null, @get:Transient var targetPlatformKindKind: TargetPlatformKind<*>? = null ) { // To be serialized From e7aebcc4517cb63f098224e9eb21b67c2f89a764 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 27 Oct 2016 15:52:41 +0300 Subject: [PATCH 0883/1557] Kotlin Facet: Get rid of copy constructors for compiler arguments/settings and use reflection-based copying instead Original commit: d0de9dd43ca2482fdaf042f665a8873e486aec10 --- .../kotlin/config/CompilerSettings.kt | 10 ----- .../compilerRunner/KotlinCompilerRunner.kt | 38 +------------------ 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index b985feadcdd..1fedf41bc12 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -23,16 +23,6 @@ class CompilerSettings { var copyJsLibraryFiles: Boolean = true var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY - constructor() - - constructor(settings: CompilerSettings) { - additionalArguments = settings.additionalArguments - scriptTemplates = settings.scriptTemplates - scriptTemplatesClasspath = settings.scriptTemplatesClasspath - copyJsLibraryFiles = settings.copyJsLibraryFiles - outputDirectoryForJsLibraryFiles = settings.outputDirectoryForJsLibraryFiles - } - companion object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" private val DEFAULT_OUTPUT_DIRECTORY = "lib" diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt index d6fb529aa70..011550c9845 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt @@ -16,33 +16,29 @@ package org.jetbrains.kotlin.compilerRunner -import com.intellij.util.xmlb.XmlSerializerUtil import org.jetbrains.jps.api.GlobalOptions import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.mergeBeans import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil +import org.jetbrains.kotlin.config.CompilerSettings import org.jetbrains.kotlin.daemon.client.CompilationServices import org.jetbrains.kotlin.daemon.client.DaemonReportMessage import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient -import org.jetbrains.kotlin.config.CompilerSettings import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.jps.build.KotlinBuilder import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.utils.rethrow import java.io.* -import java.lang.reflect.Field -import java.lang.reflect.Modifier -import java.rmi.ConnectException import java.util.* import java.util.concurrent.TimeUnit @@ -250,36 +246,6 @@ object KotlinCompilerRunner { } } - private fun mergeBeans(from: CommonCompilerArguments, to: T): T { - // TODO: rewrite when updated version of com.intellij.util.xmlb is available on TeamCity - val copy = XmlSerializerUtil.createCopy(to) - - val fromFields = collectFieldsToCopy(from.javaClass) - for (fromField in fromFields) { - val toField = copy.javaClass.getField(fromField.name) - toField.set(copy, fromField.get(from)) - } - - return copy - } - - private fun collectFieldsToCopy(clazz: Class<*>): List { - val fromFields = ArrayList() - - var currentClass: Class<*>? = clazz - while (currentClass != null) { - for (field in currentClass.declaredFields) { - val modifiers = field.modifiers - if (!Modifier.isStatic(modifiers) && Modifier.isPublic(modifiers)) { - fromFields.add(field) - } - } - currentClass = currentClass.superclass - } - - return fromFields - } - private fun setupK2JvmArguments(moduleFile: File, settings: K2JVMCompilerArguments) { with(settings) { module = moduleFile.absolutePath From f3b8b1932524965e3a9b5461eb5e75da9e251c03 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 26 Oct 2016 12:31:24 +0300 Subject: [PATCH 0884/1557] Kotlin Facet: Use facet configuration in JPS build Original commit: 6dd950cd5ade615c387d8b494b7b2997798fb79c --- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 32 +++++++++++-- .../kotlin/jps/build/KotlinBuilder.kt | 17 +++---- .../JpsKotlinFacetConfigurationSerializer.kt | 47 +++++++++++++++++++ .../model/JpsKotlinFacetModuleExtension.kt | 43 +++++++++++++++++ .../model/KotlinModelSerializerService.java | 8 ++++ 5 files changed, 135 insertions(+), 12 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetConfigurationSerializer.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetModuleExtension.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index e3dc4de3717..0a50eb22998 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -19,10 +19,14 @@ package org.jetbrains.kotlin.jps import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.ex.JpsElementBase import org.jetbrains.jps.model.ex.JpsElementChildRoleBase +import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.copyBean import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.config.JVMPlatform +import org.jetbrains.kotlin.jps.model.kotlinFacetExtension class JpsKotlinCompilerSettings : JpsElementBase() { private var commonCompilerArguments: CommonCompilerArguments = CommonCompilerArguments.DummyImpl() @@ -57,25 +61,45 @@ class JpsKotlinCompilerSettings : JpsElementBase() { return settings } - fun getCommonCompilerArguments(project: JpsProject) = getSettings(project).commonCompilerArguments + fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments { + val defaultArguments = getSettings(module.project).commonCompilerArguments + val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments + val (languageLevel, apiLevel) = facetSettings.versionInfo + return facetSettings.compilerInfo.commonCompilerArguments?.apply { + languageVersion = languageLevel?.description + apiVersion = apiLevel?.description + } ?: defaultArguments + } fun setCommonCompilerArguments(project: JpsProject, commonCompilerSettings: CommonCompilerArguments) { getOrCreateSettings(project).commonCompilerArguments = commonCompilerSettings } - fun getK2JvmCompilerArguments(project: JpsProject) = getSettings(project).k2JvmCompilerArguments + fun getK2JvmCompilerArguments(module: JpsModule): K2JVMCompilerArguments { + val defaultArguments = getSettings(module.project).k2JvmCompilerArguments + val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments + val targetPlatform = facetSettings.versionInfo.targetPlatformKindKind as? JVMPlatform ?: return defaultArguments + return copyBean(defaultArguments).apply { + jvmTarget = targetPlatform.version.description + } + } fun setK2JvmCompilerArguments(project: JpsProject, k2JvmCompilerArguments: K2JVMCompilerArguments) { getOrCreateSettings(project).k2JvmCompilerArguments = k2JvmCompilerArguments } - fun getK2JsCompilerArguments(project: JpsProject) = getSettings(project).k2JsCompilerArguments + fun getK2JsCompilerArguments(module: JpsModule): K2JSCompilerArguments { + return module.kotlinFacetExtension?.settings?.compilerInfo?.k2jsCompilerArguments + ?: getSettings(module.project).k2JsCompilerArguments + } fun setK2JsCompilerArguments(project: JpsProject, k2JsCompilerArguments: K2JSCompilerArguments) { getOrCreateSettings(project).k2JsCompilerArguments = k2JsCompilerArguments } - fun getCompilerSettings(project: JpsProject) = getSettings(project).compilerSettings + fun getCompilerSettings(module: JpsModule): CompilerSettings { + return module.kotlinFacetExtension?.settings?.compilerInfo?.compilerSettings ?: getSettings(module.project).compilerSettings + } fun setCompilerSettings(project: JpsProject, compilerSettings: CompilerSettings) { getOrCreateSettings(project).compilerSettings = compilerSettings diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 45d378514d6..e57be963c48 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -214,7 +214,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return ABORT } - val commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(project) + val commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(chunk.representativeTarget().module) commonArguments.verbose = true // Make compiler report source to output files mapping val allCompiledFiles = getAllCompiledFilesContainer(context) @@ -618,11 +618,12 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) - val moduleName = representativeTarget.module.name + val representativeModule = representativeTarget.module + val moduleName = representativeModule.name val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName) val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) - val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) - val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(project) + val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeModule) + val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(representativeModule) KotlinCompilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) return outputItemCollector @@ -631,7 +632,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun copyJsLibraryFilesIfNeeded(chunk: ModuleChunk, project: JpsProject) { val representativeTarget = chunk.representativeTarget() val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(representativeTarget) - val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) + val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeTarget.module) if (compilerSettings.copyJsLibraryFiles) { val outputLibraryRuntimeDirectory = File(outputDir, compilerSettings.outputDirectoryForJsLibraryFiles).absolutePath val libraryFilesToCopy = arrayListOf() @@ -682,9 +683,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return null } - val project = context.projectDescriptor.project - val k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(project) - val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(project) + val module = chunk.representativeTarget().module + val k2JvmArguments = JpsKotlinCompilerSettings.getK2JvmCompilerArguments(module) + val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(module) KotlinBuilder.LOG.debug("Compiling to JVM ${filesToCompile.values().size} files" + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetConfigurationSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetConfigurationSerializer.kt new file mode 100644 index 00000000000..9bf0e88d700 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetConfigurationSerializer.kt @@ -0,0 +1,47 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.model + +import com.intellij.util.xmlb.XmlSerializer +import org.jdom.Element +import org.jetbrains.jps.model.JpsElement +import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer +import org.jetbrains.kotlin.config.KotlinFacetSettings + +object JpsKotlinFacetConfigurationSerializer : JpsFacetConfigurationSerializer( + JpsKotlinFacetModuleExtension.KIND, + JpsKotlinFacetModuleExtension.FACET_TYPE_ID, + JpsKotlinFacetModuleExtension.FACET_NAME +) { + override fun loadExtension( + facetConfigurationElement: Element, + name: String, + parent: JpsElement?, + module: JpsModule + ): JpsKotlinFacetModuleExtension { + return JpsKotlinFacetModuleExtension(XmlSerializer.deserialize(facetConfigurationElement, KotlinFacetSettings::class.java)!!) + } + + override fun saveExtension( + extension: JpsKotlinFacetModuleExtension?, + facetConfigurationTag: Element, + module: JpsModule + ) { + XmlSerializer.serializeInto((extension as JpsKotlinFacetModuleExtension).settings, facetConfigurationTag) + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetModuleExtension.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetModuleExtension.kt new file mode 100644 index 00000000000..0add54661f4 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetModuleExtension.kt @@ -0,0 +1,43 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.model + +import org.jetbrains.jps.model.ex.JpsElementBase +import org.jetbrains.jps.model.ex.JpsElementChildRoleBase +import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.kotlin.config.KotlinFacetSettings + +class JpsKotlinFacetModuleExtension(settings: KotlinFacetSettings) : JpsElementBase() { + var settings = settings + private set + + companion object { + val KIND = JpsElementChildRoleBase.create("kotlin facet extension") + // These must be changed in sync with KotlinFacetType.TYPE_ID and KotlinFacetType.NAME + val FACET_TYPE_ID = "kotlin-language" + val FACET_NAME = "Kotlin" + } + + override fun createCopy() = JpsKotlinFacetModuleExtension(settings) + + override fun applyChanges(modified: JpsKotlinFacetModuleExtension) { + this.settings = modified.settings + } +} + +val JpsModule.kotlinFacetExtension: JpsKotlinFacetModuleExtension? + get() = container.getChild(JpsKotlinFacetModuleExtension.KIND) \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinModelSerializerService.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinModelSerializerService.java index 8274f453dde..1e12e3e6db9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinModelSerializerService.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinModelSerializerService.java @@ -19,8 +19,10 @@ package org.jetbrains.kotlin.jps.model; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension; import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer; +import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer; import java.util.Arrays; +import java.util.Collections; import java.util.List; public class KotlinModelSerializerService extends JpsModelSerializerExtension { @@ -32,4 +34,10 @@ public class KotlinModelSerializerService extends JpsModelSerializerExtension { new Kotlin2JsCompilerArgumentsSerializer(), new KotlinCompilerSettingsSerializer()); } + + @NotNull + @Override + public List> getFacetConfigurationSerializers() { + return Collections.singletonList(JpsKotlinFacetConfigurationSerializer.INSTANCE); + } } From 77404d15017dfb22ce2252798b7680bfbd15cc61 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 27 Oct 2016 18:35:02 +0300 Subject: [PATCH 0885/1557] Kotlin Facet: Use facet configuration to provide language version for IDE analyzer Original commit: 30d08c989dfba85fd9a1153ff0e0a4cac622229a --- .../jetbrains/kotlin/config/KotlinFacetSettings.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 1f5a591f091..3fe3eac2f47 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -32,6 +32,9 @@ package org.jetbrains.kotlin.config +import com.intellij.openapi.components.ServiceManager +import com.intellij.openapi.module.Module +import com.intellij.openapi.project.Project import com.intellij.util.xmlb.annotations.Property import com.intellij.util.xmlb.annotations.Transient import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments @@ -91,4 +94,12 @@ class KotlinCompilerInfo { class KotlinFacetSettings { var versionInfo = KotlinVersionInfo() var compilerInfo = KotlinCompilerInfo() +} + +interface KotlinFacetSettingsProvider { + fun getSettings(module: Module): KotlinFacetSettings + + companion object { + fun getInstance(project: Project) = ServiceManager.getService(project, KotlinFacetSettingsProvider::class.java)!! + } } \ No newline at end of file From 77149c97f155ba479f4d079b2b56c146750843f0 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 7 Nov 2016 16:12:10 +0300 Subject: [PATCH 0886/1557] Regenerate tests Original commit: 1dedb38481fb5c90ec4e72b2076c656ed0957059 --- ...aContainerVersionChangedTestGenerated.java | 3 ++- ...lChangeIncrementalOptionTestGenerated.java | 3 ++- ...entalCacheVersionChangedTestGenerated.java | 3 ++- ...perimentalIncrementalJpsTestGenerated.java | 19 ++++++++++--------- ...talIncrementalLazyCachesTestGenerated.java | 3 ++- ...entalCacheVersionChangedTestGenerated.java | 3 ++- .../build/IncrementalJpsTestGenerated.java | 17 +++++++++-------- .../IncrementalLazyCachesTestGenerated.java | 3 ++- .../jps/build/LookupTrackerTestGenerated.java | 3 ++- .../ProtoComparisonTestGenerated.java | 11 ++++++----- 10 files changed, 39 insertions(+), 29 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java index a947b388dea..325bd126806 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class DataContainerVersionChangedTestGenerated extends AbstractDataContainerVersionChangedTest { public void testAllFilesPresentInCacheVersionChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("clearedHasKotlin") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java index e2df8e95f7e..11f5e5c2cba 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ExperimentalChangeIncrementalOptionTestGenerated extends AbstractExperimentalChangeIncrementalOptionTest { public void testAllFilesPresentInChangeIncrementalOption() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("experimentalOn") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java index 95249af06ee..b94497ae317 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ExperimentalIncrementalCacheVersionChangedTestGenerated extends AbstractExperimentalIncrementalCacheVersionChangedTest { public void testAllFilesPresentInCacheVersionChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("clearedHasKotlin") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 9cfdae0f0f9..7a989d39ce9 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,7 +35,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta @RunWith(JUnit3RunnerWithInners.class) public static class MultiModule extends AbstractExperimentalIncrementalJpsTest { public void testAllFilesPresentInMultiModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("circularDependencyClasses") @@ -224,7 +225,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta } public void testAllFilesPresentInPureKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false); } @TestMetadata("annotations") @@ -971,7 +972,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractExperimentalIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @@ -979,7 +980,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta @RunWith(JUnit3RunnerWithInners.class) public static class ConvertBetweenJavaAndKotlin extends AbstractExperimentalIncrementalJpsTest { public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("javaToKotlin") @@ -1013,7 +1014,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractExperimentalIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("changeNotUsedSignature") @@ -1081,7 +1082,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta @RunWith(JUnit3RunnerWithInners.class) public static class SamConversions extends AbstractExperimentalIncrementalJpsTest { public void testAllFilesPresentInSamConversions() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("methodAdded") @@ -1110,7 +1111,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta } public void testAllFilesPresentInKotlinUsedInJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("changeNotUsedSignature") @@ -1199,7 +1200,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunCallSite extends AbstractExperimentalIncrementalJpsTest { public void testAllFilesPresentInInlineFunCallSite() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("classProperty") @@ -1293,7 +1294,7 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta @RunWith(JUnit3RunnerWithInners.class) public static class ClassHierarchyAffected extends AbstractExperimentalIncrementalJpsTest { public void testAllFilesPresentInClassHierarchyAffected() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("annotationFlagRemoved") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java index 2672e118453..df25b8a6718 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class ExperimentalIncrementalLazyCachesTestGenerated extends AbstractExperimentalIncrementalLazyCachesTest { public void testAllFilesPresentInLazyKotlinCaches() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("class") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index 6b639125feb..54632cdba18 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncrementalCacheVersionChangedTest { public void testAllFilesPresentInCacheVersionChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("clearedHasKotlin") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 813be4e36f3..74332cb6ddb 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,7 +35,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class MultiModule extends AbstractIncrementalJpsTest { public void testAllFilesPresentInMultiModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/multiModule"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("circularDependencyClasses") @@ -224,7 +225,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInPureKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false); } @TestMetadata("annotations") @@ -971,7 +972,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJpsTest { public void testAllFilesPresentInWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @@ -979,7 +980,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("javaToKotlin") @@ -1013,7 +1014,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJpsTest { public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("changeNotUsedSignature") @@ -1081,7 +1082,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class SamConversions extends AbstractIncrementalJpsTest { public void testAllFilesPresentInSamConversions() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("methodAdded") @@ -1110,7 +1111,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } public void testAllFilesPresentInKotlinUsedInJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("changeNotUsedSignature") @@ -1199,7 +1200,7 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunCallSite extends AbstractIncrementalJpsTest { public void testAllFilesPresentInInlineFunCallSite() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("classProperty") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index f506138e00d..aa395e124d8 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyCachesTest { public void testAllFilesPresentInLazyKotlinCaches() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("class") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index f6e6133b449..5e2c177a59d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -32,7 +33,7 @@ import java.util.regex.Pattern; @RunWith(JUnit3RunnerWithInners.class) public class LookupTrackerTestGenerated extends AbstractLookupTrackerTest { public void testAllFilesPresentInLookupTracker() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), false); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, false); } @TestMetadata("classifierMembers") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 32bbb470923..36d19c2b209 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.incremental; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -34,7 +35,7 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassSignatureChange extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassSignatureChange() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("classAnnotationListChanged") @@ -86,7 +87,7 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassPrivateOnlyChange extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassPrivateOnlyChange() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("classWithPrivateFunChanged") @@ -126,7 +127,7 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class ClassMembersOnlyChanged extends AbstractProtoComparisonTest { public void testAllFilesPresentInClassMembersOnlyChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("classWithCompanionObjectChanged") @@ -184,7 +185,7 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class PackageMembers extends AbstractProtoComparisonTest { public void testAllFilesPresentInPackageMembers() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("defaultValues") @@ -224,7 +225,7 @@ public class ProtoComparisonTestGenerated extends AbstractProtoComparisonTest { @RunWith(JUnit3RunnerWithInners.class) public static class Unchanged extends AbstractProtoComparisonTest { public void testAllFilesPresentInUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), true); + KotlinTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), TargetBackend.ANY, true); } @TestMetadata("unchangedClass") From 036f5ae0e0cf734077ce9063faff59a7a0a7bc56 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 10 Nov 2016 14:37:29 +0300 Subject: [PATCH 0887/1557] Minor, rename targetPlatformKindKind -> targetPlatformKind Original commit: d0f31a2bc2b02b717ceb587d59f898b558f2c181 --- .../kotlin/config/KotlinFacetSettings.kt | 22 +++---------------- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 2 +- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 3fe3eac2f47..cd46c54c965 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -14,22 +14,6 @@ * limitations under the License. */ -/* - * Copyright 2010-2016 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.kotlin.config import com.intellij.openapi.components.ServiceManager @@ -69,13 +53,13 @@ object JSPlatform : TargetPlatformKind(NoVersion, "JavaScript") data class KotlinVersionInfo( var languageLevel: LanguageVersion? = null, var apiLevel: LanguageVersion? = null, - @get:Transient var targetPlatformKindKind: TargetPlatformKind<*>? = null + @get:Transient var targetPlatformKind: TargetPlatformKind<*>? = null ) { // To be serialized var targetPlatformName: String - get() = targetPlatformKindKind?.description ?: "" + get() = targetPlatformKind?.description ?: "" set(value) { - targetPlatformKindKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value } + targetPlatformKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value } } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 0a50eb22998..d8031eb4999 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -78,7 +78,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { fun getK2JvmCompilerArguments(module: JpsModule): K2JVMCompilerArguments { val defaultArguments = getSettings(module.project).k2JvmCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments - val targetPlatform = facetSettings.versionInfo.targetPlatformKindKind as? JVMPlatform ?: return defaultArguments + val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? JVMPlatform ?: return defaultArguments return copyBean(defaultArguments).apply { jvmTarget = targetPlatform.version.description } From 1521275a5db404c9e099d5ff4ddbd00bfb5a4367 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 10 Nov 2016 15:59:58 +0300 Subject: [PATCH 0888/1557] Rename JVMPlatform and JSPlatform and make them nested in TargetPlatformKind To avoid confusion with JvmPlatform and JsPlatform from frontend.java and js.frontend respectively Original commit: 26a6ce9a318d9ab8bc79a0fc66ccbb4e3c8d5b50 --- .../kotlin/config/KotlinFacetSettings.kt | 22 +++++++++---------- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index cd46c54c965..95d55226229 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -31,8 +31,18 @@ sealed class TargetPlatformKind( ) : DescriptionAware { override val description = "$name ${version.description}" + class Jvm(version: JvmTarget) : TargetPlatformKind(version, "JVM") { + companion object { + val JVM_PLATFORMS by lazy { JvmTarget.values().map(::Jvm) } + + operator fun get(version: JvmTarget) = JVM_PLATFORMS[version.ordinal] + } + } + + object JavaScript : TargetPlatformKind(NoVersion, "JavaScript") + companion object { - val ALL_PLATFORMS: List> by lazy { JVMPlatform.JVM_PLATFORMS + JSPlatform } + val ALL_PLATFORMS: List> by lazy { Jvm.JVM_PLATFORMS + JavaScript } } } @@ -40,16 +50,6 @@ object NoVersion : DescriptionAware { override val description = "" } -class JVMPlatform(version: JvmTarget) : TargetPlatformKind(version, "JVM") { - companion object { - val JVM_PLATFORMS by lazy { JvmTarget.values().map(::JVMPlatform) } - - operator fun get(version: JvmTarget) = JVM_PLATFORMS[version.ordinal] - } -} - -object JSPlatform : TargetPlatformKind(NoVersion, "JavaScript") - data class KotlinVersionInfo( var languageLevel: LanguageVersion? = null, var apiLevel: LanguageVersion? = null, diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index d8031eb4999..6b0f860732d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.copyBean import org.jetbrains.kotlin.config.CompilerSettings -import org.jetbrains.kotlin.config.JVMPlatform +import org.jetbrains.kotlin.config.TargetPlatformKind import org.jetbrains.kotlin.jps.model.kotlinFacetExtension class JpsKotlinCompilerSettings : JpsElementBase() { @@ -78,7 +78,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { fun getK2JvmCompilerArguments(module: JpsModule): K2JVMCompilerArguments { val defaultArguments = getSettings(module.project).k2JvmCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments - val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? JVMPlatform ?: return defaultArguments + val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? TargetPlatformKind.Jvm ?: return defaultArguments return copyBean(defaultArguments).apply { jvmTarget = targetPlatform.version.description } From 765f02f9ac73ad26147d026ddc024ea3bd667838 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 19 Oct 2016 21:28:28 +0300 Subject: [PATCH 0889/1557] Ensure jps caches are always cleared in tests Original commit: ea93ec3eecb939a6b2c7b6334932f9b2b32eba5d --- .../jps/build/AbstractIncrementalJpsTest.kt | 9 ++--- .../build/AbstractKotlinJpsBuildTestCase.java | 14 +------- .../jps/build/BaseKotlinJpsBuildTestCase.kt | 33 +++++++++++++++++++ 3 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 2dc4b5a4432..957e78df221 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -31,7 +31,6 @@ import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.api.CanceledStatus import org.jetbrains.jps.builders.BuildResult import org.jetbrains.jps.builders.CompileScopeTestBuilder -import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.builders.impl.BuildDataPathsImpl import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase import org.jetbrains.jps.builders.java.dependencyView.Callbacks @@ -55,10 +54,7 @@ import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.Printer import org.jetbrains.kotlin.utils.keysToMap -import java.io.ByteArrayInputStream -import java.io.ByteArrayOutputStream -import java.io.File -import java.io.PrintStream +import java.io.* import java.util.* import kotlin.reflect.jvm.javaField @@ -66,7 +62,7 @@ abstract class AbstractIncrementalJpsTest( private val allowNoFilesWithSuffixInTestData: Boolean = false, private val checkDumpsCaseInsensitively: Boolean = false, private val allowNoBuildLogFileInTestData: Boolean = false -) : JpsBuildTestCase() { +) : BaseKotlinJpsBuildTestCase() { companion object { init { disableJava6FileManager() @@ -120,7 +116,6 @@ abstract class AbstractIncrementalJpsTest( override fun setUp() { super.setUp() - System.setProperty("kotlin.jps.tests", "true") lookupsDuringTest = hashSetOf() IncrementalCompilation.setIsExperimental(enableExperimentalIncrementalCompilation) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java index fff2c55bdab..474836e87d2 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -39,7 +39,7 @@ import java.io.File; import java.io.IOException; import java.util.Collection; -public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { +public abstract class AbstractKotlinJpsBuildTestCase extends BaseKotlinJpsBuildTestCase { public static final String TEST_DATA_PATH = "jps-plugin/testData/"; static { @@ -48,18 +48,6 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { protected File workDir; - @Override - public void setUp() throws Exception { - super.setUp(); - System.setProperty("kotlin.jps.tests", "true"); - } - - @Override - public void tearDown() throws Exception { - System.clearProperty("kotlin.jps.tests"); - super.tearDown(); - } - protected static File copyTestDataToTmpDir(File testDataDir) throws IOException { assert testDataDir.exists() : "Cannot find source folder " + testDataDir.getAbsolutePath(); File tmpDir = FileUtil.createTempDirectory("jps-build", null); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt new file mode 100644 index 00000000000..16eb3ac8d4a --- /dev/null +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt @@ -0,0 +1,33 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.build + +import org.jetbrains.jps.builders.JpsBuildTestCase + +abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { + override fun setUp() { + super.setUp() + JpsUtils.resetCaches() + System.setProperty("kotlin.jps.tests", "true") + } + + override fun tearDown() { + JpsUtils.resetCaches() + System.clearProperty("kotlin.jps.tests") + super.tearDown() + } +} \ No newline at end of file From 7ed13b9ecd98b0fc2294dc9754a2cc3ac38aa641 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 19 Oct 2016 21:28:28 +0300 Subject: [PATCH 0890/1557] Minor: add Throws(Exception) to avoid override issues in java Original commit: 18d50b930d8fe6ca2f4302729ccd168f87250cb3 --- .../jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt index 16eb3ac8d4a..863e8b5457e 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt @@ -19,12 +19,14 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.builders.JpsBuildTestCase abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { + @Throws(Exception::class) override fun setUp() { super.setUp() JpsUtils.resetCaches() System.setProperty("kotlin.jps.tests", "true") } + @Throws(Exception::class) override fun tearDown() { JpsUtils.resetCaches() System.clearProperty("kotlin.jps.tests") From 48b0259d9be33f7d6fcb498540bfc419fc38f60d Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 18 Nov 2016 10:25:16 +0300 Subject: [PATCH 0891/1557] Report error on non-top-level type aliases (unsupported in 1.1). Get rid of nested type aliases in project. Original commit: 4c47d77a9fe986a597c3fd77d0317c1ac1343b6f --- .../incremental/pureKotlin/addMemberTypeAlias/a.kt.new | 2 ++ .../testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt | 3 +++ 2 files changed, 5 insertions(+) diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new index 2f651d8a0c9..b1b7bcb0377 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/addMemberTypeAlias/a.kt.new @@ -3,7 +3,9 @@ package a class Outer { inner class B(x: String) + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") typealias A1 = B + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") private typealias A2 = B fun A1(x: Any) = x diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt index 2f651d8a0c9..6a5080369a0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/removeMemberTypeAlias/a.kt @@ -3,7 +3,10 @@ package a class Outer { inner class B(x: String) + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") typealias A1 = B + + @Suppress("TOPLEVEL_TYPEALIASES_ONLY") private typealias A2 = B fun A1(x: Any) = x From 29e90f9547a0f709cf508c2b7139f17c4db6214a Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 10 Nov 2016 19:49:38 +0300 Subject: [PATCH 0892/1557] Kotlin Facet: Track configuration version Original commit: 4613eed406dbe302c062e5b17d17a89982d902b1 --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 95d55226229..ca51c0a3756 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -76,6 +76,12 @@ class KotlinCompilerInfo { } class KotlinFacetSettings { + companion object { + // Increment this when making serialization-incompatible changes to configuration data + val CURRENT_VERSION = 1 + val DEFAULT_VERSION = 0 + } + var versionInfo = KotlinVersionInfo() var compilerInfo = KotlinCompilerInfo() } From 7ebb3e5918427d6ea67fbf288250b2617124b628 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 10 Nov 2016 14:31:02 +0300 Subject: [PATCH 0893/1557] Support "default platform" in IDE via facet settings Original commit: 22e1221c755e35f333875ed28dcbeef40a82591b --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index ca51c0a3756..0c2fd311d3a 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -41,8 +41,10 @@ sealed class TargetPlatformKind( object JavaScript : TargetPlatformKind(NoVersion, "JavaScript") + object Default : TargetPlatformKind(NoVersion, "Default (experimental)") + companion object { - val ALL_PLATFORMS: List> by lazy { Jvm.JVM_PLATFORMS + JavaScript } + val ALL_PLATFORMS: List> by lazy { Jvm.JVM_PLATFORMS + JavaScript + Default } } } From 0c205c38b963c4361dff2daa137a85185fc0ee5a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 22 Nov 2016 23:31:39 +0300 Subject: [PATCH 0894/1557] Minor: fix test data dummy.kt was added for Gradle test (it does not start otherwise). Old IC recompiles this file, so new and old IC logs are different. Original commit: 5eaa23ec607fa21c679e41a2ec87fceaa739082b --- .../pureKotlin/multifileClassRemoved/build.log | 11 ++++++++++- .../experimental-ic-build.log | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/experimental-ic-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log index 0549585e040..4c5eafa9b77 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/build.log @@ -10,5 +10,14 @@ Cleaning output files: End of files Compiling files: End of files -Exit code: OK +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/foo/DummyKt.class +End of files +Compiling files: + src/dummy.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/experimental-ic-build.log new file mode 100644 index 00000000000..30620ff3626 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/multifileClassRemoved/experimental-ic-build.log @@ -0,0 +1,14 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class +End of files +Cleaning output files: + out/production/module/test/Test__BKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file From 5d60a8526f4032779b3c9f751ce638de0df75d47 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 24 Nov 2016 18:43:01 +0300 Subject: [PATCH 0895/1557] Support new suspend convention in JVM backend partially Stack-unwinding does not work yet #KT-14924 In Progress Original commit: 1f98accad2595aae26d435899cbe517774fed45e --- .../testData/incremental/inlineFunCallSite/coroutine/usage.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt index ed10ee21c2d..ec35bbd5b0c 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt @@ -5,7 +5,7 @@ fun async(coroutine x: Controller.() -> Continuation) { } class Controller { - suspend fun step(param: Int, next: Continuation) { + suspend fun step(param: Int) = suspendWithCurrentContinuation { next -> next.resume(param + 1) } } From 1b23daa3330dc3b5386abaf716f7c6bfa1116216 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 5 Dec 2016 11:36:32 +0300 Subject: [PATCH 0896/1557] Rename KotlinVersion->KotlinCompilerVersion, move to module util.runtime Rename to avoid confusion with the recently added kotlin.KotlinVersion Original commit: 414daef001f8b3d400ed295e9e8b08c962a11bf3 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e57be963c48..21eb4ad0cc8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -40,7 +40,6 @@ import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.kotlin.build.GeneratedFile import org.jetbrains.kotlin.build.GeneratedJvmClass import org.jetbrains.kotlin.build.isModuleMappingFile -import org.jetbrains.kotlin.cli.common.KotlinVersion import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity @@ -53,6 +52,7 @@ import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.config.KotlinCompilerVersion import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.incremental.* @@ -196,7 +196,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return NOTHING_DONE } - messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinVersion.VERSION, CompilerMessageLocation.NO_LOCATION) + messageCollector.report(INFO, "Kotlin JPS plugin version " + KotlinCompilerVersion.VERSION, CompilerMessageLocation.NO_LOCATION) val targetsWithoutOutputDir = targets.filter { it.outputDir == null } if (targetsWithoutOutputDir.isNotEmpty()) { From 89c17e9162a671f9eca6d536d7abe2baa96e3b86 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 12 Dec 2016 12:57:48 +0300 Subject: [PATCH 0897/1557] Minor. Update Lookup test data. Original commit: db5250a61419c7be56c81dd21ef7249cc654608d --- .../lookupTracker/conventions/delegateProperty.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index ca209a50e23..b817e205da6 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,11 +20,11 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue) c:foo.bar.D1(propertyDelegated) c:foo.bar.D1(getPropertyDelegated) c:foo.bar.D1(getPROPERTYDelegated) p:foo.bar(propertyDelegated) p:kotlin(propertyDelegated) p:kotlin.annotation(propertyDelegated) p:kotlin.collections(propertyDelegated) p:kotlin.coroutines(propertyDelegated) p:kotlin.ranges(propertyDelegated) p:kotlin.sequences(propertyDelegated) p:kotlin.text(propertyDelegated) p:java.lang(propertyDelegated) p:kotlin.jvm(propertyDelegated) p:kotlin.io(propertyDelegated)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(toDelegateFor) c:foo.bar.D1(getToDelegateFor) c:foo.bar.D1(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D1(getValue)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(toDelegateFor) c:foo.bar.D1(getToDelegateFor) c:foo.bar.D1(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue) c:foo.bar.D2(propertyDelegated) c:foo.bar.D2(getPropertyDelegated) c:foo.bar.D2(getPROPERTYDelegated) p:foo.bar(propertyDelegated)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(toDelegateFor) c:foo.bar.D2(getToDelegateFor) c:foo.bar.D2(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(toDelegateFor) c:foo.bar.D2(getToDelegateFor) c:foo.bar.D2(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue) c:foo.bar.D3(propertyDelegated) c:foo.bar.D2(propertyDelegated)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(toDelegateFor) c:foo.bar.D2(toDelegateFor) c:foo.bar.D3(getToDelegateFor) c:foo.bar.D3(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(toDelegateFor) c:foo.bar.D2(toDelegateFor) c:foo.bar.D3(getToDelegateFor) c:foo.bar.D3(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() From 28192d0a0232c4f5743540a3849454606c2f73ed Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 12 Dec 2016 14:56:16 +0300 Subject: [PATCH 0898/1557] Rename `toDelegateFor` to `provideDelegate`. Original commit: 9dc9fb578f94e0f2a1786a9535cb9ba8b4623f8f --- .../lookupTracker/conventions/delegateProperty.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index b817e205da6..ca1d169645b 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,11 +20,11 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(toDelegateFor) c:foo.bar.D1(getToDelegateFor) c:foo.bar.D1(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D1(getValue)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(toDelegateFor) c:foo.bar.D1(getToDelegateFor) c:foo.bar.D1(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(toDelegateFor) c:foo.bar.D2(getToDelegateFor) c:foo.bar.D2(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(toDelegateFor) c:foo.bar.D2(getToDelegateFor) c:foo.bar.D2(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(toDelegateFor) c:foo.bar.D2(toDelegateFor) c:foo.bar.D3(getToDelegateFor) c:foo.bar.D3(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(toDelegateFor) c:foo.bar.D2(toDelegateFor) c:foo.bar.D3(getToDelegateFor) c:foo.bar.D3(getTODelegateFor) p:foo.bar(toDelegateFor) p:kotlin(toDelegateFor) p:kotlin.annotation(toDelegateFor) p:kotlin.collections(toDelegateFor) p:kotlin.coroutines(toDelegateFor) p:kotlin.ranges(toDelegateFor) p:kotlin.sequences(toDelegateFor) p:kotlin.text(toDelegateFor) p:java.lang(toDelegateFor) p:kotlin.jvm(toDelegateFor) p:kotlin.io(toDelegateFor) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getProvideDelegate) c:foo.bar.D3(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getProvideDelegate) c:foo.bar.D3(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() From e5a6d21783e72191c00ccbf30d58be9f162461e4 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 12 Dec 2016 16:28:55 +0300 Subject: [PATCH 0899/1557] Remove `propertyDelegate` and fix unused parameter checker for `provideDelegate`. Original commit: dbe8edda5f73832a8c3cd8a8b1bd700ee631f9b9 --- .../lookupTracker/conventions/delegateProperty.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index ca1d169645b..038cdf20c9c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -13,18 +13,18 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } /*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = /*p:kotlin(Int)*/1 -/*p:foo.bar*/fun /*p:foo.bar*/D2.propertyDelegated(p: /*p:foo.bar*/Any?) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar*/Any?, k: /*p:foo.bar*/Any) = /*p:foo.bar(D2)*/this /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { - fun propertyDelegated(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?) {} + operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any) = /*p:foo.bar(D3)*/this } /*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue)*/D1() /*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getProvideDelegate) c:foo.bar.D3(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getProvideDelegate) c:foo.bar.D3(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() From cbd9018ac7309bed6a5324b32c89465389298a93 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Mon, 12 Dec 2016 16:10:19 +0100 Subject: [PATCH 0900/1557] Temporary remove JVM_1_8 target from facet settings Original commit: facee840202840a45e11f04ec31163de810deb0f --- .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 0c2fd311d3a..e5315348240 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -31,12 +31,8 @@ sealed class TargetPlatformKind( ) : DescriptionAware { override val description = "$name ${version.description}" - class Jvm(version: JvmTarget) : TargetPlatformKind(version, "JVM") { - companion object { - val JVM_PLATFORMS by lazy { JvmTarget.values().map(::Jvm) } - - operator fun get(version: JvmTarget) = JVM_PLATFORMS[version.ordinal] - } + sealed class Jvm(version: JvmTarget) : TargetPlatformKind(version, "JVM") { + object JVM_1_6 : Jvm(JvmTarget.JVM_1_6) } object JavaScript : TargetPlatformKind(NoVersion, "JavaScript") @@ -44,7 +40,7 @@ sealed class TargetPlatformKind( object Default : TargetPlatformKind(NoVersion, "Default (experimental)") companion object { - val ALL_PLATFORMS: List> by lazy { Jvm.JVM_PLATFORMS + JavaScript + Default } + val ALL_PLATFORMS: List> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Default) } } } From dc4493a544500c611cbe6cbb8e309f01f28225f9 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Thu, 15 Dec 2016 04:07:06 +0300 Subject: [PATCH 0901/1557] Update test data for LookupTracker (removed package kotlin.coroutines from default imports) Original commit: 509a50431878f63501409d08d43eb337fd66c47d --- .../lookupTracker/classifierMembers/foo.kt | 10 ++++----- .../lookupTracker/classifierMembers/usages.kt | 18 +++++++-------- .../conventions/delegateProperty.kt | 4 ++-- .../conventions/mathematicalLike.kt | 8 +++---- .../expressionType/inferredType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 +++++++++---------- .../lookupTracker/packageDeclarations/foo1.kt | 6 ++--- .../syntheticProperties/usages.kt | 14 ++++++------ 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 17c89e0a55b..97a888a3418 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index e76140f88de..24f571473f3 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/vara() + /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/bar() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 038cdf20c9c..2ce83a59781 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,8 +20,8 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.coroutines(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() /*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() /*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 44e9f0a12b3..e5d11c6df21 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.coroutines(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.coroutines(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.coroutines(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:java.lang(times) p:kotlin.jvm(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.coroutines(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:java.lang(div) p:kotlin.jvm(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:java.lang(times) p:kotlin.jvm(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:java.lang(div) p:kotlin.jvm(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index cfddd0ab562..58e483e5988 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -6,8 +6,8 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) /*p:foo*/fun useListOfA(a: /*p:foo*/List) {} /*p:foo*/fun useListOfB(b: /*p:foo*/List) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 703aa26548c..47b6ca1eb83 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -11,27 +11,27 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 906b1d3a540..67c1b46dcbe 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,7 +4,7 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:baz(B)*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ /*p:foo p:bar(A)*/a @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/MyClass() + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 92874306470..56d26e3edb1 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = /*p:foo*/KotlinClass() /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/setFoo(2) + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/setFoo(2) /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/bazBaz - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/boo = /*p:kotlin(Int)*/2 + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/boo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/bazBaz - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/bazBaz + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.coroutines p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 } From 85f851c7e2f050f63093df08c759fa521811b623 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 12 Dec 2016 15:27:47 +0300 Subject: [PATCH 0902/1557] Kotlin Facet: Add coroutine support setting Original commit: 9460426d26521fe82aa11eb33e518fba435af35c --- .../kotlin/config/KotlinFacetSettings.kt | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index e5315348240..ad01bd8bec3 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -61,6 +61,22 @@ data class KotlinVersionInfo( } } +enum class CoroutineSupport( + override val description: String, + val compilerArgument: String +) : DescriptionAware { + ENABLED("Enabled", "enabled"), + ENABLED_WITH_WARNING("Enabled with warning", "warning"), + DISABLED("Disabled", "disabled"); + + companion object { + val DEFAULT = ENABLED_WITH_WARNING + + @JvmStatic fun byCompilerArgument(value: String?) = CoroutineSupport.values().firstOrNull { it.compilerArgument == value } + ?: CoroutineSupport.DEFAULT + } +} + class KotlinCompilerInfo { // To be serialized @Property private var _commonCompilerArguments: CommonCompilerArguments.DummyImpl? = null @@ -71,6 +87,12 @@ class KotlinCompilerInfo { } var k2jsCompilerArguments: K2JSCompilerArguments? = null var compilerSettings: CompilerSettings? = null + + @get:Transient var coroutineSupport: CoroutineSupport + get() = CoroutineSupport.byCompilerArgument(commonCompilerArguments?.coroutineSupport) + set(value) { + commonCompilerArguments?.coroutineSupport = value.compilerArgument + } } class KotlinFacetSettings { From eb76293fc7ddc802e1bfcf79a4accdbc5142dfaa Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Wed, 14 Dec 2016 17:37:59 +0300 Subject: [PATCH 0903/1557] Adapt facet, map coroutine settings on three keys Original commit: 091756b221233bdd4d92856cf4e1fe5e26784cec --- .../kotlin/config/KotlinFacetSettings.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index ad01bd8bec3..df88aaef1f6 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -72,8 +72,13 @@ enum class CoroutineSupport( companion object { val DEFAULT = ENABLED_WITH_WARNING - @JvmStatic fun byCompilerArgument(value: String?) = CoroutineSupport.values().firstOrNull { it.compilerArgument == value } - ?: CoroutineSupport.DEFAULT + @JvmStatic fun byCompilerArguments(arguments: CommonCompilerArguments?) = when { + arguments == null -> DEFAULT + arguments.coroutinesEnable -> ENABLED + arguments.coroutinesWarn -> ENABLED_WITH_WARNING + arguments.coroutinesError -> DISABLED + else -> DEFAULT + } } } @@ -89,9 +94,11 @@ class KotlinCompilerInfo { var compilerSettings: CompilerSettings? = null @get:Transient var coroutineSupport: CoroutineSupport - get() = CoroutineSupport.byCompilerArgument(commonCompilerArguments?.coroutineSupport) + get() = CoroutineSupport.byCompilerArguments(commonCompilerArguments) set(value) { - commonCompilerArguments?.coroutineSupport = value.compilerArgument + commonCompilerArguments?.coroutinesEnable = value == CoroutineSupport.ENABLED + commonCompilerArguments?.coroutinesWarn = value == CoroutineSupport.ENABLED_WITH_WARNING + commonCompilerArguments?.coroutinesError = value == CoroutineSupport.DISABLED } } From 343c1c5dee82f5cb07702e679c53ef3e640b4840 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Thu, 15 Dec 2016 12:31:26 +0300 Subject: [PATCH 0904/1557] Import kotlin.coroutines property from gradle to facet Original commit: 2ff04f2bc5a03ea856c6928318d4504f860ade31 --- .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index df88aaef1f6..da10a80bcb3 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -65,9 +65,9 @@ enum class CoroutineSupport( override val description: String, val compilerArgument: String ) : DescriptionAware { - ENABLED("Enabled", "enabled"), - ENABLED_WITH_WARNING("Enabled with warning", "warning"), - DISABLED("Disabled", "disabled"); + ENABLED("Enabled", "enable"), + ENABLED_WITH_WARNING("Enabled with warning", "warn"), + DISABLED("Disabled", "error"); companion object { val DEFAULT = ENABLED_WITH_WARNING @@ -79,6 +79,10 @@ enum class CoroutineSupport( arguments.coroutinesError -> DISABLED else -> DEFAULT } + + fun byCompilerArgument(argument: String): CoroutineSupport { + return CoroutineSupport.values().find { it.compilerArgument == argument } ?: DEFAULT + } } } From 45c849b8ca88517a30eedf5cc7dca1ab5ccbed3e Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Thu, 15 Dec 2016 19:54:03 +0300 Subject: [PATCH 0905/1557] Global rename in test data for coroutines (cherry picked from commit 132f97b) Original commit: b527a4d158cf5be0dc43fdfed6a97c5209a7a6f3 --- .../testData/incremental/inlineFunCallSite/coroutine/usage.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt index ec35bbd5b0c..cbadda3b8fc 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt @@ -5,7 +5,7 @@ fun async(coroutine x: Controller.() -> Continuation) { } class Controller { - suspend fun step(param: Int) = suspendWithCurrentContinuation { next -> + suspend fun step(param: Int) = CoroutineIntrinsics.suspendCoroutineOrReturn { next -> next.resume(param + 1) } } From a4eb3ccd9d4efed1293937baadb36976f034c589 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 16 Dec 2016 00:56:13 +0300 Subject: [PATCH 0906/1557] Fixed testdata. Original commit: d7566d84d036da076241b1d04c5abb049aef8ceb --- .../incremental/inlineFunCallSite/coroutine/build.log | 1 + .../incremental/inlineFunCallSite/coroutine/usage.kt | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log index c8c6fee67d7..bc387a97aa3 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/build.log @@ -14,6 +14,7 @@ Exit code: ADDITIONAL_PASS_REQUIRED Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/usage/Controller.class + out/production/module/usage/UsageKt$async$1.class out/production/module/usage/UsageKt$bar$1.class out/production/module/usage/UsageKt.class End of files diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt index cbadda3b8fc..d2c7c5c40a7 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt @@ -1,7 +1,12 @@ package usage +import kotlin.coroutines.* -fun async(coroutine x: Controller.() -> Continuation) { - x(Controller()).resume(Unit) +fun async(x: suspend Controller.() -> Unit) { + x.startCoroutine(Controller(), object : Continuation { + override fun resume(value: Unit) {} + + override fun resumeWithException(exception: Throwable) {} + }) } class Controller { From e48af8ca1aaca72db5c032e0c2c87ddefb1c038d Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 13 Dec 2016 16:38:40 +0300 Subject: [PATCH 0907/1557] Kotlin Facet: Add "Use project settings" option Original commit: eac0c9b2ed24cc582fd9f8758b7903652aa18dad --- .../jetbrains/kotlin/config/KotlinFacetSettings.kt | 2 ++ .../kotlin/jps/JpsKotlinCompilerSettings.kt | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index da10a80bcb3..df26ced324f 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -113,6 +113,8 @@ class KotlinFacetSettings { val DEFAULT_VERSION = 0 } + var useProjectSettings: Boolean = false + var versionInfo = KotlinVersionInfo() var compilerInfo = KotlinCompilerInfo() } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 6b0f860732d..870246222e2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -64,6 +64,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments { val defaultArguments = getSettings(module.project).commonCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments + if (facetSettings.useProjectSettings) return defaultArguments val (languageLevel, apiLevel) = facetSettings.versionInfo return facetSettings.compilerInfo.commonCompilerArguments?.apply { languageVersion = languageLevel?.description @@ -78,6 +79,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { fun getK2JvmCompilerArguments(module: JpsModule): K2JVMCompilerArguments { val defaultArguments = getSettings(module.project).k2JvmCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments + if (facetSettings.useProjectSettings) return defaultArguments val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? TargetPlatformKind.Jvm ?: return defaultArguments return copyBean(defaultArguments).apply { jvmTarget = targetPlatform.version.description @@ -89,8 +91,10 @@ class JpsKotlinCompilerSettings : JpsElementBase() { } fun getK2JsCompilerArguments(module: JpsModule): K2JSCompilerArguments { - return module.kotlinFacetExtension?.settings?.compilerInfo?.k2jsCompilerArguments - ?: getSettings(module.project).k2JsCompilerArguments + val defaultArguments = getSettings(module.project).k2JsCompilerArguments + val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments + if (facetSettings.useProjectSettings) return defaultArguments + return facetSettings.compilerInfo.k2jsCompilerArguments ?: defaultArguments } fun setK2JsCompilerArguments(project: JpsProject, k2JsCompilerArguments: K2JSCompilerArguments) { @@ -98,7 +102,10 @@ class JpsKotlinCompilerSettings : JpsElementBase() { } fun getCompilerSettings(module: JpsModule): CompilerSettings { - return module.kotlinFacetExtension?.settings?.compilerInfo?.compilerSettings ?: getSettings(module.project).compilerSettings + val defaultSettings = getSettings(module.project).compilerSettings + val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultSettings + if (facetSettings.useProjectSettings) return defaultSettings + return facetSettings.compilerInfo.compilerSettings ?: defaultSettings } fun setCompilerSettings(project: JpsProject, compilerSettings: CompilerSettings) { From cfe9f0d57933423a589f3e98b5dc2cac300e4108 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 16 Dec 2016 15:08:24 +0300 Subject: [PATCH 0908/1557] Multi-platform Projects: Enable multi-platform projects for platform modules which depend on common modules Original commit: 332d1f64055f84910c13a607542df4dddabb6188 --- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 870246222e2..3aae4895765 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -20,6 +20,7 @@ import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.ex.JpsElementBase import org.jetbrains.jps.model.ex.JpsElementChildRoleBase import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.jps.model.module.JpsModuleDependency import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments @@ -61,15 +62,27 @@ class JpsKotlinCompilerSettings : JpsElementBase() { return settings } + private val JpsModule.targetPlatform: TargetPlatformKind<*>? + get() { + val facetSettings = kotlinFacetExtension?.settings ?: return TargetPlatformKind.Default + if (facetSettings.useProjectSettings) return TargetPlatformKind.Default + return facetSettings.versionInfo.targetPlatformKind + } + fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments { val defaultArguments = getSettings(module.project).commonCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments if (facetSettings.useProjectSettings) return defaultArguments val (languageLevel, apiLevel) = facetSettings.versionInfo - return facetSettings.compilerInfo.commonCompilerArguments?.apply { + val facetArguments = facetSettings.compilerInfo.commonCompilerArguments ?: return defaultArguments + return copyBean(facetArguments).apply { languageVersion = languageLevel?.description apiVersion = apiLevel?.description - } ?: defaultArguments + multiPlatform = module + .dependenciesList + .dependencies + .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Default } + } } fun setCommonCompilerArguments(project: JpsProject, commonCompilerSettings: CommonCompilerArguments) { From 31ea161c80e031a4627d3c9289113e0e02d7813a Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Mon, 19 Dec 2016 18:31:26 +0300 Subject: [PATCH 0909/1557] Minor: Rename "Default" platform to "Common" Original commit: a84275b05740ad2dc2f149a21d136108576912da --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 4 ++-- .../org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index df26ced324f..1d98580d35d 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -37,10 +37,10 @@ sealed class TargetPlatformKind( object JavaScript : TargetPlatformKind(NoVersion, "JavaScript") - object Default : TargetPlatformKind(NoVersion, "Default (experimental)") + object Common : TargetPlatformKind(NoVersion, "Common (experimental)") companion object { - val ALL_PLATFORMS: List> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Default) } + val ALL_PLATFORMS: List> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Common) } } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 3aae4895765..c511a460d09 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -64,8 +64,8 @@ class JpsKotlinCompilerSettings : JpsElementBase() { private val JpsModule.targetPlatform: TargetPlatformKind<*>? get() { - val facetSettings = kotlinFacetExtension?.settings ?: return TargetPlatformKind.Default - if (facetSettings.useProjectSettings) return TargetPlatformKind.Default + val facetSettings = kotlinFacetExtension?.settings ?: return TargetPlatformKind.Common + if (facetSettings.useProjectSettings) return TargetPlatformKind.Common return facetSettings.versionInfo.targetPlatformKind } @@ -81,7 +81,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { multiPlatform = module .dependenciesList .dependencies - .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Default } + .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common } } } From 9879cb49d9ad43b3254d61c4bf780a259d583ebf Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Nov 2016 17:20:37 +0300 Subject: [PATCH 0910/1557] Convert CompilerEnvironment to Kotlin: rename file Original commit: f98dde45438f5f03542dc1a04c7edfc50ccc5213 --- .../{CompilerEnvironment.java => CompilerEnvironment.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/{CompilerEnvironment.java => CompilerEnvironment.kt} (100%) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt similarity index 100% rename from jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java rename to jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt From 1537f6cb3cddc4ae34612d73db28ee9bb294b019 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Nov 2016 17:23:34 +0300 Subject: [PATCH 0911/1557] Convert CompilerEnvironment to Kotlin: actual conversion Original commit: e3550c5ea251effa16c6350dee43ca0904034064 --- .../compilerRunner/CompilerEnvironment.kt | 80 +++++++------------ 1 file changed, 28 insertions(+), 52 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt index c4df720924d..119b0357974 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt @@ -14,65 +14,41 @@ * limitations under the License. */ -package org.jetbrains.kotlin.compilerRunner; +package org.jetbrains.kotlin.compilerRunner -import org.jetbrains.annotations.NotNull; -import org.jetbrains.kotlin.cli.common.messages.MessageCollector; -import org.jetbrains.kotlin.config.Services; -import org.jetbrains.kotlin.preloading.ClassCondition; -import org.jetbrains.kotlin.utils.KotlinPaths; -import org.jetbrains.kotlin.utils.PathUtil; +import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.preloading.ClassCondition +import org.jetbrains.kotlin.utils.KotlinPaths +import org.jetbrains.kotlin.utils.PathUtil -import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR; +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.Companion.NO_LOCATION +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR -public class CompilerEnvironment { - @NotNull - public static CompilerEnvironment getEnvironmentFor( - @NotNull KotlinPaths kotlinPaths, - @NotNull ClassCondition classesToLoadByParent, - @NotNull Services compilerServices - ) { - return new CompilerEnvironment(kotlinPaths, classesToLoadByParent, compilerServices); +class CompilerEnvironment private constructor( + val kotlinPaths: KotlinPaths, + val classesToLoadByParent: ClassCondition, + val services: Services +) { + + fun success(): Boolean { + return kotlinPaths.homePath.exists() } - private final KotlinPaths kotlinPaths; - private final ClassCondition classesToLoadByParent; - private final Services services; - - private CompilerEnvironment( - @NotNull KotlinPaths kotlinPaths, - @NotNull ClassCondition classesToLoadByParent, - @NotNull Services services - ) { - this.kotlinPaths = kotlinPaths; - this.classesToLoadByParent = classesToLoadByParent; - this.services = services; - } - - public boolean success() { - return kotlinPaths.getHomePath().exists(); - } - - @NotNull - public KotlinPaths getKotlinPaths() { - return kotlinPaths; - } - - @NotNull - public ClassCondition getClassesToLoadByParent() { - return classesToLoadByParent; - } - - public void reportErrorsTo(@NotNull MessageCollector messageCollector) { - if (!kotlinPaths.getHomePath().exists()) { - messageCollector.report(ERROR, "Cannot find kotlinc home: " + kotlinPaths.getHomePath() + ". Make sure plugin is properly installed, " + - "or specify " + PathUtil.JPS_KOTLIN_HOME_PROPERTY + " system property", NO_LOCATION); + fun reportErrorsTo(messageCollector: MessageCollector) { + if (!kotlinPaths.homePath.exists()) { + messageCollector.report(ERROR, "Cannot find kotlinc home: " + kotlinPaths.homePath + ". Make sure plugin is properly installed, " + + "or specify " + PathUtil.JPS_KOTLIN_HOME_PROPERTY + " system property", NO_LOCATION) } } - @NotNull - public Services getServices() { - return services; + companion object { + fun getEnvironmentFor( + kotlinPaths: KotlinPaths, + classesToLoadByParent: ClassCondition, + compilerServices: Services + ): CompilerEnvironment { + return CompilerEnvironment(kotlinPaths, classesToLoadByParent, compilerServices) + } } } From 3c97d0650a255e0669f1220d58051defac0ea862 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Nov 2016 18:29:09 +0300 Subject: [PATCH 0912/1557] Introduce compiler-runner module Original commit: 896d81143c1d5dfc7449620b29f6802afa6fb933 --- jps/jps-plugin/jps-plugin.iml | 1 + .../compilerRunner/CompilerEnvironment.kt | 54 ---- .../compilerRunner/CompilerOutputParser.java | 188 ------------ .../compilerRunner/KotlinCompilerRunner.kt | 267 ------------------ 4 files changed, 1 insertion(+), 509 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index b7f14f215a5..21a11f39ee9 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -10,6 +10,7 @@ + diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt deleted file mode 100644 index 119b0357974..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.kt +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.compilerRunner - -import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.config.Services -import org.jetbrains.kotlin.preloading.ClassCondition -import org.jetbrains.kotlin.utils.KotlinPaths -import org.jetbrains.kotlin.utils.PathUtil - -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.Companion.NO_LOCATION -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR - -class CompilerEnvironment private constructor( - val kotlinPaths: KotlinPaths, - val classesToLoadByParent: ClassCondition, - val services: Services -) { - - fun success(): Boolean { - return kotlinPaths.homePath.exists() - } - - fun reportErrorsTo(messageCollector: MessageCollector) { - if (!kotlinPaths.homePath.exists()) { - messageCollector.report(ERROR, "Cannot find kotlinc home: " + kotlinPaths.homePath + ". Make sure plugin is properly installed, " + - "or specify " + PathUtil.JPS_KOTLIN_HOME_PROPERTY + " system property", NO_LOCATION) - } - } - - companion object { - fun getEnvironmentFor( - kotlinPaths: KotlinPaths, - classesToLoadByParent: ClassCondition, - compilerServices: Services - ): CompilerEnvironment { - return CompilerEnvironment(kotlinPaths, classesToLoadByParent, compilerServices) - } - } -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java deleted file mode 100644 index beaebcab7f1..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java +++ /dev/null @@ -1,188 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.compilerRunner; - -import com.intellij.openapi.util.io.FileUtil; -import com.intellij.util.containers.ContainerUtil; -import com.intellij.util.containers.Stack; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation; -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity; -import org.jetbrains.kotlin.cli.common.messages.MessageCollector; -import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil; -import org.xml.sax.Attributes; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; -import org.xml.sax.helpers.DefaultHandler; - -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import java.io.IOException; -import java.io.Reader; -import java.util.Map; - -import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation.NO_LOCATION; -import static org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.*; -import static org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil.reportException; - -public class CompilerOutputParser { - public static void parseCompilerMessagesFromReader(MessageCollector messageCollector, final Reader reader, OutputItemsCollector collector) { - // Sometimes the compiler doesn't output valid XML. - // Example: error in command line arguments passed to the compiler. - // The compiler will print the usage and the SAX parser will break. - // In this case, we want to read everything from this stream and report it as an IDE error. - final StringBuilder stringBuilder = new StringBuilder(); - Reader wrappingReader = new Reader() { - @Override - public int read(@NotNull char[] cbuf, int off, int len) throws IOException { - int read = reader.read(cbuf, off, len); - stringBuilder.append(cbuf, off, len); - return read; - } - - @Override - public void close() throws IOException { - // Do nothing: - // If the SAX parser sees a syntax error, it throws an exception - // and calls close() on the reader. - // We prevent hte reader from being closed here, and close it later, - // when all the text is read from it - } - }; - try { - SAXParserFactory factory = SAXParserFactory.newInstance(); - SAXParser parser = factory.newSAXParser(); - parser.parse(new InputSource(wrappingReader), new CompilerOutputSAXHandler(messageCollector, collector)); - } - catch (Throwable e) { - // Load all the text into the stringBuilder - try { - // This will not close the reader (see the wrapper above) - FileUtil.loadTextAndClose(wrappingReader); - } - catch (IOException ioException) { - reportException(messageCollector, ioException); - } - String message = stringBuilder.toString(); - reportException(messageCollector, new IllegalStateException(message, e)); - messageCollector.report(ERROR, message, NO_LOCATION); - } - finally { - try { - reader.close(); - } - catch (IOException e) { - reportException(messageCollector, e); - } - } - } - - private static class CompilerOutputSAXHandler extends DefaultHandler { - private static final Map CATEGORIES = new ContainerUtil.ImmutableMapBuilder() - .put("error", ERROR) - .put("warning", WARNING) - .put("logging", LOGGING) - .put("output", OUTPUT) - .put("exception", EXCEPTION) - .put("info", INFO) - .put("messages", INFO) // Root XML element - .build(); - - private final MessageCollector messageCollector; - private final OutputItemsCollector collector; - - private final StringBuilder message = new StringBuilder(); - private final Stack tags = new Stack(); - private String path; - private int line; - private int column; - - public CompilerOutputSAXHandler(MessageCollector messageCollector, OutputItemsCollector collector) { - this.messageCollector = messageCollector; - this.collector = collector; - } - - @Override - public void startElement(@NotNull String uri, @NotNull String localName, @NotNull String qName, @NotNull Attributes attributes) - throws SAXException { - tags.push(qName); - - message.setLength(0); - - path = attributes.getValue("path"); - line = safeParseInt(attributes.getValue("line"), -1); - column = safeParseInt(attributes.getValue("column"), -1); - } - - @Override - public void characters(char[] ch, int start, int length) throws SAXException { - if (tags.size() == 1) { - // We're directly inside the root tag: - String message = new String(ch, start, length); - if (!message.trim().isEmpty()) { - messageCollector.report(ERROR, "Unhandled compiler output: " + message, NO_LOCATION); - } - } - else { - message.append(ch, start, length); - } - } - - @Override - public void endElement(String uri, @NotNull String localName, @NotNull String qName) throws SAXException { - if (tags.size() == 1) { - // We're directly inside the root tag: - return; - } - String qNameLowerCase = qName.toLowerCase(); - CompilerMessageSeverity category = CATEGORIES.get(qNameLowerCase); - if (category == null) { - messageCollector.report(ERROR, "Unknown compiler message tag: " + qName, NO_LOCATION); - category = INFO; - } - String text = message.toString(); - - if (category == OUTPUT) { - reportToCollector(text); - } - else { - messageCollector.report(category, text, CompilerMessageLocation.create(path, line, column, null)); - } - tags.pop(); - } - - private void reportToCollector(String text) { - OutputMessageUtil.Output output = OutputMessageUtil.parseOutputMessage(text); - if (output != null) { - collector.add(output.sourceFiles, output.outputFile); - } - } - - private static int safeParseInt(@Nullable String value, int defaultValue) { - if (value == null) { - return defaultValue; - } - try { - return Integer.parseInt(value.trim()); - } - catch (NumberFormatException e) { - return defaultValue; - } - } - } -} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt deleted file mode 100644 index 011550c9845..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.kt +++ /dev/null @@ -1,267 +0,0 @@ -/* - * Copyright 2010-2015 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.kotlin.compilerRunner - -import org.jetbrains.jps.api.GlobalOptions -import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.mergeBeans -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.INFO -import org.jetbrains.kotlin.cli.common.messages.MessageCollector -import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil -import org.jetbrains.kotlin.config.CompilerSettings -import org.jetbrains.kotlin.daemon.client.CompilationServices -import org.jetbrains.kotlin.daemon.client.DaemonReportMessage -import org.jetbrains.kotlin.daemon.client.DaemonReportingTargets -import org.jetbrains.kotlin.daemon.client.KotlinCompilerClient -import org.jetbrains.kotlin.daemon.common.* -import org.jetbrains.kotlin.jps.build.KotlinBuilder -import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents -import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import java.io.* -import java.util.* -import java.util.concurrent.TimeUnit - -object KotlinCompilerRunner { - private val K2JVM_COMPILER = "org.jetbrains.kotlin.cli.jvm.K2JVMCompiler" - private val K2JS_COMPILER = "org.jetbrains.kotlin.cli.js.K2JSCompiler" - private val INTERNAL_ERROR = ExitCode.INTERNAL_ERROR.toString() - - fun runK2JvmCompiler( - commonArguments: CommonCompilerArguments, - k2jvmArguments: K2JVMCompilerArguments, - compilerSettings: CompilerSettings, - messageCollector: MessageCollector, - environment: CompilerEnvironment, - moduleFile: File, - collector: OutputItemsCollector) { - val arguments = mergeBeans(commonArguments, k2jvmArguments) - setupK2JvmArguments(moduleFile, arguments) - - runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) - } - - fun runK2JsCompiler( - commonArguments: CommonCompilerArguments, - k2jsArguments: K2JSCompilerArguments, - compilerSettings: CompilerSettings, - messageCollector: MessageCollector, - environment: CompilerEnvironment, - collector: OutputItemsCollector, - sourceFiles: Collection, - libraryFiles: List, - outputFile: File) { - val arguments = mergeBeans(commonArguments, k2jsArguments) - setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments) - - runCompiler(K2JS_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) - } - - private fun processCompilerOutput( - messageCollector: MessageCollector, - collector: OutputItemsCollector, - stream: ByteArrayOutputStream, - exitCode: String) { - val reader = BufferedReader(StringReader(stream.toString())) - CompilerOutputParser.parseCompilerMessagesFromReader(messageCollector, reader, collector) - - if (INTERNAL_ERROR == exitCode) { - reportInternalCompilerError(messageCollector) - } - } - - private fun reportInternalCompilerError(messageCollector: MessageCollector) { - messageCollector.report(ERROR, "Compiler terminated with internal error", CompilerMessageLocation.NO_LOCATION) - } - - private fun runCompiler( - compilerClassName: String, - arguments: CommonCompilerArguments, - additionalArguments: String, - messageCollector: MessageCollector, - collector: OutputItemsCollector, - environment: CompilerEnvironment) { - try { - messageCollector.report(INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) - - val argumentsList = ArgumentUtils.convertArgumentsToStringList(arguments) - argumentsList.addAll(additionalArguments.split(" ")) - - val argsArray = argumentsList.toTypedArray() - - if (!tryCompileWithDaemon(compilerClassName, argsArray, environment, messageCollector, collector)) { - // otherwise fallback to in-process - KotlinBuilder.LOG.info("Compile in-process") - - val stream = ByteArrayOutputStream() - val out = PrintStream(stream) - - // the property should be set at least for parallel builds to avoid parallel building problems (racing between destroying and using environment) - // unfortunately it cannot be currently set by default globally, because it breaks many tests - // since there is no reliable way so far to detect running under tests, switching it on only for parallel builds - if (System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false").toBoolean()) - System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") - - val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out) - - // exec() returns an ExitCode object, class of which is loaded with a different class loader, - // so we take it's contents through reflection - processCompilerOutput(messageCollector, collector, stream, getReturnCodeFromObject(rc)) - } - } - catch (e: Throwable) { - MessageCollectorUtil.reportException(messageCollector, e) - reportInternalCompilerError(messageCollector) - } - - } - - internal class DaemonConnection(val daemon: CompileService?, val sessionId: Int = CompileService.NO_SESSION) - - internal object getDaemonConnection { - private @Volatile var connection: DaemonConnection? = null - - @Synchronized operator fun invoke(environment: CompilerEnvironment, messageCollector: MessageCollector): DaemonConnection { - if (connection == null) { - val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) - val compilerId = CompilerId.makeCompilerId(File(libPath, "kotlin-compiler.jar")) - val daemonOptions = configureDaemonOptions() - val daemonJVMOptions = configureDaemonJVMOptions(inheritMemoryLimits = true, inheritAdditionalProperties = true) - - val daemonReportMessages = ArrayList() - - val profiler = if (daemonOptions.reportPerf) WallAndThreadAndMemoryTotalProfiler(withGC = false) else DummyProfiler() - - profiler.withMeasure(null) { - val daemon = KotlinCompilerClient.connectToCompileService(compilerId, daemonJVMOptions, daemonOptions, DaemonReportingTargets(null, daemonReportMessages), true, true) - connection = DaemonConnection(daemon, daemon?.leaseCompileSession(makeAutodeletingFlagFile("compiler-jps-session").absolutePath)?.get() ?: CompileService.NO_SESSION) - } - - for (msg in daemonReportMessages) { - messageCollector.report(CompilerMessageSeverity.INFO, - (if (msg.category == DaemonReportCategory.EXCEPTION && connection?.daemon == null) "Falling back to compilation without daemon due to error: " else "") + msg.message, - CompilerMessageLocation.NO_LOCATION) - } - - reportTotalAndThreadPerf("Daemon connect", daemonOptions, messageCollector, profiler) - } - return connection!! - } - } - - private fun tryCompileWithDaemon(compilerClassName: String, - argsArray: Array, - environment: CompilerEnvironment, - messageCollector: MessageCollector, - collector: OutputItemsCollector, - retryOnConnectionError: Boolean = true): Boolean { - - if (isDaemonEnabled()) { - - KotlinBuilder.LOG.debug("Try to connect to daemon") - val connection = getDaemonConnection(environment, messageCollector) - - if (connection.daemon != null) { - KotlinBuilder.LOG.info("Connected to daemon") - - val compilerOut = ByteArrayOutputStream() - val daemonOut = ByteArrayOutputStream() - - val services = CompilationServices( - incrementalCompilationComponents = environment.services.get(IncrementalCompilationComponents::class.java), - compilationCanceledStatus = environment.services.get(CompilationCanceledStatus::class.java)) - - val targetPlatform = when (compilerClassName) { - K2JVM_COMPILER -> CompileService.TargetPlatform.JVM - K2JS_COMPILER -> CompileService.TargetPlatform.JS - else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName") - } - - fun retryOrFalse(e: Exception): Boolean { - if (retryOnConnectionError) { - KotlinBuilder.LOG.debug("retrying once on daemon connection error: ${e.message}") - return tryCompileWithDaemon(compilerClassName, argsArray, environment, messageCollector, collector, retryOnConnectionError = false) - } - KotlinBuilder.LOG.info("daemon connection error: ${e.message}") - return false - } - - val res: Int = try { - KotlinCompilerClient.incrementalCompile(connection.daemon, connection.sessionId, targetPlatform, argsArray, services, compilerOut, daemonOut) - } - catch (e: java.rmi.ConnectException) { - return retryOrFalse(e) - } - catch (e: java.rmi.UnmarshalException) { - return retryOrFalse(e) - } - - processCompilerOutput(messageCollector, collector, compilerOut, res.toString()) - BufferedReader(StringReader(daemonOut.toString())).forEachLine { - messageCollector.report(CompilerMessageSeverity.INFO, it, CompilerMessageLocation.NO_LOCATION) - } - return true - } - - KotlinBuilder.LOG.info("Daemon not found") - } - return false - } - - private fun reportTotalAndThreadPerf(message: String, daemonOptions: DaemonOptions, messageCollector: MessageCollector, profiler: Profiler) { - if (daemonOptions.reportPerf) { - fun Long.ms() = TimeUnit.NANOSECONDS.toMillis(this) - val counters = profiler.getTotalCounters() - messageCollector.report(INFO, - "PERF: $message ${counters.time.ms()} ms, thread ${counters.threadTime.ms()}", - CompilerMessageLocation.NO_LOCATION) - } - } - - private fun getReturnCodeFromObject(rc: Any?): String { - when { - rc == null -> return INTERNAL_ERROR - ExitCode::class.java.name == rc.javaClass.name -> return rc.toString() - else -> throw IllegalStateException("Unexpected return: " + rc) - } - } - - private fun setupK2JvmArguments(moduleFile: File, settings: K2JVMCompilerArguments) { - with(settings) { - module = moduleFile.absolutePath - noStdlib = true - noReflect = true - noJdk = true - } - } - - private fun setupK2JsArguments( _outputFile: File, sourceFiles: Collection, _libraryFiles: List, settings: K2JSCompilerArguments) { - with(settings) { - noStdlib = true - freeArgs = sourceFiles.map { it.path } - outputFile = _outputFile.path - metaInfo = true - libraryFiles = _libraryFiles.toTypedArray() - } - } -} From df2ad5c856392b100f3f84337b993f0f718370ea Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 3 Nov 2016 15:47:01 +0300 Subject: [PATCH 0913/1557] Refactoring: extract JPS specific code from compiler-runner Original commit: 0be4299c8a4ba3015437ecbc9c8c0e8eb53e0e88 --- .../compilerRunner/CompilerRunnerUtil.java | 4 +- .../compilerRunner/JpsCompilerEnvironment.kt | 42 +++++ .../compilerRunner/JpsKotlinCompilerRunner.kt | 154 ++++++++++++++++++ .../kotlin/compilerRunner/JpsKotlinLogger.kt | 37 +++++ .../kotlin/jps/build/KotlinBuilder.kt | 27 +-- 5 files changed, 249 insertions(+), 15 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index 6f93cb03680..ab4343f24ee 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -39,7 +39,7 @@ public class CompilerRunnerUtil { @NotNull private static synchronized ClassLoader getOrCreateClassLoader( - @NotNull CompilerEnvironment environment, + @NotNull JpsCompilerEnvironment environment, @NotNull File libPath ) throws IOException { ClassLoader classLoader = ourClassLoaderRef.get(); @@ -73,7 +73,7 @@ public class CompilerRunnerUtil { public static Object invokeExecMethod( @NotNull String compilerClassName, @NotNull String[] arguments, - @NotNull CompilerEnvironment environment, + @NotNull JpsCompilerEnvironment environment, @NotNull MessageCollector messageCollector, @NotNull PrintStream out ) throws Exception { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt new file mode 100644 index 00000000000..dd35f5e1ad0 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt @@ -0,0 +1,42 @@ +/* + * Copyright 2010-2016 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.kotlin.compilerRunner + +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.config.Services +import org.jetbrains.kotlin.preloading.ClassCondition +import org.jetbrains.kotlin.utils.KotlinPaths +import org.jetbrains.kotlin.utils.PathUtil + +class JpsCompilerEnvironment( + val kotlinPaths: KotlinPaths, + services: Services, + val classesToLoadByParent: ClassCondition +) : CompilerEnvironment(services) { + fun success(): Boolean { + return kotlinPaths.homePath.exists() + } + + fun reportErrorsTo(messageCollector: MessageCollector) { + if (!kotlinPaths.homePath.exists()) { + messageCollector.report(CompilerMessageSeverity.ERROR, "Cannot find kotlinc home: " + kotlinPaths.homePath + ". Make sure plugin is properly installed, " + + "or specify " + PathUtil.JPS_KOTLIN_HOME_PROPERTY + " system property", CompilerMessageLocation.NO_LOCATION) + } + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt new file mode 100644 index 00000000000..ad0760629b2 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -0,0 +1,154 @@ +/* + * Copyright 2010-2016 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.kotlin.compilerRunner + +import org.jetbrains.jps.api.GlobalOptions +import org.jetbrains.kotlin.cli.common.ExitCode +import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.mergeBeans +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.MessageCollector +import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.daemon.common.isDaemonEnabled +import org.jetbrains.kotlin.jps.build.KotlinBuilder +import java.io.ByteArrayOutputStream +import java.io.File +import java.io.PrintStream + +class JpsKotlinCompilerRunner : KotlinCompilerRunner() { + override val log: KotlinLogger = JpsKotlinLogger(KotlinBuilder.LOG) + + companion object { + private @Volatile var jpsDaemonConnection: DaemonConnection? = null + } + + fun runK2JvmCompiler( + commonArguments: CommonCompilerArguments, + k2jvmArguments: K2JVMCompilerArguments, + compilerSettings: CompilerSettings, + messageCollector: MessageCollector, + environment: JpsCompilerEnvironment, + moduleFile: File, + collector: OutputItemsCollector + ) { + val arguments = mergeBeans(commonArguments, k2jvmArguments) + setupK2JvmArguments(moduleFile, arguments) + + runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) + } + + fun runK2JsCompiler( + commonArguments: CommonCompilerArguments, + k2jsArguments: K2JSCompilerArguments, + compilerSettings: CompilerSettings, + messageCollector: MessageCollector, + environment: JpsCompilerEnvironment, + collector: OutputItemsCollector, + sourceFiles: Collection, + libraryFiles: List, + outputFile: File + ) { + val arguments = mergeBeans(commonArguments, k2jsArguments) + setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments) + + runCompiler(K2JS_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) + } + + override fun doRunCompiler(compilerClassName: String, argsArray: Array, environment: JpsCompilerEnvironment, messageCollector: MessageCollector, collector: OutputItemsCollector): ExitCode { + messageCollector.report(CompilerMessageSeverity.INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) + + return if (isDaemonEnabled()) { + val daemonExitCode = compileWithDaemon(compilerClassName, argsArray, environment, messageCollector, collector) + daemonExitCode ?: fallbackCompileStrategy(argsArray, collector, compilerClassName, environment, messageCollector) + } + else { + fallbackCompileStrategy(argsArray, collector, compilerClassName, environment, messageCollector) + } + } + + private fun fallbackCompileStrategy( + argsArray: Array, + collector: OutputItemsCollector, + compilerClassName: String, + environment: JpsCompilerEnvironment, + messageCollector: MessageCollector + ): ExitCode { + // otherwise fallback to in-process + log.info("Compile in-process") + + val stream = ByteArrayOutputStream() + val out = PrintStream(stream) + + // the property should be set at least for parallel builds to avoid parallel building problems (racing between destroying and using environment) + // unfortunately it cannot be currently set by default globally, because it breaks many tests + // since there is no reliable way so far to detect running under tests, switching it on only for parallel builds + if (System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false").toBoolean()) + System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") + + val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out) + + // exec() returns an ExitCode object, class of which is loaded with a different class loader, + // so we take it's contents through reflection + val exitCode = ExitCode.valueOf(getReturnCodeFromObject(rc)) + processCompilerOutput(messageCollector, collector, stream, exitCode) + return exitCode + } + + private fun setupK2JvmArguments(moduleFile: File, settings: K2JVMCompilerArguments) { + with(settings) { + module = moduleFile.absolutePath + noStdlib = true + noReflect = true + noJdk = true + } + } + + private fun setupK2JsArguments( _outputFile: File, sourceFiles: Collection, _libraryFiles: List, settings: K2JSCompilerArguments) { + with(settings) { + noStdlib = true + freeArgs = sourceFiles.map { it.path } + outputFile = _outputFile.path + metaInfo = true + libraryFiles = _libraryFiles.toTypedArray() + } + } + + private fun getReturnCodeFromObject(rc: Any?): String { + when { + rc == null -> return INTERNAL_ERROR + ExitCode::class.java.name == rc.javaClass.name -> return rc.toString() + else -> throw IllegalStateException("Unexpected return: " + rc) + } + } + + @Synchronized + override fun getDaemonConnection(environment: JpsCompilerEnvironment, messageCollector: MessageCollector): DaemonConnection { + if (jpsDaemonConnection == null) { + val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) + val compilerPath = File(libPath, "kotlin-compiler.jar") + val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running").apply { + deleteOnExit() + } + newDaemonConnection(compilerPath, messageCollector, flagFile) + } + return jpsDaemonConnection!! + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt new file mode 100644 index 00000000000..eadd0f387cc --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinLogger.kt @@ -0,0 +1,37 @@ +/* + * Copyright 2010-2016 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.kotlin.compilerRunner + +import com.intellij.openapi.diagnostic.Logger + +internal class JpsKotlinLogger(private val log: Logger) : KotlinLogger { + override fun error(msg: String) { + log.error(msg) + } + + override fun warn(msg: String) { + log.warn(msg) + } + + override fun info(msg: String) { + log.info(msg) + } + + override fun debug(msg: String) { + log.debug(msg) + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 21eb4ad0cc8..1fbc4e667b1 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -46,9 +46,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil -import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment -import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner -import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl +import org.jetbrains.kotlin.compilerRunner.* import org.jetbrains.kotlin.config.CompilerRunnerConstants import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.config.IncrementalCompilation @@ -63,6 +61,7 @@ import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.modules.TargetId +import org.jetbrains.kotlin.preloading.ClassCondition import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus import org.jetbrains.kotlin.utils.JsLibraryUtils @@ -368,7 +367,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun doCompileModuleChunk( allCompiledFiles: MutableSet, chunk: ModuleChunk, commonArguments: CommonCompilerArguments, context: CompileContext, - dirtyFilesHolder: DirtyFilesHolder, environment: CompilerEnvironment, + dirtyFilesHolder: DirtyFilesHolder, environment: JpsCompilerEnvironment, filesToCompile: MultiMap, incrementalCaches: Map>, messageCollector: MessageCollectorAdapter, project: JpsProject ): OutputItemsCollectorImpl? { @@ -413,7 +412,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { lookupTracker: LookupTracker, sourceRetentionAnnotationHandler: SourceRetentionAnnotationHandler?, context: CompileContext - ): CompilerEnvironment { + ): JpsCompilerEnvironment { val compilerServices = with(Services.Builder()) { register(IncrementalCompilationComponents::class.java, IncrementalCompilationComponentsImpl(incrementalCaches.mapKeys { TargetId(it.key) }, @@ -429,9 +428,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { build() } - return CompilerEnvironment.getEnvironmentFor( + return JpsCompilerEnvironment( PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), - { className -> + compilerServices, + ClassCondition { className -> className.startsWith("org.jetbrains.kotlin.load.kotlin.incremental.components.") || className.startsWith("org.jetbrains.kotlin.incremental.components.") || className == "org.jetbrains.kotlin.config.Services" @@ -439,8 +439,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { || className == "org.jetbrains.kotlin.progress.CompilationCanceledStatus" || className == "org.jetbrains.kotlin.progress.CompilationCanceledException" || className == "org.jetbrains.kotlin.modules.TargetId" - }, - compilerServices + } ) } @@ -591,7 +590,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { // if null is returned, nothing was done private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, - environment: CompilerEnvironment, + environment: JpsCompilerEnvironment, messageCollector: MessageCollectorAdapter, project: JpsProject ): OutputItemsCollectorImpl? { @@ -625,7 +624,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeModule) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(representativeModule) - KotlinCompilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) + val compilerRunner = JpsKotlinCompilerRunner() + compilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) return outputItemCollector } @@ -647,7 +647,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { commonArguments: CommonCompilerArguments, context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, - environment: CompilerEnvironment, + environment: JpsCompilerEnvironment, filesToCompile: MultiMap, messageCollector: MessageCollectorAdapter ): OutputItemsCollectorImpl? { val outputItemCollector = OutputItemsCollectorImpl() @@ -691,7 +691,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { + (if (totalRemovedFiles == 0) "" else " ($totalRemovedFiles removed files)") + " in " + filesToCompile.keySet().joinToString { it.presentableName }) - KotlinCompilerRunner.runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) + val compilerRunner = JpsKotlinCompilerRunner() + compilerRunner.runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) moduleFile.delete() return outputItemCollector From 1cc23bc14c20faf9d014eea2d33a7c55f72d77c0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 13 Dec 2016 13:46:30 +0300 Subject: [PATCH 0914/1557] Remove source annotations removing (not needed with KAPT3) Original commit: 4fdca24db4174e839c37656d9136c04bb48befb1 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1fbc4e667b1..e1e672c9def 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -55,7 +55,6 @@ import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.incremental.components.SourceRetentionAnnotationHandler import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCache @@ -206,8 +205,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val project = projectDescriptor.project val lookupTracker = getLookupTracker(project) val incrementalCaches = getIncrementalCaches(chunk, context) - val sourceRetentionAnnotationHandler = SourceRetentionAnnotationHandlerImpl() - val environment = createCompileEnvironment(incrementalCaches, lookupTracker, sourceRetentionAnnotationHandler, context) + val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) if (!environment.success()) { environment.reportErrorsTo(messageCollector) return ABORT @@ -410,7 +408,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun createCompileEnvironment( incrementalCaches: Map, lookupTracker: LookupTracker, - sourceRetentionAnnotationHandler: SourceRetentionAnnotationHandler?, context: CompileContext ): JpsCompilerEnvironment { val compilerServices = with(Services.Builder()) { @@ -422,9 +419,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { if (context.cancelStatus.isCanceled) throw CompilationCanceledException() } }) - sourceRetentionAnnotationHandler?.let { - register(SourceRetentionAnnotationHandler::class.java, it) - } build() } From 5f0b827f0cf493757e29b5a64278a49a25ff77fe Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 24 Nov 2016 15:48:42 +0300 Subject: [PATCH 0915/1557] Rename: IncReporter->ICReporter Original commit: fdd3bc31f13e3f249e903b9dca4356dce4a7fd91 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index e1e672c9def..1b7a2106aac 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -784,7 +784,7 @@ private fun CompilationResult.doProcessChanges( } } -private class JpsIncReporter : IncReporter() { +private class JpsICReporter : ICReporter() { override fun report(message: ()->String) { if (KotlinBuilder.LOG.isDebugEnabled) { KotlinBuilder.LOG.debug(message()) @@ -800,7 +800,7 @@ private fun CompilationResult.doProcessChangesUsingLookups( ) { val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) val allCaches = caches.flatMap { it.thisWithDependentCaches } - val reporter = JpsIncReporter() + val reporter = JpsICReporter() reporter.report { "Start processing changes" } From ee9621ab2a46e5fe03d9bafc84ec83613490a5c5 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 29 Nov 2016 12:57:50 +0300 Subject: [PATCH 0916/1557] Refactoring: pass MessageCollector, OutputItemsCollector in CompilerEnvironment Original commit: 9654607f42c5b28f1d03ebc7e587ce7ef5e6a42b --- .../compilerRunner/CompilerRunnerUtil.java | 3 +- .../compilerRunner/JpsCompilerEnvironment.kt | 6 ++- .../compilerRunner/JpsKotlinCompilerRunner.kt | 34 +++++++--------- .../kotlin/jps/build/KotlinBuilder.kt | 40 +++++++++---------- 4 files changed, 38 insertions(+), 45 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java index ab4343f24ee..56996120bba 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java @@ -74,10 +74,9 @@ public class CompilerRunnerUtil { @NotNull String compilerClassName, @NotNull String[] arguments, @NotNull JpsCompilerEnvironment environment, - @NotNull MessageCollector messageCollector, @NotNull PrintStream out ) throws Exception { - File libPath = getLibPath(environment.getKotlinPaths(), messageCollector); + File libPath = getLibPath(environment.getKotlinPaths(), environment.getMessageCollector()); if (libPath == null) return null; ClassLoader classLoader = getOrCreateClassLoader(environment, libPath); diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt index dd35f5e1ad0..6e9ce4b2bd0 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerEnvironment.kt @@ -27,8 +27,10 @@ import org.jetbrains.kotlin.utils.PathUtil class JpsCompilerEnvironment( val kotlinPaths: KotlinPaths, services: Services, - val classesToLoadByParent: ClassCondition -) : CompilerEnvironment(services) { + val classesToLoadByParent: ClassCondition, + messageCollector: MessageCollector, + override val outputItemsCollector: OutputItemsCollectorImpl +) : CompilerEnvironment(services, messageCollector, outputItemsCollector) { fun success(): Boolean { return kotlinPaths.homePath.exists() } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index ad0760629b2..2cfb0394f2d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -44,24 +44,20 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { commonArguments: CommonCompilerArguments, k2jvmArguments: K2JVMCompilerArguments, compilerSettings: CompilerSettings, - messageCollector: MessageCollector, environment: JpsCompilerEnvironment, - moduleFile: File, - collector: OutputItemsCollector + moduleFile: File ) { val arguments = mergeBeans(commonArguments, k2jvmArguments) setupK2JvmArguments(moduleFile, arguments) - runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) + runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, environment) } fun runK2JsCompiler( commonArguments: CommonCompilerArguments, k2jsArguments: K2JSCompilerArguments, compilerSettings: CompilerSettings, - messageCollector: MessageCollector, environment: JpsCompilerEnvironment, - collector: OutputItemsCollector, sourceFiles: Collection, libraryFiles: List, outputFile: File @@ -69,27 +65,25 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { val arguments = mergeBeans(commonArguments, k2jsArguments) setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments) - runCompiler(K2JS_COMPILER, arguments, compilerSettings.additionalArguments, messageCollector, collector, environment) + runCompiler(K2JS_COMPILER, arguments, compilerSettings.additionalArguments, environment) } - override fun doRunCompiler(compilerClassName: String, argsArray: Array, environment: JpsCompilerEnvironment, messageCollector: MessageCollector, collector: OutputItemsCollector): ExitCode { - messageCollector.report(CompilerMessageSeverity.INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) + override fun doRunCompiler(compilerClassName: String, argsArray: Array, environment: JpsCompilerEnvironment): ExitCode { + environment.messageCollector.report(CompilerMessageSeverity.INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) return if (isDaemonEnabled()) { - val daemonExitCode = compileWithDaemon(compilerClassName, argsArray, environment, messageCollector, collector) - daemonExitCode ?: fallbackCompileStrategy(argsArray, collector, compilerClassName, environment, messageCollector) + val daemonExitCode = compileWithDaemon(compilerClassName, argsArray, environment) + daemonExitCode ?: fallbackCompileStrategy(argsArray, compilerClassName, environment) } else { - fallbackCompileStrategy(argsArray, collector, compilerClassName, environment, messageCollector) + fallbackCompileStrategy(argsArray, compilerClassName, environment) } } private fun fallbackCompileStrategy( argsArray: Array, - collector: OutputItemsCollector, compilerClassName: String, - environment: JpsCompilerEnvironment, - messageCollector: MessageCollector + environment: JpsCompilerEnvironment ): ExitCode { // otherwise fallback to in-process log.info("Compile in-process") @@ -103,12 +97,12 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { if (System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false").toBoolean()) System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") - val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, messageCollector, out) + val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, out) // exec() returns an ExitCode object, class of which is loaded with a different class loader, // so we take it's contents through reflection val exitCode = ExitCode.valueOf(getReturnCodeFromObject(rc)) - processCompilerOutput(messageCollector, collector, stream, exitCode) + processCompilerOutput(environment, stream, exitCode) return exitCode } @@ -140,14 +134,14 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { } @Synchronized - override fun getDaemonConnection(environment: JpsCompilerEnvironment, messageCollector: MessageCollector): DaemonConnection { + override fun getDaemonConnection(environment: JpsCompilerEnvironment): DaemonConnection { if (jpsDaemonConnection == null) { - val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, messageCollector) + val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, environment.messageCollector) val compilerPath = File(libPath, "kotlin-compiler.jar") val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running").apply { deleteOnExit() } - newDaemonConnection(compilerPath, messageCollector, flagFile) + newDaemonConnection(compilerPath, flagFile, environment) } return jpsDaemonConnection!! } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1b7a2106aac..239a0b8f472 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -205,7 +205,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val project = projectDescriptor.project val lookupTracker = getLookupTracker(project) val incrementalCaches = getIncrementalCaches(chunk, context) - val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context) + val environment = createCompileEnvironment(incrementalCaches, lookupTracker, context, messageCollector) if (!environment.success()) { environment.reportErrorsTo(messageCollector) return ABORT @@ -238,7 +238,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { LOG.info("Compiled successfully") } - val generatedFiles = getGeneratedFiles(chunk, outputItemCollector) + val generatedFiles = getGeneratedFiles(chunk, environment.outputItemsCollector) registerOutputItems(outputConsumer, generatedFiles) saveVersions(context, chunk) @@ -368,11 +368,11 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { dirtyFilesHolder: DirtyFilesHolder, environment: JpsCompilerEnvironment, filesToCompile: MultiMap, incrementalCaches: Map>, messageCollector: MessageCollectorAdapter, project: JpsProject - ): OutputItemsCollectorImpl? { + ): OutputItemsCollector? { if (JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { LOG.debug("Compiling to JS ${filesToCompile.values().size} files in ${filesToCompile.keySet().joinToString { it.presentableName }}") - return compileToJs(chunk, commonArguments, environment, messageCollector, project) + return compileToJs(chunk, commonArguments, environment, project) } if (IncrementalCompilation.isEnabled()) { @@ -402,13 +402,14 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { ) } - return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile, messageCollector) + return compileToJvm(allCompiledFiles, chunk, commonArguments, context, dirtyFilesHolder, environment, filesToCompile) } private fun createCompileEnvironment( incrementalCaches: Map, lookupTracker: LookupTracker, - context: CompileContext + context: CompileContext, + messageCollector: MessageCollectorAdapter ): JpsCompilerEnvironment { val compilerServices = with(Services.Builder()) { register(IncrementalCompilationComponents::class.java, @@ -433,7 +434,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { || className == "org.jetbrains.kotlin.progress.CompilationCanceledStatus" || className == "org.jetbrains.kotlin.progress.CompilationCanceledException" || className == "org.jetbrains.kotlin.modules.TargetId" - } + }, + messageCollector, + OutputItemsCollectorImpl() ) } @@ -585,16 +588,13 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { private fun compileToJs(chunk: ModuleChunk, commonArguments: CommonCompilerArguments, environment: JpsCompilerEnvironment, - messageCollector: MessageCollectorAdapter, project: JpsProject - ): OutputItemsCollectorImpl? { - val outputItemCollector = OutputItemsCollectorImpl() - + ): OutputItemsCollector? { val representativeTarget = chunk.representativeTarget() if (chunk.modules.size > 1) { // We do not support circular dependencies, but if they are present, we do our best should not break the build, // so we simply yield a warning and report NOTHING_DONE - messageCollector.report( + environment.messageCollector.report( WARNING, "Circular dependencies are not supported. The following JS modules depend on each other: " + chunk.modules.map { it.name }.joinToString(", ") + ". " @@ -619,8 +619,8 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(representativeModule) val compilerRunner = JpsKotlinCompilerRunner() - compilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, messageCollector, environment, outputItemCollector, sourceFiles, libraryFiles, outputFile) - return outputItemCollector + compilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, environment, sourceFiles, libraryFiles, outputFile) + return environment.outputItemsCollector } private fun copyJsLibraryFilesIfNeeded(chunk: ModuleChunk, project: JpsProject) { @@ -642,12 +642,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, environment: JpsCompilerEnvironment, - filesToCompile: MultiMap, messageCollector: MessageCollectorAdapter - ): OutputItemsCollectorImpl? { - val outputItemCollector = OutputItemsCollectorImpl() - + filesToCompile: MultiMap + ): OutputItemsCollector? { if (chunk.modules.size > 1) { - messageCollector.report( + environment.messageCollector.report( WARNING, "Circular dependencies are only partially supported. The following modules depend on each other: " + chunk.modules.map { it.name }.joinToString(", ") + ". " @@ -686,10 +684,10 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { + " in " + filesToCompile.keySet().joinToString { it.presentableName }) val compilerRunner = JpsKotlinCompilerRunner() - compilerRunner.runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, messageCollector, environment, moduleFile, outputItemCollector) + compilerRunner.runK2JvmCompiler(commonArguments, k2JvmArguments, compilerSettings, environment, moduleFile) moduleFile.delete() - return outputItemCollector + return environment.outputItemsCollector } class MessageCollectorAdapter(private val context: CompileContext) : MessageCollector { From b471ed1bbabffcd8181787c5fe30815d39bdc0f0 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 19 Dec 2016 15:36:59 +0300 Subject: [PATCH 0917/1557] Run kapt with daemon Original commit: 69d1ee7b11200428f187d9329d2f0c16becfeabf --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 2cfb0394f2d..c31cd3dfcf5 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -27,6 +27,7 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.daemon.common.CompilerId import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.jps.build.KotlinBuilder import java.io.ByteArrayOutputStream @@ -138,10 +139,11 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { if (jpsDaemonConnection == null) { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, environment.messageCollector) val compilerPath = File(libPath, "kotlin-compiler.jar") + val compilerId = CompilerId.makeCompilerId(compilerPath) val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running").apply { deleteOnExit() } - newDaemonConnection(compilerPath, flagFile, environment) + newDaemonConnection(compilerId, flagFile, environment) } return jpsDaemonConnection!! } From 4d5c36fbd66aca4eb223ec20c62081ceeeebdaee Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 20 Dec 2016 14:46:23 +0300 Subject: [PATCH 0918/1557] Fix getting daemon connection in JPS Original commit: e9e1b3fea1a7ccae34fe6c3d8cf41d9b2b2ab26e --- .../jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index c31cd3dfcf5..4cf0d271471 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -143,7 +143,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running").apply { deleteOnExit() } - newDaemonConnection(compilerId, flagFile, environment) + jpsDaemonConnection = newDaemonConnection(compilerId, flagFile, environment) } return jpsDaemonConnection!! } From e389963e21fd92143c212deca4fb644e8cf40b42 Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Tue, 10 Jan 2017 12:01:08 +0300 Subject: [PATCH 0919/1557] Update year in license and regenerate tests Original commit: 6cccad964787b5b56de346f9620cdb81b7e8f3ad --- .../jps/build/DataContainerVersionChangedTestGenerated.java | 2 +- .../build/ExperimentalChangeIncrementalOptionTestGenerated.java | 2 +- ...ExperimentalIncrementalCacheVersionChangedTestGenerated.java | 2 +- .../jps/build/ExperimentalIncrementalJpsTestGenerated.java | 2 +- .../build/ExperimentalIncrementalLazyCachesTestGenerated.java | 2 +- .../jps/build/IncrementalCacheVersionChangedTestGenerated.java | 2 +- .../jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java | 2 +- .../kotlin/jps/build/IncrementalLazyCachesTestGenerated.java | 2 +- .../jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java | 2 +- .../kotlin/jps/incremental/ProtoComparisonTestGenerated.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java index 325bd126806..079ead3deec 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java index 11f5e5c2cba..d3cc25e5692 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalChangeIncrementalOptionTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java index b94497ae317..30515f8111c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalCacheVersionChangedTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 7a989d39ce9..a8546c42f6b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java index df25b8a6718..75543c672f3 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalLazyCachesTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index 54632cdba18..4ca20738206 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 74332cb6ddb..27b7e07f341 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index aa395e124d8..cb5736a358d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java index 5e2c177a59d..77c46306e79 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/LookupTrackerTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java index 36d19c2b209..e60ed9d3c4d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/ProtoComparisonTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2016 JetBrains s.r.o. + * Copyright 2010-2017 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. From 07b11431a95dc0335db04581480aada60753738f Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 29 Dec 2016 22:43:00 +0300 Subject: [PATCH 0920/1557] Make ICReporter interface Original commit: d19a92bab54fc714e64493fbb9947dfd5318c453 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 239a0b8f472..1ffb30d7557 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -782,7 +782,7 @@ private fun CompilationResult.doProcessChanges( } } -private class JpsICReporter : ICReporter() { +private class JpsICReporter : ICReporter { override fun report(message: ()->String) { if (KotlinBuilder.LOG.isDebugEnabled) { KotlinBuilder.LOG.debug(message()) From 6c3fdf19fc0d8c79c8cb278012b0a2a8fb6d8b3c Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 10 Jan 2017 23:50:33 +0300 Subject: [PATCH 0921/1557] Refactor JPS daemon client Original commit: 99c72b6dff0a3ea240fd86ecd3771c20a503a59f --- .../JpsCompilerServicesFacadeImpl.kt | 69 ++++++++++++++++ .../compilerRunner/JpsKotlinCompilerRunner.kt | 80 ++++++++++++++++--- 2 files changed, 137 insertions(+), 12 deletions(-) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt new file mode 100644 index 00000000000..71b8337a3fc --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt @@ -0,0 +1,69 @@ +/* + * Copyright 2010-2017 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.kotlin.compilerRunner + +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.daemon.client.CompilerCallbackServicesFacadeServer +import org.jetbrains.kotlin.daemon.common.JpsCompilerServicesFacade +import org.jetbrains.kotlin.daemon.common.ReportCategory +import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT +import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents +import org.jetbrains.kotlin.progress.CompilationCanceledStatus +import java.io.Serializable + +internal class JpsCompilerServicesFacadeImpl( + private val env: JpsCompilerEnvironment, + port: Int = SOCKET_ANY_FREE_PORT +) : CompilerCallbackServicesFacadeServer(env.services.get(IncrementalCompilationComponents::class.java), + env.services.get(CompilationCanceledStatus::class.java), + port), + JpsCompilerServicesFacade { + + override fun report(category: ReportCategory, severity: Int, message: String?, attachment: Serializable?) { + when (category) { + ReportCategory.COMPILER_MESSAGE -> { + val compilerMessageSeverity = CompilerMessageSeverity.values().firstOrNull { it.value == severity } + if (compilerMessageSeverity != null) { + val location = attachment as? CompilerMessageLocation ?: CompilerMessageLocation.NO_LOCATION + env.messageCollector.report(compilerMessageSeverity, message!!, location) + } + else { + reportUnexpected(category, severity, message, attachment) + } + } + ReportCategory.DAEMON_MESSAGE, + ReportCategory.INCREMENTAL_COMPILATION -> { + if (message != null) { + env.messageCollector.report(CompilerMessageSeverity.LOGGING, message, CompilerMessageLocation.NO_LOCATION) + } + else { + reportUnexpected(category, severity, message, attachment) + } + } + else -> { + reportUnexpected(category, severity, message, attachment) + } + } + } + + private fun reportUnexpected(category: ReportCategory, severity: Int, message: String?, attachment: Serializable?) { + env.messageCollector.report(CompilerMessageSeverity.LOGGING, + "Unexpected message: category=$category; severity=$severity; message='$message'; attachment=$attachment", + CompilerMessageLocation.NO_LOCATION) + } +} \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 4cf0d271471..8ccff1964fa 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -19,23 +19,19 @@ package org.jetbrains.kotlin.compilerRunner import org.jetbrains.jps.api.GlobalOptions import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.mergeBeans +import org.jetbrains.kotlin.cli.common.arguments.* import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.config.CompilerSettings -import org.jetbrains.kotlin.daemon.common.CompilerId -import org.jetbrains.kotlin.daemon.common.isDaemonEnabled +import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.jps.build.KotlinBuilder import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream +import java.util.* class JpsKotlinCompilerRunner : KotlinCompilerRunner() { - override val log: KotlinLogger = JpsKotlinLogger(KotlinBuilder.LOG) + override val log: KotlinLogger = JpsKotlinLogger(KotlinBuilder.LOG) companion object { private @Volatile var jpsDaemonConnection: DaemonConnection? = null @@ -50,8 +46,10 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { ) { val arguments = mergeBeans(commonArguments, k2jvmArguments) setupK2JvmArguments(moduleFile, arguments) + val additionalArguments = compilerSettings.additionalArguments.split(" ").toTypedArray() + parseArguments(additionalArguments, arguments) - runCompiler(K2JVM_COMPILER, arguments, compilerSettings.additionalArguments, environment) + runCompiler(K2JVM_COMPILER, arguments, environment) } fun runK2JsCompiler( @@ -65,15 +63,22 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { ) { val arguments = mergeBeans(commonArguments, k2jsArguments) setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments) + val additionalArguments = compilerSettings.additionalArguments.split(" ").toTypedArray() + parseArguments(additionalArguments, arguments) - runCompiler(K2JS_COMPILER, arguments, compilerSettings.additionalArguments, environment) + runCompiler(K2JS_COMPILER, arguments, environment) } - override fun doRunCompiler(compilerClassName: String, argsArray: Array, environment: JpsCompilerEnvironment): ExitCode { + override fun compileWithDaemonOrFallback( + compilerClassName: String, + compilerArgs: CommonCompilerArguments, + environment: JpsCompilerEnvironment + ): ExitCode { environment.messageCollector.report(CompilerMessageSeverity.INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) + val argsArray = ArgumentUtils.convertArgumentsToStringList(compilerArgs).toTypedArray() return if (isDaemonEnabled()) { - val daemonExitCode = compileWithDaemon(compilerClassName, argsArray, environment) + val daemonExitCode = compileWithDaemon(compilerClassName, compilerArgs, environment) daemonExitCode ?: fallbackCompileStrategy(argsArray, compilerClassName, environment) } else { @@ -81,6 +86,57 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { } } + override fun compileWithDaemon( + compilerClassName: String, + compilerArgs: CommonCompilerArguments, + environment: JpsCompilerEnvironment + ): ExitCode? { + val targetPlatform = when (compilerClassName) { + K2JVM_COMPILER -> CompileService.TargetPlatform.JVM + K2JS_COMPILER -> CompileService.TargetPlatform.JS + K2METADATA_COMPILER -> CompileService.TargetPlatform.METADATA + else -> throw IllegalArgumentException("Unknown compiler type $compilerClassName") + } + + val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId -> + daemon.compile( + sessionId, + CompileService.CompilerMode.JPS_COMPILER, + targetPlatform, + compilerArgs, + AdditionalCompilerArguments(reportingFilters = getReportingFilters(compilerArgs.verbose)), + JpsCompilerServicesFacadeImpl(environment), + operationsTracer = null) + } + + return res?.get()?.let { exitCodeFromProcessExitCode(it) } + } + + private fun getReportingFilters(verbose: Boolean): List { + val result = ArrayList() + + val compilerMessagesSeverities = ArrayList().apply { + add(CompilerMessageSeverity.ERROR.value) + add(CompilerMessageSeverity.EXCEPTION.value) + add(CompilerMessageSeverity.WARNING.value) + add(CompilerMessageSeverity.INFO.value) + add(CompilerMessageSeverity.OUTPUT.value) + + if (verbose) { + add(CompilerMessageSeverity.LOGGING.value) + } + } + + if (verbose) { + result.add(ReportingFilter(ReportCategory.DAEMON_MESSAGE, emptyList())) + } + + val compilerMessagesFilter = ReportingFilter(ReportCategory.COMPILER_MESSAGE, compilerMessagesSeverities) + result.add(compilerMessagesFilter) + + return result + } + private fun fallbackCompileStrategy( argsArray: Array, compilerClassName: String, From acea47487af6b1a9d16ef7e72c23e3c3152af177 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 10 Jan 2017 19:43:28 +0300 Subject: [PATCH 0922/1557] Remove operations tracer from compile() interface Original commit: bf50a232210ba10ac80636763d17ada32bf33c3d --- .../jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 8ccff1964fa..4458bb65141 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -105,8 +105,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { targetPlatform, compilerArgs, AdditionalCompilerArguments(reportingFilters = getReportingFilters(compilerArgs.verbose)), - JpsCompilerServicesFacadeImpl(environment), - operationsTracer = null) + JpsCompilerServicesFacadeImpl(environment)) } return res?.get()?.let { exitCodeFromProcessExitCode(it) } From bbfaf35bff8e7ad7c30d02d1532fe79298a34b12 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 10 Jan 2017 19:45:10 +0300 Subject: [PATCH 0923/1557] Rename AdditionalCompilerArguments->CompilationOptions Original commit: c5a5463f506c3081b264606e68faeda2f77cdec3 --- .../jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 4458bb65141..be4a19841ca 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -104,7 +104,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { CompileService.CompilerMode.JPS_COMPILER, targetPlatform, compilerArgs, - AdditionalCompilerArguments(reportingFilters = getReportingFilters(compilerArgs.verbose)), + CompilationOptions(reportingFilters = getReportingFilters(compilerArgs.verbose)), JpsCompilerServicesFacadeImpl(environment)) } From 8571c2086ebc9f0fcc928100c532a21f50006a34 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 10 Jan 2017 19:49:26 +0300 Subject: [PATCH 0924/1557] Move CompilerMode and TargetPlatform to CompilationOptions Original commit: e44cc43ada4c11c8163dc0ccf504ec0c87c74532 --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index be4a19841ca..2a99aad5190 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -99,13 +99,10 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { } val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId -> - daemon.compile( - sessionId, - CompileService.CompilerMode.JPS_COMPILER, - targetPlatform, - compilerArgs, - CompilationOptions(reportingFilters = getReportingFilters(compilerArgs.verbose)), - JpsCompilerServicesFacadeImpl(environment)) + val options = CompilationOptions(CompileService.CompilerMode.JPS_COMPILER, + targetPlatform, + reportingFilters = getReportingFilters(compilerArgs.verbose)) + daemon.compile(sessionId, compilerArgs, options, JpsCompilerServicesFacadeImpl(environment)) } return res?.get()?.let { exitCodeFromProcessExitCode(it) } From 9594031126d87e2a9f3cd73a9c74bef9226286dc Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 12 Jan 2017 16:16:56 +0300 Subject: [PATCH 0925/1557] Refactor messages sending Original commit: 16352ff2e50ed232641f2f1935c0896e63a9f766 --- jps/jps-plugin/jps-plugin.iml | 1 + .../JpsCompilerServicesFacadeImpl.kt | 35 ++++++++++----- .../compilerRunner/JpsKotlinCompilerRunner.kt | 45 ++++++++----------- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 21a11f39ee9..59e6dad560b 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -20,5 +20,6 @@ + \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt index 71b8337a3fc..b4df5aa4089 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt @@ -19,9 +19,7 @@ package org.jetbrains.kotlin.compilerRunner import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.daemon.client.CompilerCallbackServicesFacadeServer -import org.jetbrains.kotlin.daemon.common.JpsCompilerServicesFacade -import org.jetbrains.kotlin.daemon.common.ReportCategory -import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT +import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.progress.CompilationCanceledStatus import java.io.Serializable @@ -34,20 +32,26 @@ internal class JpsCompilerServicesFacadeImpl( port), JpsCompilerServicesFacade { - override fun report(category: ReportCategory, severity: Int, message: String?, attachment: Serializable?) { - when (category) { + override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) { + val reportCategory = ReportCategory.fromCode(category) + + when (reportCategory) { + ReportCategory.OUTPUT_MESSAGE -> { + env.messageCollector.report(CompilerMessageSeverity.OUTPUT, message!!, CompilerMessageLocation.NO_LOCATION) + } ReportCategory.COMPILER_MESSAGE -> { - val compilerMessageSeverity = CompilerMessageSeverity.values().firstOrNull { it.value == severity } - if (compilerMessageSeverity != null) { - val location = attachment as? CompilerMessageLocation ?: CompilerMessageLocation.NO_LOCATION - env.messageCollector.report(compilerMessageSeverity, message!!, location) + val compilerMessageAttachment = attachment as? CompilerMessageAttachment + if (message != null && compilerMessageAttachment != null) { + val originalSeverity = compilerMessageAttachment.severity + val originalLocation = compilerMessageAttachment.location + env.messageCollector.report(originalSeverity, message, originalLocation) } else { reportUnexpected(category, severity, message, attachment) } } ReportCategory.DAEMON_MESSAGE, - ReportCategory.INCREMENTAL_COMPILATION -> { + ReportCategory.IC_MESSAGE -> { if (message != null) { env.messageCollector.report(CompilerMessageSeverity.LOGGING, message, CompilerMessageLocation.NO_LOCATION) } @@ -61,8 +65,15 @@ internal class JpsCompilerServicesFacadeImpl( } } - private fun reportUnexpected(category: ReportCategory, severity: Int, message: String?, attachment: Serializable?) { - env.messageCollector.report(CompilerMessageSeverity.LOGGING, + private fun reportUnexpected(category: Int, severity: Int, message: String?, attachment: Serializable?) { + val compilerMessageSeverity = when (ReportSeverity.fromCode(severity)) { + ReportSeverity.ERROR -> CompilerMessageSeverity.ERROR + ReportSeverity.WARNING -> CompilerMessageSeverity.WARNING + ReportSeverity.INFO -> CompilerMessageSeverity.INFO + else -> CompilerMessageSeverity.LOGGING + } + + env.messageCollector.report(compilerMessageSeverity, "Unexpected message: category=$category; severity=$severity; message='$message'; attachment=$attachment", CompilerMessageLocation.NO_LOCATION) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 2a99aad5190..75c670d28e4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -28,6 +28,8 @@ import org.jetbrains.kotlin.jps.build.KotlinBuilder import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream +import java.io.Serializable +import java.rmi.server.UnicastRemoteObject import java.util.* class JpsKotlinCompilerRunner : KotlinCompilerRunner() { @@ -99,39 +101,30 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { } val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId -> - val options = CompilationOptions(CompileService.CompilerMode.JPS_COMPILER, - targetPlatform, - reportingFilters = getReportingFilters(compilerArgs.verbose)) - daemon.compile(sessionId, compilerArgs, options, JpsCompilerServicesFacadeImpl(environment)) + val compilerMode = CompileService.CompilerMode.JPS_COMPILER + val verbose = compilerArgs.verbose + val options = CompilationOptions(compilerMode, targetPlatform, reportCategories(verbose), reportSeverity(verbose), requestedCompilationResults = emptyArray()) + daemon.compile(sessionId, compilerArgs, options, JpsCompilerServicesFacadeImpl(environment), null) } return res?.get()?.let { exitCodeFromProcessExitCode(it) } } - private fun getReportingFilters(verbose: Boolean): List { - val result = ArrayList() - - val compilerMessagesSeverities = ArrayList().apply { - add(CompilerMessageSeverity.ERROR.value) - add(CompilerMessageSeverity.EXCEPTION.value) - add(CompilerMessageSeverity.WARNING.value) - add(CompilerMessageSeverity.INFO.value) - add(CompilerMessageSeverity.OUTPUT.value) - - if (verbose) { - add(CompilerMessageSeverity.LOGGING.value) + private fun reportCategories(verbose: Boolean): Array = + if (!verbose) { + arrayOf(ReportCategory.COMPILER_MESSAGE.code) + } + else { + ReportCategory.values().map { it.code }.toTypedArray() } - } - if (verbose) { - result.add(ReportingFilter(ReportCategory.DAEMON_MESSAGE, emptyList())) - } - - val compilerMessagesFilter = ReportingFilter(ReportCategory.COMPILER_MESSAGE, compilerMessagesSeverities) - result.add(compilerMessagesFilter) - - return result - } + private fun reportSeverity(verbose: Boolean): Int = + if (!verbose) { + ReportSeverity.INFO.code + } + else { + ReportSeverity.DEBUG.code + } private fun fallbackCompileStrategy( argsArray: Array, From cf3a2bf787c0bb62e16bae9ca144604ccc0af9ac Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 13 Jan 2017 08:24:23 +0300 Subject: [PATCH 0926/1557] Minor: introduce EXCEPTION report category Original commit: 072edf4b5a489bc4072c80aa39135cf98e4540e8 --- .../JpsCompilerServicesFacadeImpl.kt | 17 ++++++++++++----- .../compilerRunner/JpsKotlinCompilerRunner.kt | 11 ++++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt index b4df5aa4089..f3610bbfed9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt @@ -39,12 +39,19 @@ internal class JpsCompilerServicesFacadeImpl( ReportCategory.OUTPUT_MESSAGE -> { env.messageCollector.report(CompilerMessageSeverity.OUTPUT, message!!, CompilerMessageLocation.NO_LOCATION) } + ReportCategory.EXCEPTION -> { + env.messageCollector.report(CompilerMessageSeverity.EXCEPTION, message!!, CompilerMessageLocation.NO_LOCATION) + } ReportCategory.COMPILER_MESSAGE -> { - val compilerMessageAttachment = attachment as? CompilerMessageAttachment - if (message != null && compilerMessageAttachment != null) { - val originalSeverity = compilerMessageAttachment.severity - val originalLocation = compilerMessageAttachment.location - env.messageCollector.report(originalSeverity, message, originalLocation) + val compilerSeverity = when (ReportSeverity.fromCode(severity)) { + ReportSeverity.ERROR -> CompilerMessageSeverity.ERROR + ReportSeverity.WARNING -> CompilerMessageSeverity.WARNING + ReportSeverity.INFO -> CompilerMessageSeverity.INFO + ReportSeverity.DEBUG -> CompilerMessageSeverity.LOGGING + else -> throw IllegalStateException("Unexpected compiler message report severity $severity") + } + if (message != null && attachment is CompilerMessageLocation) { + env.messageCollector.report(compilerSeverity, message, attachment) } else { reportUnexpected(category, severity, message, attachment) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 75c670d28e4..e4f20cfb84d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -110,14 +110,19 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { return res?.get()?.let { exitCodeFromProcessExitCode(it) } } - private fun reportCategories(verbose: Boolean): Array = + private fun reportCategories(verbose: Boolean): Array { + val categories = if (!verbose) { - arrayOf(ReportCategory.COMPILER_MESSAGE.code) + arrayOf(ReportCategory.COMPILER_MESSAGE, ReportCategory.EXCEPTION) } else { - ReportCategory.values().map { it.code }.toTypedArray() + ReportCategory.values() } + return categories.map { it.code }.toTypedArray() + } + + private fun reportSeverity(verbose: Boolean): Int = if (!verbose) { ReportSeverity.INFO.code From 31b83ed93d57c9f854132307f7d8d1106f728a7a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 13 Jan 2017 09:19:57 +0300 Subject: [PATCH 0927/1557] Minor: move CompilerMode Original commit: a3415d8d0e7682b637f12967932a62aa0dccf0e1 --- .../jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index e4f20cfb84d..3d207d68a12 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -101,7 +101,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { } val res = withDaemon(environment, retryOnConnectionError = true) { daemon, sessionId -> - val compilerMode = CompileService.CompilerMode.JPS_COMPILER + val compilerMode = CompilerMode.JPS_COMPILER val verbose = compilerArgs.verbose val options = CompilationOptions(compilerMode, targetPlatform, reportCategories(verbose), reportSeverity(verbose), requestedCompilationResults = emptyArray()) daemon.compile(sessionId, compilerArgs, options, JpsCompilerServicesFacadeImpl(environment), null) From 12d0207bcc73bf6bbb24f29ad702e32825a55286 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 13 Jan 2017 00:00:17 +0300 Subject: [PATCH 0928/1557] Fix the build Original commit: bdae0b5efb03b7f31b2236e35611dd6e9ad47d85 --- jps/jps-plugin/jps-plugin.iml | 1 + .../compilerRunner/JpsKotlinCompilerRunner.kt | 33 +++++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index 59e6dad560b..f5fcf5cec86 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -21,5 +21,6 @@ + \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 3d207d68a12..df4af961c7c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -33,7 +33,20 @@ import java.rmi.server.UnicastRemoteObject import java.util.* class JpsKotlinCompilerRunner : KotlinCompilerRunner() { - override val log: KotlinLogger = JpsKotlinLogger(KotlinBuilder.LOG) + override val log: KotlinLogger = JpsKotlinLogger(KotlinBuilder.LOG) + + private var compilerSettings: CompilerSettings? = null + + private inline fun withCompilerSettings(settings: CompilerSettings, fn: ()->Unit) { + val old = compilerSettings + try { + compilerSettings = settings + fn() + } + finally { + compilerSettings = old + } + } companion object { private @Volatile var jpsDaemonConnection: DaemonConnection? = null @@ -48,10 +61,9 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { ) { val arguments = mergeBeans(commonArguments, k2jvmArguments) setupK2JvmArguments(moduleFile, arguments) - val additionalArguments = compilerSettings.additionalArguments.split(" ").toTypedArray() - parseArguments(additionalArguments, arguments) - - runCompiler(K2JVM_COMPILER, arguments, environment) + withCompilerSettings(compilerSettings) { + runCompiler(K2JVM_COMPILER, arguments, environment) + } } fun runK2JsCompiler( @@ -65,10 +77,9 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { ) { val arguments = mergeBeans(commonArguments, k2jsArguments) setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments) - val additionalArguments = compilerSettings.additionalArguments.split(" ").toTypedArray() - parseArguments(additionalArguments, arguments) - - runCompiler(K2JS_COMPILER, arguments, environment) + withCompilerSettings(compilerSettings) { + runCompiler(K2JS_COMPILER, arguments, environment) + } } override fun compileWithDaemonOrFallback( @@ -104,7 +115,9 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { val compilerMode = CompilerMode.JPS_COMPILER val verbose = compilerArgs.verbose val options = CompilationOptions(compilerMode, targetPlatform, reportCategories(verbose), reportSeverity(verbose), requestedCompilationResults = emptyArray()) - daemon.compile(sessionId, compilerArgs, options, JpsCompilerServicesFacadeImpl(environment), null) + val allArgs = ArgumentUtils.convertArgumentsToStringList(compilerArgs) + + (compilerSettings?.additionalArguments?.split(" ") ?: emptyList()) + daemon.compile(sessionId, allArgs.toTypedArray(), options, JpsCompilerServicesFacadeImpl(environment), null) } return res?.get()?.let { exitCodeFromProcessExitCode(it) } From ae18166ef2a43ca3f242fe2773550d44848bf810 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Wed, 11 Jan 2017 17:00:10 +0100 Subject: [PATCH 0929/1557] Revert ' Temporary remove JVM_1_8 target from facet settings' Original commit: b6bf53f96f4cc72950ce3377a33d72ae521aeff2 --- .../jetbrains/kotlin/config/KotlinFacetSettings.kt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 1d98580d35d..d7e9152c3da 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -31,8 +31,12 @@ sealed class TargetPlatformKind( ) : DescriptionAware { override val description = "$name ${version.description}" - sealed class Jvm(version: JvmTarget) : TargetPlatformKind(version, "JVM") { - object JVM_1_6 : Jvm(JvmTarget.JVM_1_6) + class Jvm(version: JvmTarget) : TargetPlatformKind(version, "JVM") { + companion object { + val JVM_PLATFORMS by lazy { JvmTarget.values().map(::Jvm) } + + operator fun get(version: JvmTarget) = JVM_PLATFORMS[version.ordinal] + } } object JavaScript : TargetPlatformKind(NoVersion, "JavaScript") @@ -40,7 +44,8 @@ sealed class TargetPlatformKind( object Common : TargetPlatformKind(NoVersion, "Common (experimental)") companion object { - val ALL_PLATFORMS: List> by lazy { listOf(Jvm.JVM_1_6, JavaScript, Common) } + + val ALL_PLATFORMS: List> by lazy { Jvm.JVM_PLATFORMS + JavaScript + Common } } } From 96e5b544665f590cd7a683c467f19a0c1b640bd3 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 13 Jan 2017 21:43:15 +0300 Subject: [PATCH 0930/1557] Fix handling OUTPUT message from daemon in JPS client Original commit: e0fa11b0c1f6c218a3cd40a02280299d8c808bdf --- .../kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt index f3610bbfed9..285677acf08 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt @@ -18,6 +18,7 @@ package org.jetbrains.kotlin.compilerRunner import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity +import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil import org.jetbrains.kotlin.daemon.client.CompilerCallbackServicesFacadeServer import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents @@ -37,7 +38,10 @@ internal class JpsCompilerServicesFacadeImpl( when (reportCategory) { ReportCategory.OUTPUT_MESSAGE -> { - env.messageCollector.report(CompilerMessageSeverity.OUTPUT, message!!, CompilerMessageLocation.NO_LOCATION) + val output = OutputMessageUtil.parseOutputMessage(message!!) + if (output != null) { + env.outputItemsCollector.add(output.sourceFiles, output.outputFile) + } } ReportCategory.EXCEPTION -> { env.messageCollector.report(CompilerMessageSeverity.EXCEPTION, message!!, CompilerMessageLocation.NO_LOCATION) From 0088c2e646cbd10487d3d7521a39f5c6d9d24157 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Fri, 13 Jan 2017 15:43:50 +0300 Subject: [PATCH 0931/1557] Move coroutine intrinsics to kotlin.coroutine.intrinsics package Also rename val SUSPENDED to SUSPENDED_MARKER #KT-15698 Fixed Original commit: 2cb9d3a8ad263ff28153c4642a802d0e7d09205e --- .../testData/incremental/inlineFunCallSite/coroutine/usage.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt index d2c7c5c40a7..e2f22122e52 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt @@ -1,5 +1,6 @@ package usage import kotlin.coroutines.* +import kotlin.coroutines.intrinsics.* fun async(x: suspend Controller.() -> Unit) { x.startCoroutine(Controller(), object : Continuation { @@ -10,7 +11,7 @@ fun async(x: suspend Controller.() -> Unit) { } class Controller { - suspend fun step(param: Int) = CoroutineIntrinsics.suspendCoroutineOrReturn { next -> + suspend fun step(param: Int) = suspendCoroutineOrReturn { next -> next.resume(param + 1) } } From f2be1f776dc25ec1381150ea8d2401ef948967c2 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Sat, 14 Jan 2017 13:15:18 +0300 Subject: [PATCH 0932/1557] Minor. Fix tests after CoroutineContext introduction Original commit: c7f76d7ec84bc01ca512dd5ad0fbeb03611c9e4c --- .../testData/incremental/inlineFunCallSite/coroutine/usage.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt index e2f22122e52..d83d913db23 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt @@ -4,6 +4,7 @@ import kotlin.coroutines.intrinsics.* fun async(x: suspend Controller.() -> Unit) { x.startCoroutine(Controller(), object : Continuation { + override val context: CoroutineContext = null!! override fun resume(value: Unit) {} override fun resumeWithException(exception: Throwable) {} From e2fff37cccf0c61a746504cfb8964c996ae6b073 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Sat, 14 Jan 2017 00:26:18 +0900 Subject: [PATCH 0933/1557] Copy compiler arguments from iml even if "Use project settings" checkbox is checked. This is deadly needed for the compiler plugins no-arg and all-open, assuming that the default state of the checkbox is "on". (KT-15686, KT-15686). This is a temporary fix, and it should be reverted when "Use project settings" will be disabled by default in modules imported from external build tools (Maven, Gradle). Original commit: 1fb90ac0fd0af48eff6f25dc904b1df18013ec50 --- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index c511a460d09..9795240cdd8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -72,16 +72,22 @@ class JpsKotlinCompilerSettings : JpsElementBase() { fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments { val defaultArguments = getSettings(module.project).commonCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments - if (facetSettings.useProjectSettings) return defaultArguments val (languageLevel, apiLevel) = facetSettings.versionInfo val facetArguments = facetSettings.compilerInfo.commonCompilerArguments ?: return defaultArguments return copyBean(facetArguments).apply { - languageVersion = languageLevel?.description - apiVersion = apiLevel?.description - multiPlatform = module - .dependenciesList - .dependencies - .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common } + if (facetSettings.useProjectSettings) { + languageVersion = defaultArguments.languageVersion + apiVersion = defaultArguments.apiVersion + multiPlatform = defaultArguments.multiPlatform + } + else { + languageVersion = languageLevel?.description + apiVersion = apiLevel?.description + multiPlatform = module + .dependenciesList + .dependencies + .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common } + } } } From 411745f26070efabaaf43172118a17a36583ce98 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Mon, 16 Jan 2017 16:40:26 +0300 Subject: [PATCH 0934/1557] Write kotlin metadata on class-files for coroutine state machines Otherwise it breaks JPS assumptions, that leads to exceptions like: Error:Kotlin: [Internal Error] java.lang.AssertionError: Couldn't load KotlinClass from /Users/jetbrains/IdeaProjects/KotlinPlaygroundBeta11/out/production/KotlinPlaygroundBeta11/Counter$both$1.class; it may happen because class doesn't have valid Kotlin annotations at org.jetbrains.kotlin.build.GeneratedJvmClass.(generatedFiles.kt:36) at org.jetbrains.kotlin.jps.build.KotlinBuilder.getGeneratedFiles(KotlinBuilder.kt:469) at org.jetbrains.kotlin.jps.build.KotlinBuilder.doBuild(KotlinBuilder.kt:241) at org.jetbrains.kotlin.jps.build.KotlinBuilder.build(KotlinBuilder.kt:140) ... Original commit: 9f217de10b980e7ff7a3681ea6e5e4e1ee52988d --- .../ExperimentalIncrementalJpsTestGenerated.java | 6 ++++++ .../kotlin/jps/build/IncrementalJpsTestGenerated.java | 6 ++++++ .../pureKotlin/suspendWithStateMachine/Counter.kt | 10 ++++++++++ .../pureKotlin/suspendWithStateMachine/build.log | 11 +++++++++++ .../pureKotlin/suspendWithStateMachine/other.kt | 4 ++++ .../pureKotlin/suspendWithStateMachine/other.kt.touch | 0 6 files changed, 37 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index a8546c42f6b..d6e877b8eee 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -918,6 +918,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("suspendWithStateMachine") + public void testSuspendWithStateMachine() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/"); + doTest(fileName); + } + @TestMetadata("topLevelFunctionSameSignature") public void testTopLevelFunctionSameSignature() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 27b7e07f341..39d92ad1aca 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -918,6 +918,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("suspendWithStateMachine") + public void testSuspendWithStateMachine() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/"); + doTest(fileName); + } + @TestMetadata("topLevelFunctionSameSignature") public void testTopLevelFunctionSameSignature() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionSameSignature/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt new file mode 100644 index 00000000000..c43e7a6a7d9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/Counter.kt @@ -0,0 +1,10 @@ +package test + +class Counter { + suspend fun one() {} + suspend fun two() {} + suspend fun both() { + one() + two() + } +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/build.log new file mode 100644 index 00000000000..ce955a3768c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/OtherKt.class +End of files +Compiling files: + src/other.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt new file mode 100644 index 00000000000..092462c70e0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt @@ -0,0 +1,4 @@ +package test + +fun dummyFunction() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/suspendWithStateMachine/other.kt.touch new file mode 100644 index 00000000000..e69de29bb2d From b841544f95b0dfaa9c194e5d53779e00cfaf6f81 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 17 Jan 2017 16:52:49 +0300 Subject: [PATCH 0935/1557] Pass compiler args from facets when compiling in fallback mode from JPS Original commit: 58fd2530d22f4161e3cb5f9d7080b6b1142f7225 --- .../compilerRunner/JpsKotlinCompilerRunner.kt | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index df4af961c7c..a557b301749 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -88,14 +88,13 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { environment: JpsCompilerEnvironment ): ExitCode { environment.messageCollector.report(CompilerMessageSeverity.INFO, "Using kotlin-home = " + environment.kotlinPaths.homePath, CompilerMessageLocation.NO_LOCATION) - val argsArray = ArgumentUtils.convertArgumentsToStringList(compilerArgs).toTypedArray() return if (isDaemonEnabled()) { val daemonExitCode = compileWithDaemon(compilerClassName, compilerArgs, environment) - daemonExitCode ?: fallbackCompileStrategy(argsArray, compilerClassName, environment) + daemonExitCode ?: fallbackCompileStrategy(compilerArgs, compilerClassName, environment) } else { - fallbackCompileStrategy(argsArray, compilerClassName, environment) + fallbackCompileStrategy(compilerArgs, compilerClassName, environment) } } @@ -115,14 +114,18 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { val compilerMode = CompilerMode.JPS_COMPILER val verbose = compilerArgs.verbose val options = CompilationOptions(compilerMode, targetPlatform, reportCategories(verbose), reportSeverity(verbose), requestedCompilationResults = emptyArray()) - val allArgs = ArgumentUtils.convertArgumentsToStringList(compilerArgs) + - (compilerSettings?.additionalArguments?.split(" ") ?: emptyList()) - daemon.compile(sessionId, allArgs.toTypedArray(), options, JpsCompilerServicesFacadeImpl(environment), null) + daemon.compile(sessionId, withAdditionalCompilerArgs(compilerArgs), options, JpsCompilerServicesFacadeImpl(environment), null) } return res?.get()?.let { exitCodeFromProcessExitCode(it) } } + private fun withAdditionalCompilerArgs(compilerArgs: CommonCompilerArguments): Array { + val allArgs = ArgumentUtils.convertArgumentsToStringList(compilerArgs) + + (compilerSettings?.additionalArguments?.split(" ") ?: emptyList()) + return allArgs.toTypedArray() + } + private fun reportCategories(verbose: Boolean): Array { val categories = if (!verbose) { @@ -145,7 +148,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { } private fun fallbackCompileStrategy( - argsArray: Array, + compilerArgs: CommonCompilerArguments, compilerClassName: String, environment: JpsCompilerEnvironment ): ExitCode { @@ -161,7 +164,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { if (System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false").toBoolean()) System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") - val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, argsArray, environment, out) + val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, withAdditionalCompilerArgs(compilerArgs), environment, out) // exec() returns an ExitCode object, class of which is loaded with a different class loader, // so we take it's contents through reflection From 668b43686782eacb0929aef90e37271ba14481f0 Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Tue, 17 Jan 2017 10:52:41 +0100 Subject: [PATCH 0936/1557] Propagate 'CompilerConfiguration' to frontend checkers Original commit: 7a27a9d51f2c62c69e7029ffcc0c48e083cce8d0 --- .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index d7e9152c3da..60e7ad01be2 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -39,9 +39,9 @@ sealed class TargetPlatformKind( } } - object JavaScript : TargetPlatformKind(NoVersion, "JavaScript") + object JavaScript : TargetPlatformKind(DescriptionAware.NoVersion, "JavaScript") - object Common : TargetPlatformKind(NoVersion, "Common (experimental)") + object Common : TargetPlatformKind(DescriptionAware.NoVersion, "Common (experimental)") companion object { @@ -49,10 +49,6 @@ sealed class TargetPlatformKind( } } -object NoVersion : DescriptionAware { - override val description = "" -} - data class KotlinVersionInfo( var languageLevel: LanguageVersion? = null, var apiLevel: LanguageVersion? = null, From 86d3366b8c1afa596e37a871420751bdfd9d9d8b Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Sat, 24 Dec 2016 22:45:08 +0300 Subject: [PATCH 0937/1557] KJS: move println to kotlin.io; import kotlin.io by default in Default platform Original commit: 6ea6e4ab9852399cf627444b55d83e2ff6d744b4 --- .../lookupTracker/classifierMembers/foo.kt | 10 ++++----- .../lookupTracker/classifierMembers/usages.kt | 18 +++++++-------- .../conventions/delegateProperty.kt | 4 ++-- .../conventions/mathematicalLike.kt | 8 +++---- .../expressionType/inferredType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 +++++++++---------- .../lookupTracker/packageDeclarations/foo1.kt | 6 ++--- .../syntheticProperties/usages.kt | 14 ++++++------ 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 97a888a3418..2ead2958fd8 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 24f571473f3..3e5c2a88daa 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/vara() + /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/foo - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:foo.E*/bar() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/X + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/foo + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 2ce83a59781..2cc7762c327 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,8 +20,8 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.io(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() /*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() /*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index e5d11c6df21..db09b619fef 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.io(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.io(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:java.lang(times) p:kotlin.jvm(times) p:kotlin.io(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:java.lang(div) p:kotlin.jvm(div) p:kotlin.io(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) p:java.lang(times) p:kotlin.jvm(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) p:java.lang(div) p:kotlin.jvm(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index 58e483e5988..79cd22fc7b1 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -6,8 +6,8 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) /*p:foo*/fun useListOfA(a: /*p:foo*/List) {} /*p:foo*/fun useListOfB(b: /*p:foo*/List) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 47b6ca1eb83..37749d69847 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -11,27 +11,27 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:bar.C(S)*/C./*c:bar.C*/S() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/C./*c:bar.C*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(String)*/I./*c:foo.I*/isfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:foo.I(IS)*/I./*c:foo.I*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/I./*c:foo.I*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:foo.I(IS)*/I./*c:foo.I*/IS() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/F - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:baz.E*/F + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 67c1b46dcbe..f90afa55617 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,7 +4,7 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:baz(B)*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ /*p:foo p:bar(A)*/a @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/MyClass() + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 56d26e3edb1..ccd908bb387 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = /*p:foo*/KotlinClass() /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/setFoo(2) + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/setFoo(2) /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/bazBaz - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/bazBaz = /*p:kotlin(String)*/"" /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io*/boo = /*p:kotlin(Int)*/2 + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/boo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/bazBaz - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:java.lang p:kotlin.jvm p:kotlin.io c:JavaClass*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/boo = /*p:kotlin(Int)*/2 } From 40e1c2cdcebdb981b57ff1254b43624847a9bc04 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Wed, 18 Jan 2017 20:19:38 +0300 Subject: [PATCH 0938/1557] Add kotlin.comparisons package to default imports. Original commit: 3ec48ab244315bf301aa8e66b86a868dee6bb0a5 --- .../lookupTracker/classifierMembers/foo.kt | 10 ++++----- .../lookupTracker/classifierMembers/usages.kt | 18 +++++++-------- .../conventions/delegateProperty.kt | 4 ++-- .../conventions/mathematicalLike.kt | 8 +++---- .../expressionType/inferredType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 +++++++++---------- .../lookupTracker/packageDeclarations/foo1.kt | 6 ++--- .../syntheticProperties/usages.kt | 14 ++++++------ 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 2ead2958fd8..2982b10cffa 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index 3e5c2a88daa..b826bbd7f07 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/vara() + /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/foo - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/bar() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/X + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/foo + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 2cc7762c327..f8016f6b354 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,8 +20,8 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() /*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() /*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index db09b619fef..609261b0e9a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) p:java.lang(times) p:kotlin.jvm(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) p:java.lang(div) p:kotlin.jvm(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:java.lang(times) p:kotlin.jvm(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:java.lang(div) p:kotlin.jvm(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index 79cd22fc7b1..01a77b36fd9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -6,8 +6,8 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) /*p:foo*/fun useListOfA(a: /*p:foo*/List) {} /*p:foo*/fun useListOfB(b: /*p:foo*/List) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 37749d69847..daef69757b1 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -11,27 +11,27 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/I./*c:foo.I*/isfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:foo.I(IS)*/I./*c:foo.I*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/I./*c:foo.I*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:foo.I(IS)*/I./*c:foo.I*/IS() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:baz.E*/F - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:baz.E*/F + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index f90afa55617..18cb6738798 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,7 +4,7 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:baz(B)*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ /*p:foo p:bar(A)*/a @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/MyClass() + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index ccd908bb387..3a536591a87 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = /*p:foo*/KotlinClass() /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/setFoo(2) + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/setFoo(2) /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/bazBaz - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/bazBaz = /*p:kotlin(String)*/"" /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm*/boo = /*p:kotlin(Int)*/2 + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/boo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/boo = /*p:kotlin(Int)*/2 } From 6f8204b70efda7e1c4a2a0296f2bf848876ef15a Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 17 Jan 2017 16:29:07 +0300 Subject: [PATCH 0939/1557] Kotlin Facet: Annotate CompilerSettings properties with @JvmField to make them available for copyBean() #KT-15621 Fixed #KT-15623 Fixed Original commit: b35eba0621623e8ec09cbeaf792bc612bba71c7a --- .../org/jetbrains/kotlin/config/CompilerSettings.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 1fedf41bc12..8ca191aaf90 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -17,11 +17,11 @@ package org.jetbrains.kotlin.config class CompilerSettings { - var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS - var scriptTemplates: String = "" - var scriptTemplatesClasspath: String = "" - var copyJsLibraryFiles: Boolean = true - var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY + @JvmField var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS + @JvmField var scriptTemplates: String = "" + @JvmField var scriptTemplatesClasspath: String = "" + @JvmField var copyJsLibraryFiles: Boolean = true + @JvmField var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY companion object { private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" From 19d76a9e92758df0711157b371fbf8e6464a7b82 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 17 Jan 2017 18:04:08 +0300 Subject: [PATCH 0940/1557] Kotlin Facet: Use project settings by default #KT-15624 Fixed Original commit: fc9b001ccd16e8e0f27ea6133bfaec873c5e0b24 --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 60e7ad01be2..fd466bb6334 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -114,7 +114,7 @@ class KotlinFacetSettings { val DEFAULT_VERSION = 0 } - var useProjectSettings: Boolean = false + var useProjectSettings: Boolean = true var versionInfo = KotlinVersionInfo() var compilerInfo = KotlinCompilerInfo() From b7f15b777785f2e8e162eb9aea9e57f724862910 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 19 Jan 2017 15:30:06 +0300 Subject: [PATCH 0941/1557] JPS: Use facet configuration to determine if module should be compiled to JS Original commit: 57c27299ddba35148504c9bb6547c26cda1f3d77 --- .../jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt | 10 +++------- .../src/org/jetbrains/kotlin/jps/build/JpsUtils.java | 8 ++++++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 9795240cdd8..568f9599f40 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -62,13 +62,6 @@ class JpsKotlinCompilerSettings : JpsElementBase() { return settings } - private val JpsModule.targetPlatform: TargetPlatformKind<*>? - get() { - val facetSettings = kotlinFacetExtension?.settings ?: return TargetPlatformKind.Common - if (facetSettings.useProjectSettings) return TargetPlatformKind.Common - return facetSettings.versionInfo.targetPlatformKind - } - fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments { val defaultArguments = getSettings(module.project).commonCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments @@ -132,3 +125,6 @@ class JpsKotlinCompilerSettings : JpsElementBase() { } } } + +val JpsModule.targetPlatform: TargetPlatformKind<*>? + get() = kotlinFacetExtension?.settings?.versionInfo?.targetPlatformKind \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java index 58058ec0573..577f4e8c358 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsUtils.java @@ -26,6 +26,8 @@ import org.jetbrains.jps.model.library.JpsLibrary; import org.jetbrains.jps.model.library.JpsLibraryRoot; import org.jetbrains.jps.model.library.JpsOrderRootType; import org.jetbrains.jps.util.JpsPathUtil; +import org.jetbrains.kotlin.config.TargetPlatformKind; +import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettingsKt; import org.jetbrains.kotlin.utils.LibraryUtils; import java.util.Map; @@ -33,10 +35,9 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; class JpsUtils { - private JpsUtils() {} - private static final Map IS_KOTLIN_JS_MODULE_CACHE = new ConcurrentHashMap(); private static final Map IS_KOTLIN_JS_STDLIB_JAR_CACHE = new ConcurrentHashMap(); + private JpsUtils() {} @NotNull static JpsJavaDependenciesEnumerator getAllDependencies(@NotNull ModuleBuildTarget target) { @@ -55,6 +56,9 @@ class JpsUtils { } private static boolean isJsKotlinModuleImpl(@NotNull ModuleBuildTarget target) { + TargetPlatformKind targetPlatform = JpsKotlinCompilerSettingsKt.getTargetPlatform(target.getModule()); + if (targetPlatform != null) return targetPlatform == TargetPlatformKind.JavaScript.INSTANCE; + Set libraries = getAllDependencies(target).getLibraries(); for (JpsLibrary library : libraries) { for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) { From 718b0c228e147c37f0d0bb2ac41e0fba55cb9866 Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 16 Jan 2017 16:49:30 +0100 Subject: [PATCH 0942/1557] Update daemon client with wrappers for basic compiler API Other changes to extract results for compiler, tests. Original commit: ec7e8873f4e09304b47978f974f3c537c38fc96b --- .../JpsCompilerServicesFacadeImpl.kt | 63 ++----------------- 1 file changed, 6 insertions(+), 57 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt index 285677acf08..3410543678a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsCompilerServicesFacadeImpl.kt @@ -16,11 +16,10 @@ package org.jetbrains.kotlin.compilerRunner -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity -import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil import org.jetbrains.kotlin.daemon.client.CompilerCallbackServicesFacadeServer -import org.jetbrains.kotlin.daemon.common.* +import org.jetbrains.kotlin.daemon.client.reportFromDaemon +import org.jetbrains.kotlin.daemon.common.JpsCompilerServicesFacade +import org.jetbrains.kotlin.daemon.common.SOCKET_ANY_FREE_PORT import org.jetbrains.kotlin.load.kotlin.incremental.components.IncrementalCompilationComponents import org.jetbrains.kotlin.progress.CompilationCanceledStatus import java.io.Serializable @@ -34,58 +33,8 @@ internal class JpsCompilerServicesFacadeImpl( JpsCompilerServicesFacade { override fun report(category: Int, severity: Int, message: String?, attachment: Serializable?) { - val reportCategory = ReportCategory.fromCode(category) - - when (reportCategory) { - ReportCategory.OUTPUT_MESSAGE -> { - val output = OutputMessageUtil.parseOutputMessage(message!!) - if (output != null) { - env.outputItemsCollector.add(output.sourceFiles, output.outputFile) - } - } - ReportCategory.EXCEPTION -> { - env.messageCollector.report(CompilerMessageSeverity.EXCEPTION, message!!, CompilerMessageLocation.NO_LOCATION) - } - ReportCategory.COMPILER_MESSAGE -> { - val compilerSeverity = when (ReportSeverity.fromCode(severity)) { - ReportSeverity.ERROR -> CompilerMessageSeverity.ERROR - ReportSeverity.WARNING -> CompilerMessageSeverity.WARNING - ReportSeverity.INFO -> CompilerMessageSeverity.INFO - ReportSeverity.DEBUG -> CompilerMessageSeverity.LOGGING - else -> throw IllegalStateException("Unexpected compiler message report severity $severity") - } - if (message != null && attachment is CompilerMessageLocation) { - env.messageCollector.report(compilerSeverity, message, attachment) - } - else { - reportUnexpected(category, severity, message, attachment) - } - } - ReportCategory.DAEMON_MESSAGE, - ReportCategory.IC_MESSAGE -> { - if (message != null) { - env.messageCollector.report(CompilerMessageSeverity.LOGGING, message, CompilerMessageLocation.NO_LOCATION) - } - else { - reportUnexpected(category, severity, message, attachment) - } - } - else -> { - reportUnexpected(category, severity, message, attachment) - } - } - } - - private fun reportUnexpected(category: Int, severity: Int, message: String?, attachment: Serializable?) { - val compilerMessageSeverity = when (ReportSeverity.fromCode(severity)) { - ReportSeverity.ERROR -> CompilerMessageSeverity.ERROR - ReportSeverity.WARNING -> CompilerMessageSeverity.WARNING - ReportSeverity.INFO -> CompilerMessageSeverity.INFO - else -> CompilerMessageSeverity.LOGGING - } - - env.messageCollector.report(compilerMessageSeverity, - "Unexpected message: category=$category; severity=$severity; message='$message'; attachment=$attachment", - CompilerMessageLocation.NO_LOCATION) + env.messageCollector.reportFromDaemon( + { outFile, srcFiles -> env.outputItemsCollector.add(srcFiles, outFile) }, + category, severity, message, attachment) } } \ No newline at end of file From 84691965cb8d653eb25213622117600dc38f3a7d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 26 Jan 2017 11:51:35 +0300 Subject: [PATCH 0943/1557] Save JvmBuildMetaInfo to file after build Original commit: 4a63e47aa097490ab4e7fa42af7246a81c307116 --- .../AbstractIncrementalLazyCachesTest.kt | 18 +++++++++------- .../kotlin/jps/build/KotlinBuilder.kt | 21 ++++++++++++++++--- .../experimentalOn/expected-kotlin-caches.txt | 4 ++++ .../expected-kotlin-caches.txt | 3 +++ .../expected-kotlin-caches.txt | 4 ++++ .../incrementalOff/expected-kotlin-caches.txt | 4 ++++ .../expected-kotlin-caches.txt | 4 ++++ .../class/expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 1 + .../expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 1 + .../constant/expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 1 + .../function/expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 1 + .../expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 1 + .../expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 1 + .../expected-kotlin-caches.txt | 1 + .../experimental-expected-kotlin-caches.txt | 1 + 21 files changed, 62 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt index 02b7270f0ab..ea36a1d0d36 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalLazyCachesTest.kt @@ -75,13 +75,18 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() val sb = StringBuilder() val p = Printer(sb) val targets = projectDescriptor.allModuleTargets - val paths = projectDescriptor.dataManager.dataPaths + val dataManager = projectDescriptor.dataManager + val paths = dataManager.dataPaths val versions = CacheVersionProvider(paths) - dumpCachesForTarget(p, paths, KotlinDataContainerTarget, versions.dataContainerVersion()) + dumpCachesForTarget(p, paths, KotlinDataContainerTarget, versions.dataContainerVersion().formatVersionFile) for (target in targets.sortedBy { it.presentableName }) { - dumpCachesForTarget(p, paths, target, versions.normalVersion(target), versions.experimentalVersion(target), + val jvmMetaBuildInfo = jvmBuildMetaInfoFile(target, dataManager) + dumpCachesForTarget(p, paths, target, + versions.normalVersion(target).formatVersionFile, + versions.experimentalVersion(target).formatVersionFile, + jvmMetaBuildInfo, subdirectory = KOTLIN_CACHE_DIRECTORY_NAME) } @@ -92,16 +97,15 @@ abstract class AbstractIncrementalLazyCachesTest : AbstractIncrementalJpsTest() p: Printer, paths: BuildDataPaths, target: BuildTarget<*>, - vararg cacheVersions: CacheVersion, + vararg cacheVersionsFiles: File, subdirectory: String? = null ) { p.println(target) p.pushIndent() val dataRoot = paths.getTargetDataRoot(target).let { if (subdirectory != null) File(it, subdirectory) else it } - cacheVersions - .map { it.formatVersionFile } - .filter { it.exists() } + cacheVersionsFiles + .filter(File::exists) .sortedBy { it.name } .forEach { p.println(it.name) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 1ffb30d7557..0dbb1f8837b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -75,6 +75,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { @JvmField val KOTLIN_BUILDER_NAME: String = "Kotlin Builder" val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") + const val JVM_BUILD_META_INFO_FILE_NAME = "jvm-build-meta-info.txt" } private val statisticsLogger = TeamcityStatisticsLogger() @@ -211,7 +212,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return ABORT } - val commonArguments = JpsKotlinCompilerSettings.getCommonCompilerArguments(chunk.representativeTarget().module) + val commonArguments = compilerArgumentsForChunk(chunk) commonArguments.verbose = true // Make compiler report source to output files mapping val allCompiledFiles = getAllCompiledFilesContainer(context) @@ -241,7 +242,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val generatedFiles = getGeneratedFiles(chunk, environment.outputItemsCollector) registerOutputItems(outputConsumer, generatedFiles) - saveVersions(context, chunk) + saveVersions(context, chunk, commonArguments) if (targets.any { hasKotlin[it] == null }) { fsOperations.markChunk(recursively = false, kotlinOnly = true, excludeFiles = filesToCompile.values().toSet()) @@ -356,13 +357,25 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } } - private fun saveVersions(context: CompileContext, chunk: ModuleChunk) { + private fun saveVersions(context: CompileContext, chunk: ModuleChunk, commonArguments: CommonCompilerArguments) { val dataManager = context.projectDescriptor.dataManager val targets = chunk.targets val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) cacheVersionsProvider.allVersions(targets).forEach { it.saveIfNeeded() } + + if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { + val jvmBuildMetaInfo = JvmBuildMetaInfo(commonArguments) + val serializedMetaInfo = JvmBuildMetaInfo.serializeToString(jvmBuildMetaInfo) + + for (target in chunk.targets) { + jvmBuildMetaInfoFile(target, dataManager).writeText(serializedMetaInfo) + } + } } + private fun compilerArgumentsForChunk(chunk: ModuleChunk): CommonCompilerArguments = + JpsKotlinCompilerSettings.getCommonCompilerArguments(chunk.representativeTarget().module) + private fun doCompileModuleChunk( allCompiledFiles: MutableSet, chunk: ModuleChunk, commonArguments: CommonCompilerArguments, context: CompileContext, dirtyFilesHolder: DirtyFilesHolder, environment: JpsCompilerEnvironment, @@ -902,3 +915,5 @@ private fun hasKotlinDirtyOrRemovedFiles( return chunk.targets.any { KotlinSourceFileCollector.getRemovedKotlinFiles(dirtyFilesHolder, it).isNotEmpty() } } +fun jvmBuildMetaInfoFile(target: ModuleBuildTarget, dataManager: BuildDataManager): File = + File(dataManager.dataPaths.getTargetDataRoot(target), KotlinBuilder.JVM_BUILD_META_INFO_FILE_NAME) diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt index 286057c136b..d7c26b97102 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOn/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module1' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt class-fq-name-to-source.tab internal-name-to-source.tab proto.tab @@ -15,6 +16,7 @@ Module 'module1' tests Module 'module2' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt class-fq-name-to-source.tab internal-name-to-source.tab package-parts.tab @@ -26,6 +28,7 @@ Module 'module2' tests Module 'module3' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt class-fq-name-to-source.tab internal-name-to-source.tab proto.tab @@ -34,6 +37,7 @@ Module 'module3' tests Module 'module4' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt index f5cb5275720..76e1b8e4274 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnJavaChanged/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module1' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt internal-name-to-source.tab package-parts.tab proto.tab @@ -15,6 +16,7 @@ Module 'module1' tests Module 'module2' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt internal-name-to-source.tab package-parts.tab proto.tab @@ -23,6 +25,7 @@ Module 'module2' tests Module 'module3' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt internal-name-to-source.tab package-parts.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt index 8d7665c25d0..daa914dfd19 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/experimentalOnOff/expected-kotlin-caches.txt @@ -1,22 +1,26 @@ kotlin-data-container Module 'module1' production format-version.txt + jvm-build-meta-info.txt proto.tab source-to-classes.tab Module 'module1' tests Module 'module2' production format-version.txt + jvm-build-meta-info.txt package-parts.tab proto.tab source-to-classes.tab Module 'module2' tests Module 'module3' production format-version.txt + jvm-build-meta-info.txt proto.tab source-to-classes.tab Module 'module3' tests Module 'module4' production format-version.txt + jvm-build-meta-info.txt proto.tab source-to-classes.tab Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt index e273e094704..6c3efb0caef 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff/expected-kotlin-caches.txt @@ -1,9 +1,13 @@ kotlin-data-container Module 'module1' production + jvm-build-meta-info.txt Module 'module1' tests Module 'module2' production + jvm-build-meta-info.txt Module 'module2' tests Module 'module3' production + jvm-build-meta-info.txt Module 'module3' tests Module 'module4' production + jvm-build-meta-info.txt Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt index 982cd0121bb..e8945afaacd 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt @@ -1,11 +1,13 @@ kotlin-data-container Module 'module1' production format-version.txt + jvm-build-meta-info.txt proto.tab source-to-classes.tab Module 'module1' tests Module 'module2' production format-version.txt + jvm-build-meta-info.txt inline-functions.tab inlined-to.tab package-parts.tab @@ -14,11 +16,13 @@ Module 'module2' production Module 'module2' tests Module 'module3' production format-version.txt + jvm-build-meta-info.txt proto.tab source-to-classes.tab Module 'module3' tests Module 'module4' production format-version.txt + jvm-build-meta-info.txt proto.tab source-to-classes.tab Module 'module4' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index cf4dcf7ea18..9c2ef5d4b0a 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt + jvm-build-meta-info.txt proto.tab source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt index bf5b0abf716..a8e59355f1c 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/experimental-expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt index cf4dcf7ea18..9c2ef5d4b0a 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt + jvm-build-meta-info.txt proto.tab source-to-classes.tab Module 'module' tests \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt index 076178b6fc5..15f2ab8c248 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/experimental-expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt index 9a851b0cc46..4a57494858e 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt + jvm-build-meta-info.txt constants.tab package-parts.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt index 093875fd5ed..7011a7065d5 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/constant/experimental-expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt constants.tab internal-name-to-source.tab package-parts.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt index 8d3d53a48a1..61716259d9e 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt + jvm-build-meta-info.txt package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt index 14f66d6ef09..d44fd6c4253 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/function/experimental-expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt internal-name-to-source.tab package-parts.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt index 3449f76e358..3fb62147860 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt + jvm-build-meta-info.txt inline-functions.tab inlined-to.tab package-parts.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt index a33c2237216..cc6f16e3ad5 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage/experimental-expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt inline-functions.tab internal-name-to-source.tab package-parts.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt index ae521f0a275..3d63d407e3b 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt + jvm-build-meta-info.txt inline-functions.tab package-parts.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt index a33c2237216..cc6f16e3ad5 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage/experimental-expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt inline-functions.tab internal-name-to-source.tab package-parts.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt index 8d3d53a48a1..61716259d9e 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt @@ -1,6 +1,7 @@ kotlin-data-container Module 'module' production format-version.txt + jvm-build-meta-info.txt package-parts.tab proto.tab source-to-classes.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt index 14f66d6ef09..d44fd6c4253 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/experimental-expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production experimental-format-version.txt format-version.txt + jvm-build-meta-info.txt internal-name-to-source.tab package-parts.tab proto.tab From 9f8ba4585316dc758d1050b6458ed3297022abdd Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 26 Jan 2017 13:38:27 +0300 Subject: [PATCH 0944/1557] Rebuild all kotlin files when EAP flag is changed Original commit: b9dbe692325c6250c58bff64a49857ad319dc399 --- jps/jps-plugin/jps-tests/jps-tests.iml | 1 + .../kotlin/jps/build/KotlinJpsBuildTest.kt | 34 ++++++++++++++ .../kotlin/jps/build/KotlinBuilder.kt | 46 ++++++++++++++----- .../general/EAPToReleaseIC/kotlinProject.iml | 12 +++++ .../general/EAPToReleaseIC/kotlinProject.ipr | 14 ++++++ .../general/EAPToReleaseIC/src/Bar.kt | 6 +++ .../general/EAPToReleaseIC/src/Foo.kt | 7 +++ 7 files changed, 109 insertions(+), 11 deletions(-) create mode 100644 jps/jps-plugin/testData/general/EAPToReleaseIC/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/EAPToReleaseIC/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/EAPToReleaseIC/src/Bar.kt create mode 100644 jps/jps-plugin/testData/general/EAPToReleaseIC/src/Foo.kt diff --git a/jps/jps-plugin/jps-tests/jps-tests.iml b/jps/jps-plugin/jps-tests/jps-tests.iml index 2f6d94239e8..6100f2af4f5 100644 --- a/jps/jps-plugin/jps-tests/jps-tests.iml +++ b/jps/jps-plugin/jps-tests/jps-tests.iml @@ -17,5 +17,6 @@ + \ No newline at end of file diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index eccbf0d287d..53c509b3b54 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -33,6 +33,7 @@ import org.jetbrains.jps.builders.CompileScopeTestBuilder import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.builders.TestProjectBuilderLogger import org.jetbrains.jps.builders.impl.BuildDataPathsImpl +import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerImpl import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.cmdline.ProjectDescriptor import org.jetbrains.jps.incremental.BuilderRegistry @@ -49,9 +50,14 @@ import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil +import org.jetbrains.kotlin.config.KotlinCompilerVersion +import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_ENABLED_PROPERTY import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.withIC import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest.LibraryDependency.* +import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver +import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver.Companion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils @@ -785,6 +791,34 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { doTest() } + fun testEAPToReleaseIC() { + fun setPreRelease(value: Boolean) { + System.setProperty(TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY, value.toString()) + } + + try { + withIC { + initProject(JVM_MOCK_RUNTIME) + + setPreRelease(true) + makeAll().assertSuccessful() + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Bar.kt", "src/Foo.kt") + + touch("src/Foo.kt").apply() + makeAll() + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Foo.kt") + + setPreRelease(false) + touch("src/Foo.kt").apply() + makeAll().assertSuccessful() + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Bar.kt", "src/Foo.kt") + } + } + finally { + System.clearProperty(TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY) + } + } + fun testGetDependentTargets() { fun addModuleWithSourceAndTestRoot(name: String): JpsModule { return addModule(name, "src/").apply { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 0dbb1f8837b..f8d8c1c097d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -37,9 +37,7 @@ import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule -import org.jetbrains.kotlin.build.GeneratedFile -import org.jetbrains.kotlin.build.GeneratedJvmClass -import org.jetbrains.kotlin.build.isModuleMappingFile +import org.jetbrains.kotlin.build.* import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity @@ -47,11 +45,8 @@ import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil import org.jetbrains.kotlin.compilerRunner.* -import org.jetbrains.kotlin.config.CompilerRunnerConstants +import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX -import org.jetbrains.kotlin.config.IncrementalCompilation -import org.jetbrains.kotlin.config.KotlinCompilerVersion -import org.jetbrains.kotlin.config.Services import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.incremental.components.LookupTracker @@ -63,9 +58,8 @@ import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.preloading.ClassCondition import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.utils.JsLibraryUtils -import org.jetbrains.kotlin.utils.PathUtil -import org.jetbrains.kotlin.utils.keysToMap +import org.jetbrains.kotlin.build.JvmBuildMetaInfo +import org.jetbrains.kotlin.utils.* import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.util.* @@ -115,7 +109,37 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) val allVersions = cacheVersionsProvider.allVersions(targets) - val actions = allVersions.map { it.checkVersion() }.toSet() + val actions = allVersions.map { it.checkVersion() }.toMutableSet() + + if (!JpsUtils.isJsKotlinModule(chunk.representativeTarget())) { + val args = compilerArgumentsForChunk(chunk) + val currentBuildMetaInfo = JvmBuildMetaInfo(args) + + for (target in chunk.targets) { + val file = jvmBuildMetaInfoFile(target, dataManager) + if (!file.exists()) continue + + val lastBuildMetaInfo = + try { + JvmBuildMetaInfo.deserializeFromString(file.readText()) ?: continue + } + catch (e: Exception) { + LOG.error("Could not deserialize jvm build meta info", e) + continue + } + + val lastBuildLangVersion = LanguageVersion.fromVersionString(lastBuildMetaInfo.languageVersionString) + // reuse logic from compiler? + if (lastBuildLangVersion != LanguageVersion.KOTLIN_1_0 + && lastBuildMetaInfo.isEAP + && !currentBuildMetaInfo.isEAP + ) { + // If EAP->Non-EAP build with IC, then rebuild all kotlin + LOG.info("Last build was compiled with EAP-plugin. Performing non-incremental rebuild (kotlin only)") + actions.add(CacheVersion.Action.REBUILD_ALL_KOTLIN) + } + } + } val fsOperations = FSOperationsHelper(context, chunk, LOG) applyActionsOnCacheVersionChange(actions, cacheVersionsProvider, context, dataManager, targets, fsOperations) diff --git a/jps/jps-plugin/testData/general/EAPToReleaseIC/kotlinProject.iml b/jps/jps-plugin/testData/general/EAPToReleaseIC/kotlinProject.iml new file mode 100644 index 00000000000..d04ecd6e02e --- /dev/null +++ b/jps/jps-plugin/testData/general/EAPToReleaseIC/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/EAPToReleaseIC/kotlinProject.ipr b/jps/jps-plugin/testData/general/EAPToReleaseIC/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/EAPToReleaseIC/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/EAPToReleaseIC/src/Bar.kt b/jps/jps-plugin/testData/general/EAPToReleaseIC/src/Bar.kt new file mode 100644 index 00000000000..f577138fb1c --- /dev/null +++ b/jps/jps-plugin/testData/general/EAPToReleaseIC/src/Bar.kt @@ -0,0 +1,6 @@ +package test + +class Bar() { + fun bar() { + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/EAPToReleaseIC/src/Foo.kt b/jps/jps-plugin/testData/general/EAPToReleaseIC/src/Foo.kt new file mode 100644 index 00000000000..494c3dea241 --- /dev/null +++ b/jps/jps-plugin/testData/general/EAPToReleaseIC/src/Foo.kt @@ -0,0 +1,7 @@ +package test + +class Foo() { + fun foo() { + Bar().bar() + } +} \ No newline at end of file From 74bd1719339e57471130aea94d5c6a1b49c0f92d Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 26 Jan 2017 14:50:33 +0300 Subject: [PATCH 0945/1557] Misc: Reverted e2fff37cccf0c61a746504cfb8964c996ae6b073 'Copy compiler arguments from iml even if "Use project settings" checkbox is checked' as it's rendered obsolete due to "Use project settings" being turned off by default in Gradle/Maven projects Original commit: deb9258994eee916904b2fd4db4ffdebd618ff7d --- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 568f9599f40..99d006e70af 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -65,22 +65,16 @@ class JpsKotlinCompilerSettings : JpsElementBase() { fun getCommonCompilerArguments(module: JpsModule): CommonCompilerArguments { val defaultArguments = getSettings(module.project).commonCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments + if (facetSettings.useProjectSettings) return defaultArguments val (languageLevel, apiLevel) = facetSettings.versionInfo val facetArguments = facetSettings.compilerInfo.commonCompilerArguments ?: return defaultArguments return copyBean(facetArguments).apply { - if (facetSettings.useProjectSettings) { - languageVersion = defaultArguments.languageVersion - apiVersion = defaultArguments.apiVersion - multiPlatform = defaultArguments.multiPlatform - } - else { - languageVersion = languageLevel?.description - apiVersion = apiLevel?.description - multiPlatform = module - .dependenciesList - .dependencies - .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common } - } + languageVersion = languageLevel?.description + apiVersion = apiLevel?.description + multiPlatform = module + .dependenciesList + .dependencies + .any { (it as? JpsModuleDependency)?.module?.targetPlatform == TargetPlatformKind.Common } } } From 78391cd97cf026f686e6c75031622deeebad9974 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Thu, 26 Jan 2017 13:56:10 +0300 Subject: [PATCH 0946/1557] Move coroutine-related runtime parts to kotlin.coroutines.experimental package #KT-15975 Fixed Original commit: 8fa8ba70558cfd610d91b1c6ba55c37967ac35c5 --- .../testData/incremental/inlineFunCallSite/coroutine/usage.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt index d83d913db23..c6e11a28ed8 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/coroutine/usage.kt @@ -1,6 +1,6 @@ package usage -import kotlin.coroutines.* -import kotlin.coroutines.intrinsics.* +import kotlin.coroutines.experimental.* +import kotlin.coroutines.experimental.intrinsics.* fun async(x: suspend Controller.() -> Unit) { x.startCoroutine(Controller(), object : Continuation { From 77bfa685dd0990f1c051626aa0856ecb43313393 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Fri, 27 Jan 2017 19:07:59 +0100 Subject: [PATCH 0947/1557] Import new Gradle coroutines DSL setting into Kotlin facet Original commit: da6640971f88a89d70bd42c355afaa58f1390ca9 --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index fd466bb6334..e71fd230cdc 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -82,7 +82,7 @@ enum class CoroutineSupport( } fun byCompilerArgument(argument: String): CoroutineSupport { - return CoroutineSupport.values().find { it.compilerArgument == argument } ?: DEFAULT + return CoroutineSupport.values().find { it.compilerArgument.equals(argument, ignoreCase = true) } ?: DEFAULT } } } From ceba0661bcf905d78a21119d2cc971c6b403a3da Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Fri, 27 Jan 2017 19:49:43 +0100 Subject: [PATCH 0948/1557] Move daemon session flag files to daemon discovery dir by default + minor fixes: - Move flag files from the temp dir, because right now JPS cleans temp dir on each build start. Should fix KT-15707, also may affect KT-15562. - change compiler runner to allow the fix above - Fix flag file name filtering - Fix ifAlive handling on the new compile method in the daemon. Original commit: 7c0cdf90cf3114b220fb362cb5630299e1ecad98 --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index a557b301749..22f2f111759 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -206,10 +206,10 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { val libPath = CompilerRunnerUtil.getLibPath(environment.kotlinPaths, environment.messageCollector) val compilerPath = File(libPath, "kotlin-compiler.jar") val compilerId = CompilerId.makeCompilerId(compilerPath) - val flagFile = File.createTempFile("kotlin-compiler-jps-session-", "-is-running").apply { - deleteOnExit() - } - jpsDaemonConnection = newDaemonConnection(compilerId, flagFile, environment) + // TODO: pass daemon options to newDaemonConnection + val daemonOptions = configureDaemonOptions() + val flagFile = makeAutodeletingFlagFile("compiler-jps-session-", File(daemonOptions.runFilesPathOrDefault)) + jpsDaemonConnection = newDaemonConnection(compilerId, flagFile, environment, daemonOptions) } return jpsDaemonConnection!! } From 98b25d073802483ca4875fc2da25a69471d39e0d Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 26 Jan 2017 13:09:14 +0300 Subject: [PATCH 0949/1557] JS: minor, drop obsolete VFS_PROTOCOL Original commit: 17b0b7704f08d4a93c413f94aa5bd734a96a885d --- .../src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index c5ea466adb5..b329ce89e8d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -28,7 +28,6 @@ import java.io.File import java.util.ArrayList object JpsJsModuleUtils { - fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List { val result = ArrayList() getLibraryFiles(target, result) @@ -40,11 +39,7 @@ object JpsJsModuleUtils { val libraries = JpsUtils.getAllDependencies(target).libraries for (library in libraries) { for (root in library.getRoots(JpsOrderRootType.COMPILED)) { - val path = JpsPathUtil.urlToPath(root.url) - // ignore files, added only for IDE support (stubs and indexes) - if (!path.startsWith(KotlinJavascriptMetadataUtils.VFS_PROTOCOL + "://")) { - result.add(path) - } + result.add(JpsPathUtil.urlToPath(root.url)) } } } From 0ac040e130a7a64cd40b987237e0ce691d5d3ad8 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 26 Jan 2017 13:44:55 +0300 Subject: [PATCH 0950/1557] JS: drop "-kjsm" flag, merge logic with "-meta-info" #KT-16049 Fixed Original commit: e5680565b3dcf470285f82c573b60dc2a0690125 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 53c509b3b54..a1b902c814a 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -89,15 +89,22 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { "$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", "lib/kotlin.js", - "lib/kotlin.meta.js" + "lib/kotlin.meta.js", + "$PROJECT_NAME/root-package.kjsm" ) private val EXPECTED_JS_FILES_IN_OUTPUT_FOR_MODULE_STDLIB_ONLY = hashSetOf( "$ADDITIONAL_MODULE_NAME.js", "$ADDITIONAL_MODULE_NAME.meta.js", "lib/kotlin.js", - "lib/kotlin.meta.js" + "lib/kotlin.meta.js", + "$ADDITIONAL_MODULE_NAME/module2/module2.kjsm" + ) + private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf( + "$PROJECT_NAME.js", + "$PROJECT_NAME.meta.js", + "$PROJECT_NAME/root-package.kjsm", + "$PROJECT_NAME/library/sample/sample.kjsm" ) - private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf("$PROJECT_NAME.js", "$PROJECT_NAME.meta.js") private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf( "$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", @@ -108,7 +115,9 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { "lib/dir/file1.js", "lib/META-INF-ex/file2.js", "lib/res0.js", - "lib/resdir/res1.js" + "lib/resdir/res1.js", + "$PROJECT_NAME/root-package.kjsm", + "$PROJECT_NAME/library/sample/sample.kjsm" ) private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = hashSetOf( "$PROJECT_NAME.js", @@ -120,7 +129,9 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { "custom/dir/file1.js", "custom/META-INF-ex/file2.js", "custom/res0.js", - "custom/resdir/res1.js" + "custom/resdir/res1.js", + "$PROJECT_NAME/root-package.kjsm", + "$PROJECT_NAME/library/sample/sample.kjsm" ) private fun k2jsOutput(vararg moduleNames: String): Array { From 6594285693448a776445d665e452c87d3d910c7c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 27 Jan 2017 16:40:12 +0300 Subject: [PATCH 0951/1557] Introduce CompilerMessageSeverity.STRONG_WARNING This is a severity for mandatory warnings, i.e. those which should be reported in any case, even if there are compilation errors Original commit: 7ac96163acb7bdbb23c4e8d063ab0de497f6157b --- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index f8d8c1c097d..7c64ef1e7b3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -37,14 +37,20 @@ import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.java.JpsJavaClasspathKind import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsModule -import org.jetbrains.kotlin.build.* +import org.jetbrains.kotlin.build.GeneratedFile +import org.jetbrains.kotlin.build.GeneratedJvmClass +import org.jetbrains.kotlin.build.JvmBuildMetaInfo +import org.jetbrains.kotlin.build.isModuleMappingFile import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil -import org.jetbrains.kotlin.compilerRunner.* +import org.jetbrains.kotlin.compilerRunner.JpsCompilerEnvironment +import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner +import org.jetbrains.kotlin.compilerRunner.OutputItemsCollector +import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl import org.jetbrains.kotlin.config.* import org.jetbrains.kotlin.config.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX import org.jetbrains.kotlin.daemon.common.isDaemonEnabled @@ -58,8 +64,9 @@ import org.jetbrains.kotlin.modules.TargetId import org.jetbrains.kotlin.preloading.ClassCondition import org.jetbrains.kotlin.progress.CompilationCanceledException import org.jetbrains.kotlin.progress.CompilationCanceledStatus -import org.jetbrains.kotlin.build.JvmBuildMetaInfo -import org.jetbrains.kotlin.utils.* +import org.jetbrains.kotlin.utils.JsLibraryUtils +import org.jetbrains.kotlin.utils.PathUtil +import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.util.* @@ -766,7 +773,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { return when (severity) { INFO -> BuildMessage.Kind.INFO ERROR, EXCEPTION -> BuildMessage.Kind.ERROR - WARNING -> BuildMessage.Kind.WARNING + WARNING, STRONG_WARNING -> BuildMessage.Kind.WARNING LOGGING -> BuildMessage.Kind.PROGRESS else -> throw IllegalArgumentException("Unsupported severity: " + severity) } From a315b73c919397f78e31f7286eec6eef81eec930 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 27 Jan 2017 16:45:02 +0300 Subject: [PATCH 0952/1557] Promote severity of configuration warnings to STRONG_WARNING The reason is that these configuration problems may be the reason of compilation errors, but they were hidden from the output because warnings are not reported when there's at least one error Original commit: e9a737b85af105d32b63c7a9b0abfad2c6786ba3 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 7c64ef1e7b3..a519d7a1a96 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -639,7 +639,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { // We do not support circular dependencies, but if they are present, we do our best should not break the build, // so we simply yield a warning and report NOTHING_DONE environment.messageCollector.report( - WARNING, + STRONG_WARNING, "Circular dependencies are not supported. The following JS modules depend on each other: " + chunk.modules.map { it.name }.joinToString(", ") + ". " + "Kotlin is not compiled for these modules", @@ -690,7 +690,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { ): OutputItemsCollector? { if (chunk.modules.size > 1) { environment.messageCollector.report( - WARNING, + STRONG_WARNING, "Circular dependencies are only partially supported. The following modules depend on each other: " + chunk.modules.map { it.name }.joinToString(", ") + ". " + "Kotlin will compile them, but some strange effect may happen", From 79d67e97c36fa6043871f4d715a60bfac15bbd1e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 30 Jan 2017 18:54:24 +0300 Subject: [PATCH 0953/1557] JS: rename "-library-files" argument to "-libraries" and change separator Use the system separator (':' or ';') instead of commas #KT-16083 Fixed Original commit: 464820458ec48a76b4f6081ce1e869f6a27ea9c9 --- .../compilerRunner/JpsKotlinCompilerRunner.kt | 16 ++++++++-------- .../jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 22f2f111759..7ac9197dc32 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -19,7 +19,10 @@ package org.jetbrains.kotlin.compilerRunner import org.jetbrains.jps.api.GlobalOptions import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY -import org.jetbrains.kotlin.cli.common.arguments.* +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.mergeBeans import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.config.CompilerSettings @@ -28,9 +31,6 @@ import org.jetbrains.kotlin.jps.build.KotlinBuilder import java.io.ByteArrayOutputStream import java.io.File import java.io.PrintStream -import java.io.Serializable -import java.rmi.server.UnicastRemoteObject -import java.util.* class JpsKotlinCompilerRunner : KotlinCompilerRunner() { override val log: KotlinLogger = JpsKotlinLogger(KotlinBuilder.LOG) @@ -72,11 +72,11 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { compilerSettings: CompilerSettings, environment: JpsCompilerEnvironment, sourceFiles: Collection, - libraryFiles: List, + libraries: List, outputFile: File ) { val arguments = mergeBeans(commonArguments, k2jsArguments) - setupK2JsArguments(outputFile, sourceFiles, libraryFiles, arguments) + setupK2JsArguments(outputFile, sourceFiles, libraries, arguments) withCompilerSettings(compilerSettings) { runCompiler(K2JS_COMPILER, arguments, environment) } @@ -182,13 +182,13 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { } } - private fun setupK2JsArguments( _outputFile: File, sourceFiles: Collection, _libraryFiles: List, settings: K2JSCompilerArguments) { + private fun setupK2JsArguments(_outputFile: File, sourceFiles: Collection, _libraries: List, settings: K2JSCompilerArguments) { with(settings) { noStdlib = true freeArgs = sourceFiles.map { it.path } outputFile = _outputFile.path metaInfo = true - libraryFiles = _libraryFiles.toTypedArray() + libraries = _libraries.joinToString(File.pathSeparator) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a519d7a1a96..a995806b60c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -658,12 +658,12 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val representativeModule = representativeTarget.module val moduleName = representativeModule.name val outputFile = JpsJsModuleUtils.getOutputFile(outputDir, moduleName) - val libraryFiles = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) + val libraries = JpsJsModuleUtils.getLibraryFilesAndDependencies(representativeTarget) val compilerSettings = JpsKotlinCompilerSettings.getCompilerSettings(representativeModule) val k2JsArguments = JpsKotlinCompilerSettings.getK2JsCompilerArguments(representativeModule) val compilerRunner = JpsKotlinCompilerRunner() - compilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, environment, sourceFiles, libraryFiles, outputFile) + compilerRunner.runK2JsCompiler(commonArguments, k2JsArguments, compilerSettings, environment, sourceFiles, libraries, outputFile) return environment.outputItemsCollector } From 9b1aad0b9ff15fdabbc70b735937024f9611ee6d Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 1 Feb 2017 18:30:41 +0300 Subject: [PATCH 0954/1557] Refactoring: extract checking caches versions to function Original commit: 2eeb7e36b928d4874426df2e245831e0ac5db1ff --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index a995806b60c..34cde0dc94c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -114,6 +114,13 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { if (targets.none { hasKotlin[it] == true }) return + checkCachesVersions(context, chunk) + } + + private fun checkCachesVersions(context: CompileContext, chunk: ModuleChunk) { + val targets = chunk.targets + val dataManager = context.projectDescriptor.dataManager + val cacheVersionsProvider = CacheVersionProvider(dataManager.dataPaths) val allVersions = cacheVersionsProvider.allVersions(targets) val actions = allVersions.map { it.checkVersion() }.toMutableSet() @@ -152,7 +159,6 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { applyActionsOnCacheVersionChange(actions, cacheVersionsProvider, context, dataManager, targets, fsOperations) } - override fun chunkBuildFinished(context: CompileContext?, chunk: ModuleChunk?) { super.chunkBuildFinished(context, chunk) From 48fdcf9b97324c6b0a37809ffbf9d363afe0d31b Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Wed, 1 Feb 2017 18:33:03 +0300 Subject: [PATCH 0955/1557] Avoid checking incremental caches versions if corresponding property is set Original commit: 1818289772eb4a4011a2ded995967c0b8581b153 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 34cde0dc94c..cf33b1e5ab7 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -77,6 +77,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { val LOG = Logger.getInstance("#org.jetbrains.kotlin.jps.build.KotlinBuilder") const val JVM_BUILD_META_INFO_FILE_NAME = "jvm-build-meta-info.txt" + const val SKIP_CACHE_VERSION_CHECK_PROPERTY = "kotlin.jps.skip.cache.version.check" } private val statisticsLogger = TeamcityStatisticsLogger() @@ -114,7 +115,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { if (targets.none { hasKotlin[it] == true }) return - checkCachesVersions(context, chunk) + if (System.getProperty(SKIP_CACHE_VERSION_CHECK_PROPERTY) == null) { + checkCachesVersions(context, chunk) + } } private fun checkCachesVersions(context: CompileContext, chunk: ModuleChunk) { From 36035c789a5d15d30522d4e6090eff0039c2c17b Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Wed, 1 Feb 2017 15:38:51 +0300 Subject: [PATCH 0956/1557] JS: fixed support for test source roots (KT-6627) Original commit: 289a7a9cc3f3ab6b504ef809f859e7a1d26a86c7 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 24 +++++++++++++++---- .../kotlin/jps/build/JpsJsModuleUtils.kt | 20 ++++++++++++---- .../kotlinProject.iml | 12 ++++++++++ .../kotlinProject.ipr | 14 +++++++++++ .../src/Main.kt | 2 ++ .../tests/MainTests.kt | 3 +++ .../kotlinProject.iml | 14 +++++++++++ .../kotlinProject.ipr | 16 +++++++++++++ .../src/Main.kt | 3 +++ .../srcOnly/src/SrcOnly.kt | 1 + .../srcOnly/srcOnly.iml | 11 +++++++++ .../tests/MainTests.kt | 5 ++++ .../testsOnly/tests/TestsOnly.kt | 1 + .../testsOnly/testsOnly.iml | 11 +++++++++ .../kotlinProject.iml | 13 ++++++++++ .../kotlinProject.ipr | 15 ++++++++++++ .../src/Main.kt | 3 +++ .../srcAndTests/src/SrcAndTests.kt | 1 + .../srcAndTests/srcAndTests.iml | 12 ++++++++++ .../srcAndTests/tests/SrcAndTestsTests.kt | 3 +++ .../tests/MainTests.kt | 5 ++++ 21 files changed, 180 insertions(+), 9 deletions(-) create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/src/Main.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/tests/MainTests.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/src/Main.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/src/SrcOnly.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/srcOnly.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/tests/MainTests.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/tests/TestsOnly.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/testsOnly.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/srcAndTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index a1b902c814a..030c6284145 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -33,7 +33,6 @@ import org.jetbrains.jps.builders.CompileScopeTestBuilder import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.builders.TestProjectBuilderLogger import org.jetbrains.jps.builders.impl.BuildDataPathsImpl -import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerImpl import org.jetbrains.jps.builders.logging.BuildLoggingManager import org.jetbrains.jps.cmdline.ProjectDescriptor import org.jetbrains.jps.incremental.BuilderRegistry @@ -50,13 +49,10 @@ import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil -import org.jetbrains.kotlin.config.KotlinCompilerVersion -import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_ENABLED_PROPERTY import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.withIC import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest.LibraryDependency.* -import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver.Companion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName @@ -376,6 +372,26 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) } + fun testKotlinJavaScriptProjectWithTests() { + initProject(JS_STDLIB) + makeAll().assertSuccessful() + } + + fun testKotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies() { + initProject(JS_STDLIB) + makeAll().assertSuccessful() + } + + fun testKotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency() { + initProject(JS_STDLIB) + val buildResult = makeAll() + buildResult.assertSuccessful() + + val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) + assertEquals("Warning about duplicate module definition: $warnings", 1, warnings.size) + assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings.first().messageText) + } + fun testExcludeFolderInSourceRoot() { doTest() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index b329ce89e8d..9dc917535ce 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.jps.build import com.intellij.util.Consumer import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.jps.incremental.ModuleBuildTarget +import org.jetbrains.jps.model.java.JavaSourceRootType import org.jetbrains.jps.model.java.JpsJavaModuleType import org.jetbrains.jps.model.library.JpsOrderRootType import org.jetbrains.jps.model.module.JpsModule @@ -47,12 +48,21 @@ object JpsJsModuleUtils { fun getDependencyModulesAndSources(target: ModuleBuildTarget, result: MutableList) { JpsUtils.getAllDependencies(target).processModules(object : Consumer { override fun consume(module: JpsModule) { - if (module == target.module || module.moduleType != JpsJavaModuleType.INSTANCE) return + if (module.moduleType != JpsJavaModuleType.INSTANCE) return - val moduleBuildTarget = ModuleBuildTarget(module, JavaModuleBuildTargetType.PRODUCTION) - val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget) - val metaInfoFile = getOutputMetaFile(outputDir, module.name) - result.add(metaInfoFile.absolutePath) + for (root in module.sourceRoots) { + val isTestSource = root.rootType == JavaSourceRootType.TEST_SOURCE + + if (module == target.module && isTestSource == target.isTests) continue + + if (!isTestSource || target.isTests) { + val targetType = if (isTestSource) JavaModuleBuildTargetType.TEST else JavaModuleBuildTargetType.PRODUCTION + val moduleBuildTarget = ModuleBuildTarget(module, targetType) + val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget) + val metaInfoFile = getOutputMetaFile(outputDir, module.name) + result.add(metaInfoFile.absolutePath) + } + } } }) } diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.iml new file mode 100644 index 00000000000..350676073d1 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.ipr new file mode 100644 index 00000000000..0c363fe68d2 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/src/Main.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/src/Main.kt new file mode 100644 index 00000000000..e97bc7ec751 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/src/Main.kt @@ -0,0 +1,2 @@ +fun main() { +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/tests/MainTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/tests/MainTests.kt new file mode 100644 index 00000000000..d0fbf1444f8 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTests/tests/MainTests.kt @@ -0,0 +1,3 @@ +fun testMain() { + main() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.iml new file mode 100644 index 00000000000..62e30d76009 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.ipr new file mode 100644 index 00000000000..6c1fe3fe02d --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/kotlinProject.ipr @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/src/Main.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/src/Main.kt new file mode 100644 index 00000000000..d922182462e --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/src/Main.kt @@ -0,0 +1,3 @@ +fun main() { + srcOnly() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/src/SrcOnly.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/src/SrcOnly.kt new file mode 100644 index 00000000000..51563329121 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/src/SrcOnly.kt @@ -0,0 +1 @@ +fun srcOnly() {} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/srcOnly.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/srcOnly.iml new file mode 100644 index 00000000000..c90834f2d60 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/srcOnly/srcOnly.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/tests/MainTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/tests/MainTests.kt new file mode 100644 index 00000000000..882f75a9953 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/tests/MainTests.kt @@ -0,0 +1,5 @@ +fun testMain() { + main() + srcOnly() + testsOnly() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/tests/TestsOnly.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/tests/TestsOnly.kt new file mode 100644 index 00000000000..b9c5f8d81ae --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/tests/TestsOnly.kt @@ -0,0 +1 @@ +fun testsOnly() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/testsOnly.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/testsOnly.iml new file mode 100644 index 00000000000..d732721923c --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies/testsOnly/testsOnly.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.iml new file mode 100644 index 00000000000..f3d9af241fb --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.ipr new file mode 100644 index 00000000000..6a444a0b5a8 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/kotlinProject.ipr @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt new file mode 100644 index 00000000000..5816452a2df --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt @@ -0,0 +1,3 @@ +fun main() { + srcAndTests() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt new file mode 100644 index 00000000000..4770f151401 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt @@ -0,0 +1 @@ +fun srcAndTests() {} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/srcAndTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/srcAndTests.iml new file mode 100644 index 00000000000..fc6e2c7a9cf --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/srcAndTests.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt new file mode 100644 index 00000000000..dcdc8f6d32a --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt @@ -0,0 +1,3 @@ +fun testSrcAndTests() { + srcAndTests() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt new file mode 100644 index 00000000000..2035cec6386 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt @@ -0,0 +1,5 @@ +fun testMain() { + main() + srcAndTests() + testSrcAndTests() +} From 81ab76ade868313792ed3d32d94cbd3e4132d33e Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Thu, 2 Feb 2017 16:50:01 +0300 Subject: [PATCH 0957/1557] JPS: fixed duplicate meta.js in case of multiple source roots in the same module. Original commit: f0e3c87b8439b078dd708fbc32f3371b6e715552 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 14 ++++++-- .../kotlin/jps/build/JpsJsModuleUtils.kt | 33 ++++++++++++------- .../kotlinProject.iml | 12 +++++++ .../kotlinProject.ipr | 15 +++++++++ .../src/Main.kt | 4 +++ .../srcs/src/Src.kt | 3 ++ .../srcs/src2/Src2.kt | 3 ++ .../srcs/srcs.iml | 12 +++++++ 8 files changed, 83 insertions(+), 13 deletions(-) create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/src/Main.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src/Src.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src2/Src2.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/srcs.iml diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 030c6284145..b065e8962a4 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -388,8 +388,18 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { buildResult.assertSuccessful() val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) - assertEquals("Warning about duplicate module definition: $warnings", 1, warnings.size) - assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings.first().messageText) + assertEquals("Warning about duplicate module definition: $warnings", 2, warnings.size) + assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings[0].messageText) + assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings[1].messageText) + } + + fun testKotlinJavaScriptProjectWithTwoSrcModuleDependency() { + initProject(JS_STDLIB) + val buildResult = makeAll() + buildResult.assertSuccessful() + + val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) + assertEquals("Warning about duplicate module definition: $warnings", 0, warnings.size) } fun testExcludeFolderInSourceRoot() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index 9dc917535ce..bdddc9118ee 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -26,7 +26,7 @@ import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils import java.io.File -import java.util.ArrayList +import java.util.* object JpsJsModuleUtils { fun getLibraryFilesAndDependencies(target: ModuleBuildTarget): List { @@ -50,20 +50,31 @@ object JpsJsModuleUtils { override fun consume(module: JpsModule) { if (module.moduleType != JpsJavaModuleType.INSTANCE) return - for (root in module.sourceRoots) { - val isTestSource = root.rootType == JavaSourceRootType.TEST_SOURCE + var yieldProduction = module != target.module || target.isTests + var yieldTests = module != target.module - if (module == target.module && isTestSource == target.isTests) continue - - if (!isTestSource || target.isTests) { - val targetType = if (isTestSource) JavaModuleBuildTargetType.TEST else JavaModuleBuildTargetType.PRODUCTION - val moduleBuildTarget = ModuleBuildTarget(module, targetType) - val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget) - val metaInfoFile = getOutputMetaFile(outputDir, module.name) - result.add(metaInfoFile.absolutePath) + module.sourceRoots.forEach { + if (it.rootType == JavaSourceRootType.SOURCE) { + if (yieldProduction) { + addTarget(module, JavaModuleBuildTargetType.PRODUCTION) + yieldProduction = false + } + } + else { + if (yieldTests) { + addTarget(module, JavaModuleBuildTargetType.TEST) + yieldTests = false + } } } } + + fun addTarget(module: JpsModule, targetType: JavaModuleBuildTargetType) { + val moduleBuildTarget = ModuleBuildTarget(module, targetType) + val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget) + val metaInfoFile = getOutputMetaFile(outputDir, module.name) + result.add(metaInfoFile.absolutePath) + } }) } diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.iml new file mode 100644 index 00000000000..3776f58cd73 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.ipr new file mode 100644 index 00000000000..30c1d27da77 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/kotlinProject.ipr @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/src/Main.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/src/Main.kt new file mode 100644 index 00000000000..4ec96fd4e15 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/src/Main.kt @@ -0,0 +1,4 @@ +fun main() { + src() + src2() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src/Src.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src/Src.kt new file mode 100644 index 00000000000..840b4c4a485 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src/Src.kt @@ -0,0 +1,3 @@ +fun src() { + src2() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src2/Src2.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src2/Src2.kt new file mode 100644 index 00000000000..2e9a4c8ea07 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/src2/Src2.kt @@ -0,0 +1,3 @@ +fun src2() { + src() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/srcs.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/srcs.iml new file mode 100644 index 00000000000..cdfacea2bb6 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTwoSrcModuleDependency/srcs/srcs.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + From d323c39b7d6da9b573f1ba5e127c6a6d3f8300db Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 6 Feb 2017 20:22:28 +0300 Subject: [PATCH 0958/1557] Do not import "kotlin.comparisons" by default for language version 1.0 #KT-16199 Fixed Original commit: b780e6d3747303259b6b4611c36ed86c463a7eed --- .../lookupTracker/classifierMembers/foo.kt | 10 ++++----- .../lookupTracker/classifierMembers/usages.kt | 18 +++++++-------- .../conventions/delegateProperty.kt | 4 ++-- .../conventions/mathematicalLike.kt | 8 +++---- .../expressionType/inferredType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 +++++++++---------- .../lookupTracker/packageDeclarations/foo1.kt | 6 ++--- .../syntheticProperties/usages.kt | 14 ++++++------ 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 2982b10cffa..14b086ed71e 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -18,9 +18,9 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/baz() + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(Int)*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/X./*c:foo.E*/foo() + /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt index b826bbd7f07..d30c609ccb3 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/usages.kt @@ -18,8 +18,8 @@ import bar.* /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/vara() + /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/foo - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:foo.E*/bar() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/E./*c:foo.E*/X + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/E./*c:foo.E*/foo + /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index f8016f6b354..8c564e7e8fe 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -20,8 +20,8 @@ import kotlin.reflect./*p:kotlin.reflect*/KProperty } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:java.lang(provideDelegate) p:kotlin.jvm(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() /*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() /*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index 609261b0e9a..a342737f5ed 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:java.lang(times) p:kotlin.jvm(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:java.lang(div) p:kotlin.jvm(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) p:kotlin.comparisons(plusAssign) p:java.lang(plusAssign) p:kotlin.jvm(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) p:kotlin.comparisons(minusAssign) p:java.lang(minusAssign) p:kotlin.jvm(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) p:kotlin.comparisons(times) p:java.lang(times) p:kotlin.jvm(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) p:kotlin.comparisons(div) p:java.lang(div) p:kotlin.jvm(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index 01a77b36fd9..bd562af2dea 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -6,8 +6,8 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) /*p:foo*/fun useListOfA(a: /*p:foo*/List) {} /*p:foo*/fun useListOfB(b: /*p:foo*/List) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index daef69757b1..619d4d63969 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -11,27 +11,27 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(String)*/I./*c:foo.I*/isfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:foo.I(IS)*/I./*c:foo.I*/IS() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/I./*c:foo.I*/isfield + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:foo.I(IS)*/I./*c:foo.I*/IS() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:baz.E*/F - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/E./*c:baz.E*/F + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 18cb6738798..2bbe33fe6de 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -4,7 +4,7 @@ import bar.* import baz./*p:baz*/C /*p:foo*/val a = /*p:foo p:bar*/A() -/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:baz(B)*/baz./*p:baz*/B() /*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ /*p:foo p:bar(A)*/a @@ -12,6 +12,6 @@ import baz./*p:baz*/C } /*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/MyClass() + /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 3a536591a87..38edcec3ac5 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ import foo./*p:foo*/KotlinClass val k = /*p:foo*/KotlinClass() /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/setFoo(2) + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/setFoo(2) /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/bazBaz - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/bazBaz = /*p:kotlin(String)*/"" /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm*/boo = /*p:kotlin(Int)*/2 + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/boo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.comparisons p:kotlin.io p:java.lang p:kotlin.jvm c:JavaClass*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:JavaClass*/boo = /*p:kotlin(Int)*/2 } From c5ecc540ad698355bb162b4bc1218ea03e0bce70 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 2 Feb 2017 20:42:07 +0300 Subject: [PATCH 0959/1557] Kotlin Facet: Always parse argument string to proper compiler arguments bean #KT-16137 Fixed #KT-16157 Fixed #KT-16206 Fixed Original commit: 4325632b3ec56beba2a009b7f5eeca08c70a289e --- .../src/org/jetbrains/kotlin/config/CompilerSettings.kt | 2 +- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 2 ++ .../src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 8ca191aaf90..89af21eee09 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -24,7 +24,7 @@ class CompilerSettings { @JvmField var outputDirectoryForJsLibraryFiles: String = DEFAULT_OUTPUT_DIRECTORY companion object { - private val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" + val DEFAULT_ADDITIONAL_ARGUMENTS = "-version" private val DEFAULT_OUTPUT_DIRECTORY = "lib" } } diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index e71fd230cdc..c77ffee8e09 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -23,6 +23,7 @@ import com.intellij.util.xmlb.annotations.Property import com.intellij.util.xmlb.annotations.Transient import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.utils.DescriptionAware sealed class TargetPlatformKind( @@ -96,6 +97,7 @@ class KotlinCompilerInfo { _commonCompilerArguments = value as? CommonCompilerArguments.DummyImpl } var k2jsCompilerArguments: K2JSCompilerArguments? = null + var k2jvmCompilerArguments: K2JVMCompilerArguments? = null var compilerSettings: CompilerSettings? = null @get:Transient var coroutineSupport: CoroutineSupport diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index 99d006e70af..b7632daa9a8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -87,7 +87,8 @@ class JpsKotlinCompilerSettings : JpsElementBase() { val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments if (facetSettings.useProjectSettings) return defaultArguments val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? TargetPlatformKind.Jvm ?: return defaultArguments - return copyBean(defaultArguments).apply { + val arguments = facetSettings.compilerInfo.k2jvmCompilerArguments ?: defaultArguments + return copyBean(arguments).apply { jvmTarget = targetPlatform.version.description } } From 4cb5e8a919f605bdf4732a315e192eb10d5d02c7 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Mon, 6 Feb 2017 20:31:42 +0300 Subject: [PATCH 0960/1557] Do not force resolve descriptors for explicit imports. Create lazy scope instead. Original commit: b616ef0a40c128d818610fe1d87fd5227a924111 --- .../classifierMembers/constraints.kt | 4 ++-- .../lookupTracker/classifierMembers/foo.kt | 8 +++---- .../lookupTracker/conventions/comparison.kt | 2 +- .../lookupTracker/conventions/declarations.kt | 24 +++++++++---------- .../conventions/delegateProperty.kt | 14 +++++------ .../conventions/mathematicalLike.kt | 2 +- .../lookupTracker/conventions/other.kt | 2 +- .../expressionType/inferredType.kt | 4 ++-- .../expressionType/lambdaParameterType.kt | 4 ++-- .../incremental/lookupTracker/java/usages.kt | 22 ++++++++--------- .../lookupTracker/localDeclarations/locals.kt | 6 ++--- .../lookupTracker/packageDeclarations/foo1.kt | 4 ++-- .../incremental/lookupTracker/simple/main.kt | 6 ++--- .../syntheticProperties/KotlinClass.kt | 6 ++--- .../syntheticProperties/usages.kt | 4 ++-- 15 files changed, 56 insertions(+), 56 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt index 579534024ae..400f192507b 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/constraints.kt @@ -2,6 +2,6 @@ package foo import bar.* -/*p:foo*/fun , C, D> test() - where C : /*p:foo*/Number, C : /*p:foo*/Comparable, D : B +/*p:foo*/fun , C, D> test() + where C : /*p:foo p:kotlin*/Number, C : /*p:foo p:kotlin*/Comparable, D : B {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index 14b086ed71e..b932c75deba 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -6,10 +6,10 @@ import bar.* val a = /*p:kotlin(Int)*/1 var b = /*p:kotlin(String)*/"" - val c: /*c:foo.A c:foo.A.Companion p:foo*/String + val c: /*c:foo.A c:foo.A.Companion p:foo p:kotlin*/String get() = /*c:foo.A p:kotlin(String)*/b - var d: /*c:foo.A c:foo.A.Companion p:foo*/String = /*p:kotlin(String)*/"ddd" + var d: /*c:foo.A c:foo.A.Companion p:foo p:kotlin*/String = /*p:kotlin(String)*/"ddd" get() = /*p:kotlin(String)*/field set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v } @@ -27,7 +27,7 @@ import bar.* val a = /*p:kotlin(Int)*/1 companion object CO { - fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo*/Int) {} + fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo p:kotlin*/Int) {} } } @@ -44,7 +44,7 @@ import bar.* } /*p:foo*/interface I { - var a: /*c:foo.I p:foo*/Int + var a: /*c:foo.I p:foo p:kotlin*/Int fun foo() class NI diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt index 5eb74e65463..98747a87e47 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/comparison.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ +/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt index ef0612c5cba..46c5c01f611 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/declarations.kt @@ -1,15 +1,15 @@ package foo.bar /*p:foo.bar*/class A { - operator fun plus(a: /*c:foo.bar.A p:foo.bar*/Int) = /*p:foo.bar(A)*/this - operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar*/Any?) {} + operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:foo.bar(A)*/this + operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Any?) {} operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this - operator fun get(i: /*c:foo.bar.A p:foo.bar*/Int) = /*p:kotlin(Int)*/1 - operator fun contains(a: /*c:foo.bar.A p:foo.bar*/Int): /*c:foo.bar.A p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/false + operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:kotlin(Int)*/1 + operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int): /*c:foo.bar.A p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/false operator fun invoke() {} - operator fun compareTo(a: /*c:foo.bar.A p:foo.bar*/Int) = /*p:kotlin(Int)*/0 + operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin*/Int) = /*p:kotlin(Int)*/0 operator fun component1() = /*p:foo.bar(A)*/this @@ -17,19 +17,19 @@ package foo.bar operator fun next() = /*p:foo.bar(A)*/this } -/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar*/Int) = /*p:foo.bar(A)*/this -/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar*/Any?) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin*/Int) = /*p:foo.bar(A)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin*/Any?) {} /*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar*/Int, v: /*p:foo.bar*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar*/Any): /*p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/true -/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin*/Int, v: /*p:foo.bar p:kotlin*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin*/Any): /*p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/true +/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar*/Any) = /*p:kotlin(Int)*/0 +/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin*/Any) = /*p:kotlin(Int)*/0 /*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!! -/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar*/Boolean = /*p:kotlin(Boolean)*/false +/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin*/Boolean = /*p:kotlin(Boolean)*/false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt index 8c564e7e8fe..4402628b9dd 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/delegateProperty.kt @@ -1,22 +1,22 @@ package foo.bar -import kotlin.reflect./*p:kotlin.reflect*/KProperty +/*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty /*p:foo.bar*/class D1 { - operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar*/Any?, p: /*c:foo.bar.D1*/KProperty<*>) = /*p:kotlin(Int)*/1 + operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 } -/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar*/Any?, p: KProperty<*>, v: /*p:foo.bar*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin*/Int) {} /*p:foo.bar(D2)*/open class D2 { - operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar*/Any?, p: /*c:foo.bar.D2*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar*/Int) {} + operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin*/Int) {} } -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar*/Any?, p: KProperty<*>) = /*p:kotlin(Int)*/1 -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar*/Any?, k: /*p:foo.bar*/Any) = /*p:foo.bar(D2)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin*/Any?, k: /*p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D2)*/this /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { - operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar*/Any) = /*p:foo.bar(D3)*/this + operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D3)*/this } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt index a342737f5ed..1cf542a2a67 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/mathematicalLike.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int) { +/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int) { var d = /*p:foo.bar(A)*/a /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++ diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt index bf27ef791d0..d6c85490321 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/conventions/other.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar*/Int, c: /*p:foo.bar*/Any, na: /*p:foo.bar*/A?) { +/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) { /*p:foo.bar(A) c:foo.bar.A(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET) p:foo.bar(set)*/a[1] = /*p:foo.bar(A) c:foo.bar.A(get) p:kotlin(Int)*/a[2] /*p:kotlin(Int) p:kotlin(Boolean)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt index bd562af2dea..a64392dfd7a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/inferredType.kt @@ -9,8 +9,8 @@ package foo /*p:foo*/fun getListOfA() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) /*p:foo*/fun getListOfB() = /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) -/*p:foo*/fun useListOfA(a: /*p:foo*/List) {} -/*p:foo*/fun useListOfB(b: /*p:foo*/List) {} +/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin.collections*/List) {} +/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin.collections*/List) {} /*p:foo*/fun testInferredType() { /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(A)*/getListOfA()) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt index 736fba6ade3..e55acec918c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/expressionType/lambdaParameterType.kt @@ -2,8 +2,8 @@ package foo /*p:foo*/class C -/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo*/Unit) {} -/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo*/Unit) {} +/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin*/Unit) {} +/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin*/Unit) {} /*p:foo*/fun testLambdaParameterType() { /*p:foo*/lambdaConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/it } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt index 619d4d63969..fae7e925fd0 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/java/usages.kt @@ -1,6 +1,6 @@ package foo -import bar./*p:bar*/C +/*p:bar(C)*/import bar.C import baz.* /*p:foo*/fun usages() { @@ -11,16 +11,16 @@ import baz.* /*p:bar(C)*/c./*c:bar.C*/func() /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/sfunc() + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm c:bar.C(S)*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:kotlin(String)*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() + /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c @@ -35,10 +35,10 @@ import baz.* } /*p:foo*/fun classifiers( - c: C, - b: C./*c:bar.C*/B, - s: C./*c:bar.C*/S, - cis: C./*c:bar.C*/IS, + c: /*p:bar*/C, + b: /*p:bar*/C./*c:bar.C*/B, + s: /*p:bar*/C./*c:bar.C*/S, + cis: /*p:bar*/C./*c:bar.C*/IS, i: /*p:foo*/I, iis: /*p:foo*/I./*c:foo.I*/IS, e: /*p:foo p:baz*/E diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt index 8dc43de85c1..fa10ec53086 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/localDeclarations/locals.kt @@ -2,16 +2,16 @@ package local.declarations import bar.* -/*p:local.declarations*/fun f(p: /*p:local.declarations*/Any) /*p:kotlin(Int)*/{ +/*p:local.declarations*/fun f(p: /*p:local.declarations p:kotlin*/Any) /*p:kotlin(Int)*/{ /*p:kotlin(Any) p:kotlin(String)*/p.toString() val a = /*p:kotlin(Int)*/1 val b = /*p:kotlin(Int)*/a fun localFun() = /*p:kotlin(Int)*/b - fun /*p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() + fun /*p:local.declarations p:kotlin*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() abstract class LocalI { - abstract var a: /*p:local.declarations*/Int + abstract var a: /*p:local.declarations p:kotlin*/Int abstract fun foo() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt index 2bbe33fe6de..222fadbf956 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/packageDeclarations/foo1.kt @@ -1,7 +1,7 @@ package foo import bar.* -import baz./*p:baz*/C +/*p:baz(C)*/import baz.C /*p:foo*/val a = /*p:foo p:bar*/A() /*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:baz(B)*/baz./*p:baz*/B() @@ -11,7 +11,7 @@ import baz./*p:baz*/C /*p:kotlin(Nothing)*/return /*p:foo p:bar*/B() } -/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo*/Array, e: /*p:foo*/MyEnum, c: /**???*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ +/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:kotlin*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm p:baz(B)*/b /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:java.lang p:kotlin.jvm*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt index 33b7fbf143c..09f59f1743c 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/simple/main.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun main(args: /*p:foo.bar*/Array) { - val f: /*p:foo.bar*/Array - val s: /*p:foo.bar*/String +/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin*/Array) { + val f: /*p:foo.bar p:kotlin*/Array + val s: /*p:foo.bar p:kotlin*/String } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt index 75b360dbbb9..ac2ea2093d3 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/KotlinClass.kt @@ -1,8 +1,8 @@ package foo -import /*p:*/JavaClass +/*p:(JavaClass)*/import JavaClass -/*p:foo*/class KotlinClass : JavaClass() { +/*p:foo*/class KotlinClass : /*p:*/JavaClass() { override fun getFoo() = /*p:kotlin(Int)*/2 - fun setFoo(i: /*c:foo.KotlinClass c:JavaClass p:foo*/Int) {} + fun setFoo(i: /*c:foo.KotlinClass c:JavaClass p:foo p:kotlin*/Int) {} } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt index 38edcec3ac5..6e90f036e0a 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/syntheticProperties/usages.kt @@ -1,7 +1,7 @@ package foo.bar -import /*p:*/JavaClass -import foo./*p:foo*/KotlinClass +/*p:(JavaClass)*/import JavaClass +/*p:foo(KotlinClass)*/import foo.KotlinClass /*p:foo.bar*/fun test() { val j = /*p:*/JavaClass() From b4086fe033034ae575d270cbe9b0eaa0a79bf299 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Mon, 30 Jan 2017 19:24:42 +0300 Subject: [PATCH 0961/1557] JS: drop support of old library format Original commit: 71925297335acd3d358330a3e18d15aa5b6fc186 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 11 ++- .../jslib-example/META-INF/MANIFEST.MF | 1 - .../jslib-example/ReadMe.md | 2 +- .../jslib-example/jslib-example.js | 79 ++++++++++-------- .../jslib-example/jslib-example.meta.js | 1 + .../jslib-example/library/sample/sample.kjsm | Bin 0 -> 432 bytes 6 files changed, 50 insertions(+), 44 deletions(-) create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.meta.js create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example/library/sample/sample.kjsm diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index b065e8962a4..3fbf62c0c2c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -98,8 +98,7 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf( "$PROJECT_NAME.js", "$PROJECT_NAME.meta.js", - "$PROJECT_NAME/root-package.kjsm", - "$PROJECT_NAME/library/sample/sample.kjsm" + "$PROJECT_NAME/root-package.kjsm" ) private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf( "$PROJECT_NAME.js", @@ -107,13 +106,13 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { "lib/kotlin.js", "lib/kotlin.meta.js", "lib/jslib-example.js", + "lib/jslib-example.meta.js", "lib/file0.js", "lib/dir/file1.js", "lib/META-INF-ex/file2.js", "lib/res0.js", "lib/resdir/res1.js", - "$PROJECT_NAME/root-package.kjsm", - "$PROJECT_NAME/library/sample/sample.kjsm" + "$PROJECT_NAME/root-package.kjsm" ) private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = hashSetOf( "$PROJECT_NAME.js", @@ -121,13 +120,13 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { "custom/kotlin.js", "custom/kotlin.meta.js", "custom/jslib-example.js", + "custom/jslib-example.meta.js", "custom/file0.js", "custom/dir/file1.js", "custom/META-INF-ex/file2.js", "custom/res0.js", "custom/resdir/res1.js", - "$PROJECT_NAME/root-package.kjsm", - "$PROJECT_NAME/library/sample/sample.kjsm" + "$PROJECT_NAME/root-package.kjsm" ) private fun k2jsOutput(vararg moduleNames: String): Array { diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF index 00281ee90c5..5d1ec1e9192 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF @@ -5,5 +5,4 @@ Built-By: JetBrains Implementation-Vendor: JetBrains Implementation-Version: snapshot Specification-Title: Kotlin JavaScript Lib -Kotlin-JS-Module-Name: jslib-example diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md index 6c269930b08..9e82278e756 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md @@ -1,6 +1,6 @@ # jslib-example -Path to sources: compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example +Path to sources: `compiler/testData/cli/js/jslib` The archive compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar should be updated after changing some files in source folder. \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js index 8fb2ce81d48..68154be1e35 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js @@ -1,37 +1,44 @@ -(function (Kotlin) { +if (typeof kotlin === 'undefined') { + throw new Error("Error loading module 'LibraryExample'. Its dependency 'kotlin' was not found. Please, check whether 'kotlin' is loaded prior to 'LibraryExample'."); +} +var LibraryExample = function (_, Kotlin) { 'use strict'; - var _ = Kotlin.defineRootPackage(null, /** @lends _ */ { - library: Kotlin.definePackage(null, /** @lends _.library */ { - sample: Kotlin.definePackage(null, /** @lends _.library.sample */ { - pairAdd_bunuun$: function (p) { - return p.first + p.second; - }, - pairMul_bunuun$: function (p) { - return p.first * p.second; - }, - IntHolder: Kotlin.createClass(null, function (value) { - this.value = value; - }, /** @lends _.library.sample.IntHolder.prototype */ { - component1: function () { - return this.value; - }, - copy_za3lpa$: function (value) { - return new _.library.sample.IntHolder(value === void 0 ? this.value : value); - }, - toString: function () { - return 'IntHolder(value=' + Kotlin.toString(this.value) + ')'; - }, - hashCode: function () { - var result = 0; - result = result * 31 + Kotlin.hashCode(this.value) | 0; - return result; - }, - equals_za3rmp$: function (other) { - return this === other || (other !== null && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value))); - } - }) - }) - }) - }); - Kotlin.defineModule('jslib-example', _); -}(Kotlin)); + function pairAdd(p) { + return p.first + p.second | 0; + } + function pairMul(p) { + return Kotlin.imul(p.first, p.second); + } + function IntHolder(value) { + this.value = value; + } + IntHolder.$metadata$ = { + kind: Kotlin.Kind.CLASS, + simpleName: 'IntHolder', + interfaces: [] + }; + IntHolder.prototype.component1 = function () { + return this.value; + }; + IntHolder.prototype.copy_za3lpa$ = function (value) { + return new IntHolder(value === void 0 ? this.value : value); + }; + IntHolder.prototype.toString = function () { + return 'IntHolder(value=' + Kotlin.toString(this.value) + ')'; + }; + IntHolder.prototype.hashCode = function () { + var result = 0; + result = result * 31 + Kotlin.hashCode(this.value) | 0; + return result; + }; + IntHolder.prototype.equals = function (other) { + return this === other || (other !== null && (typeof other === 'object' && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value)))); + }; + var package$library = _.library || (_.library = {}); + var package$sample = package$library.sample || (package$library.sample = {}); + package$sample.pairAdd_1fzo63$ = pairAdd; + package$sample.pairMul_1fzo63$ = pairMul; + package$sample.IntHolder = IntHolder; + Kotlin.defineModule('LibraryExample', _); + return _; +}(typeof LibraryExample === 'undefined' ? {} : LibraryExample, kotlin); diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.meta.js b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.meta.js new file mode 100644 index 00000000000..5dd2ffc566e --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.meta.js @@ -0,0 +1 @@ +// Kotlin.kotlin_module_metadata(1, "LibraryExample", "H4sIAAAAAAAAAJVW227TQBB1fF1Pb64LJTUgRBEgbiWkCIEESC19KJWQgIoPcJ1tsqmzG9ZO0v4Ar0h9QP2UfAGf0N+BcS5O0tRu6gfvaHdmzlzOjq2490FxFa94Rv4Nn0LXHsmnRHE9sMD49oOz2NVBdRTPPCNK11aSs4cwD+aRiEPGQWXChUQBdKI4hUQNffVcvIabqZol6WFIgxjUeuQ6I318Fxw1sVK7tjp0rtf9tg96K2ZhlvOXsJo6n6fHTSpZg/LYzzToBV3/2aLyBNQWy1J7BzdAE7IKWmczAK0iGqAFUeSuXowZ36qjJaZa19YS0yfgpCGZ0udVGmWh7MNGqgqBkAJT5TSazASA8VgyHrFgJvwNWBoP/bgm8yv9CBbSIJJEr1OSlgxnCakIRs90mkO3gQzbMX34AGCEmBXWxhi95gLRaPqSRYJn1vw5rKT6dkQRmgfZHXqBSacdakqBbYlZtvqFYMKE6ywnmAn3IwLkXaVeQayjmhRcRGB06EE1zG/wZY2L2tVZGvcebl00NWkbaTkTEycGRD0zqx4H+mrTHNgcq1AP3zhosbCSn/FTWJ4aOVnobyZSnMMGHwrZ8JEU+RjPwE0xCN5QKnn21NmC9asvej7ebw3+FMAK2YH0cXaZkd9ohhTszzzeFWGFylGZtvgJGG0/bFHQ8DhBbDQFR5BXoAeiidbIez+MwNoWIqQ+B0PENXRBan5U+yQqFEgs9pOpUwVzsFpNn8mtSgUKTdC/otzf+dIK3Y9jgZtJ4EUFdzSUNUdHOVnNwQqDdXGwLhcVb8e76yx5askou47jLbq6i3L/XSJdouCxm3Pcr/M6I79IUS2rJX2buKZjJBZ7tmMl6+5fbW/FISiqZYI8NfqbBdy0UTTLxJnz9GKhpO+ea2g03zs/L6C4gKKF4veBSwQ8JSpMDdpkdM7OygMpOhGVWYR5C2tjvhe4iNkhC/z+MMlFKSHKyNI4pHFQy7d4DIuTUyUrqERxmIAe0+PMOzXxSam3Mz8pd8BOGT199T9A8eLwQcbJCMk4y/Qp46AfmVsdIY+ovGbxWEivsFgDs/+fMh3/Dty79MdnbFzMkMbEJ8LnyIQeCzJK6g1U/wOSAB0W3QkAAA=="); diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example/library/sample/sample.kjsm b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example/library/sample/sample.kjsm new file mode 100644 index 0000000000000000000000000000000000000000..f53578c8ac0ac1a628c156f0bcb52b8f6bd937d9 GIT binary patch literal 432 zcmaKnK~BRk5JhdraV7&46E;yKHXHzj8~~}nB2+>`a01g-`F7!4Mx!HXZ7zVxoL9jbTV zySl+(+^jJCG;V1zpcrxL=dEvS(_f>U`gVoNek_e!V07!fv!=n&_cIy+Gqaf8`N|^n z{-y8g<_*=LQETdMTvf literal 0 HcmV?d00001 From 9558f5188a7793ae25aeb72cf477d6698e7cd518 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 6 Feb 2017 20:50:42 +0300 Subject: [PATCH 0962/1557] Move testable IS_PRE_RELEASE flag to KotlinCompilerVersion It'll be used in the JS back-end as well soon, so DeserializedDescriptorResolver is not the best place for it Original commit: 4c9afb9d202cbe46f3dccbd34ca349eeda25fae0 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 3fbf62c0c2c..2fb9a5366eb 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -49,11 +49,11 @@ import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.util.JpsPathUtil import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil +import org.jetbrains.kotlin.config.KotlinCompilerVersion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY import org.jetbrains.kotlin.incremental.CacheVersion import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.withIC import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTest.LibraryDependency.* -import org.jetbrains.kotlin.load.kotlin.DeserializedDescriptorResolver.Companion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils From 7bc894d0fe04c0ba7e811af70519c0bdabd6dce8 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Wed, 8 Feb 2017 15:18:33 +0300 Subject: [PATCH 0963/1557] Kotlin Facet: Check contradictory values of "coroutine support" option #KT-16109 Fixed Original commit: 330beebb2c27a9e3aad31d1461fb1cad456bd2ae --- .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index c77ffee8e09..974af76d7c8 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -74,12 +74,14 @@ enum class CoroutineSupport( companion object { val DEFAULT = ENABLED_WITH_WARNING - @JvmStatic fun byCompilerArguments(arguments: CommonCompilerArguments?) = when { - arguments == null -> DEFAULT + @JvmStatic fun byCompilerArguments(arguments: CommonCompilerArguments?) = byCompilerArgumentsOrNull(arguments) ?: DEFAULT + + fun byCompilerArgumentsOrNull(arguments: CommonCompilerArguments?) = when { + arguments == null -> null arguments.coroutinesEnable -> ENABLED arguments.coroutinesWarn -> ENABLED_WITH_WARNING arguments.coroutinesError -> DISABLED - else -> DEFAULT + else -> null } fun byCompilerArgument(argument: String): CoroutineSupport { From 0ca604d74352bb9f3943c327061ee1a5cada2f43 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 16 Feb 2017 19:09:20 +0100 Subject: [PATCH 0964/1557] Don't pass paths to non-existing metadata files from dependent modules Original commit: 3225c93ce0155b683c05e209e7ceaaf8cc657d48 --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 7 +++++++ .../src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 7ac9197dc32..485f72aee0b 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -75,8 +75,15 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { libraries: List, outputFile: File ) { + log.debug("K2JS: common arguments: " + ArgumentUtils.convertArgumentsToStringList(commonArguments)) + log.debug("K2JS: JS arguments: " + ArgumentUtils.convertArgumentsToStringList(k2jsArguments)) + val arguments = mergeBeans(commonArguments, k2jsArguments) + log.debug("K2JS: merged arguments: " + ArgumentUtils.convertArgumentsToStringList(arguments)) + setupK2JsArguments(outputFile, sourceFiles, libraries, arguments) + log.debug("K2JS: arguments after setup" + ArgumentUtils.convertArgumentsToStringList(arguments)) + withCompilerSettings(compilerSettings) { runCompiler(K2JS_COMPILER, arguments, environment) } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index bdddc9118ee..441f5a41602 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -73,7 +73,9 @@ object JpsJsModuleUtils { val moduleBuildTarget = ModuleBuildTarget(module, targetType) val outputDir = KotlinBuilderModuleScriptGenerator.getOutputDirSafe(moduleBuildTarget) val metaInfoFile = getOutputMetaFile(outputDir, module.name) - result.add(metaInfoFile.absolutePath) + if (metaInfoFile.exists()) { + result.add(metaInfoFile.absolutePath) + } } }) } From 07691e369a57a3584d27796f4398e9c89d061049 Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Fri, 17 Feb 2017 16:07:14 +0300 Subject: [PATCH 0965/1557] JPS JS: simplified the code and added tests for the missing meta.js case (e.g. empty sourceroot; fixed by yole in 00ed0248d9a23701dbef52da02259d174a9999e7) Original commit: 6608e97d35ea368e9b76989a43baae84b66e3fe5 --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 8 ++++-- .../kotlin/jps/build/JpsJsModuleUtils.kt | 20 ++++---------- .../emptySrc/emptySrc.iml | 11 ++++++++ .../emptySrc/src/dummy | 0 .../emptySrcEmptyTests/emptySrcEmptyTests.iml | 12 +++++++++ .../emptySrcEmptyTests/src/dummy | 0 .../emptySrcEmptyTests/test/dummy | 0 .../emptySrcMissingTests.iml | 12 +++++++++ .../emptySrcMissingTests/src/dummy | 0 .../emptyTests/emptyTests.iml | 11 ++++++++ .../emptyTests/test/dummy | 0 .../kotlinProject.iml | 25 +++++++++++++++++ .../kotlinProject.ipr | 27 +++++++++++++++++++ .../missingSrc/missingSrc.iml | 11 ++++++++ .../missingSrcEmptyTests.iml | 12 +++++++++ .../missingSrcEmptyTests/test/dummy | 0 .../missingSrcMissingTests.iml | 12 +++++++++ .../missingTests/missingTests.iml | 11 ++++++++ .../src/Main.kt | 4 +++ .../srcEmptyTests/src/SrcEmptyTests.kt | 1 + .../srcEmptyTests/srcEmptyTests.iml | 12 +++++++++ .../srcEmptyTests/test/dummy | 0 .../srcMissingTests/src/SrcMissingTests.kt | 1 + .../srcMissingTests/srcMissingTests.iml | 12 +++++++++ .../test/MainTest.kt | 4 +++ .../testsEmptySrc/src/dummy | 0 .../testsEmptySrc/test/TestsEmptySrc.kt | 1 + .../testsEmptySrc/testsEmptySrc.iml | 12 +++++++++ .../testsMissingSrc/test/TestsMissingSrc.kt | 1 + .../testsMissingSrc/testsMissingSrc.iml | 12 +++++++++ .../src/Main.kt | 4 +++ .../srcAndTests/src/SrcAndTests.kt | 4 +++ .../srcAndTests/src/test.kt | 3 +++ .../srcAndTests/tests/SrcAndTestsTests.kt | 6 +++++ .../tests/MainTests.kt | 3 +++ 35 files changed, 235 insertions(+), 17 deletions(-) create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/emptySrc.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/src/dummy create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/emptySrcEmptyTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/src/dummy create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/test/dummy create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/emptySrcMissingTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/src/dummy create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/emptyTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/test/dummy create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrc/missingSrc.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/missingSrcEmptyTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/test/dummy create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcMissingTests/missingSrcMissingTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingTests/missingTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/src/Main.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/src/SrcEmptyTests.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/srcEmptyTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/test/dummy create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/src/SrcMissingTests.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/srcMissingTests.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/test/MainTest.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/src/dummy create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/test/TestsEmptySrc.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/testsEmptySrc.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/test/TestsMissingSrc.kt create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/testsMissingSrc.iml create mode 100644 jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/test.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 2fb9a5366eb..68e69db9eaf 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -371,6 +371,11 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { assertEquals(Collections.EMPTY_SET, contentOfOutputDir(PROJECT_NAME)) } + fun testKotlinJavaScriptProjectWithEmptyDependencies() { + initProject(JS_STDLIB) + makeAll().assertSuccessful() + } + fun testKotlinJavaScriptProjectWithTests() { initProject(JS_STDLIB) makeAll().assertSuccessful() @@ -387,9 +392,8 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { buildResult.assertSuccessful() val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) - assertEquals("Warning about duplicate module definition: $warnings", 2, warnings.size) + assertEquals("Warning about duplicate module definition: $warnings", 1, warnings.size) assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings[0].messageText) - assertEquals("Module \"srcAndTests\" is defined in more, than one file", warnings[1].messageText) } fun testKotlinJavaScriptProjectWithTwoSrcModuleDependency() { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt index 441f5a41602..be1021991db 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/JpsJsModuleUtils.kt @@ -50,22 +50,12 @@ object JpsJsModuleUtils { override fun consume(module: JpsModule) { if (module.moduleType != JpsJavaModuleType.INSTANCE) return - var yieldProduction = module != target.module || target.isTests - var yieldTests = module != target.module + if ((module != target.module || target.isTests) && module.sourceRoots.any { it.rootType == JavaSourceRootType.SOURCE}) { + addTarget(module, JavaModuleBuildTargetType.PRODUCTION) + } - module.sourceRoots.forEach { - if (it.rootType == JavaSourceRootType.SOURCE) { - if (yieldProduction) { - addTarget(module, JavaModuleBuildTargetType.PRODUCTION) - yieldProduction = false - } - } - else { - if (yieldTests) { - addTarget(module, JavaModuleBuildTargetType.TEST) - yieldTests = false - } - } + if (module != target.module && target.isTests && module.sourceRoots.any { it.rootType == JavaSourceRootType.TEST_SOURCE}) { + addTarget(module, JavaModuleBuildTargetType.TEST) } } diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/emptySrc.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/emptySrc.iml new file mode 100644 index 00000000000..9e63df53537 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/emptySrc.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/src/dummy b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrc/src/dummy new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/emptySrcEmptyTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/emptySrcEmptyTests.iml new file mode 100644 index 00000000000..0ab15714c75 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/emptySrcEmptyTests.iml @@ -0,0 +1,12 @@ + + + + + + i + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/src/dummy b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/src/dummy new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/test/dummy b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcEmptyTests/test/dummy new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/emptySrcMissingTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/emptySrcMissingTests.iml new file mode 100644 index 00000000000..0ab15714c75 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/emptySrcMissingTests.iml @@ -0,0 +1,12 @@ + + + + + + i + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/src/dummy b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptySrcMissingTests/src/dummy new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/emptyTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/emptyTests.iml new file mode 100644 index 00000000000..966eb57b22c --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/emptyTests.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/test/dummy b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/emptyTests/test/dummy new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.iml new file mode 100644 index 00000000000..5f2d0c9a429 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.iml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.ipr new file mode 100644 index 00000000000..585c3fbb608 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/kotlinProject.ipr @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrc/missingSrc.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrc/missingSrc.iml new file mode 100644 index 00000000000..9e63df53537 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrc/missingSrc.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/missingSrcEmptyTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/missingSrcEmptyTests.iml new file mode 100644 index 00000000000..0ab15714c75 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/missingSrcEmptyTests.iml @@ -0,0 +1,12 @@ + + + + + + i + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/test/dummy b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcEmptyTests/test/dummy new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcMissingTests/missingSrcMissingTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcMissingTests/missingSrcMissingTests.iml new file mode 100644 index 00000000000..0ab15714c75 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingSrcMissingTests/missingSrcMissingTests.iml @@ -0,0 +1,12 @@ + + + + + + i + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingTests/missingTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingTests/missingTests.iml new file mode 100644 index 00000000000..966eb57b22c --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/missingTests/missingTests.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/src/Main.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/src/Main.kt new file mode 100644 index 00000000000..ff9c5e0b940 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/src/Main.kt @@ -0,0 +1,4 @@ +fun main() { + srcEmptyTestsSrc() + srcMissingTestsSrc() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/src/SrcEmptyTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/src/SrcEmptyTests.kt new file mode 100644 index 00000000000..cc763116f77 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/src/SrcEmptyTests.kt @@ -0,0 +1 @@ +fun srcEmptyTestsSrc() {} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/srcEmptyTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/srcEmptyTests.iml new file mode 100644 index 00000000000..0ab15714c75 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/srcEmptyTests.iml @@ -0,0 +1,12 @@ + + + + + + i + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/test/dummy b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcEmptyTests/test/dummy new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/src/SrcMissingTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/src/SrcMissingTests.kt new file mode 100644 index 00000000000..c7d5b4972fc --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/src/SrcMissingTests.kt @@ -0,0 +1 @@ +fun srcMissingTestsSrc() {} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/srcMissingTests.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/srcMissingTests.iml new file mode 100644 index 00000000000..0ab15714c75 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/srcMissingTests/srcMissingTests.iml @@ -0,0 +1,12 @@ + + + + + + i + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/test/MainTest.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/test/MainTest.kt new file mode 100644 index 00000000000..61c73ddab94 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/test/MainTest.kt @@ -0,0 +1,4 @@ +fun test() { + testsEmptySrcTest() + testsMissingSrcTest() +} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/src/dummy b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/src/dummy new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/test/TestsEmptySrc.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/test/TestsEmptySrc.kt new file mode 100644 index 00000000000..39589622fc5 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/test/TestsEmptySrc.kt @@ -0,0 +1 @@ +fun testsEmptySrcTest() {} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/testsEmptySrc.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/testsEmptySrc.iml new file mode 100644 index 00000000000..0ab15714c75 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsEmptySrc/testsEmptySrc.iml @@ -0,0 +1,12 @@ + + + + + + i + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/test/TestsMissingSrc.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/test/TestsMissingSrc.kt new file mode 100644 index 00000000000..f2d092bab0c --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/test/TestsMissingSrc.kt @@ -0,0 +1 @@ +fun testsMissingSrcTest() {} diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/testsMissingSrc.iml b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/testsMissingSrc.iml new file mode 100644 index 00000000000..0ab15714c75 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithEmptyDependencies/testsMissingSrc/testsMissingSrc.iml @@ -0,0 +1,12 @@ + + + + + + i + + + + + + diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt index 5816452a2df..d4f0711d3f5 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/src/Main.kt @@ -1,3 +1,7 @@ +import src.* +import test.* + fun main() { srcAndTests() + ambiguous() } diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt index 4770f151401..6bee19ef6ee 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/SrcAndTests.kt @@ -1 +1,5 @@ +package src + fun srcAndTests() {} + +fun ambiguous() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/test.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/test.kt new file mode 100644 index 00000000000..b7533d96c37 --- /dev/null +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/src/test.kt @@ -0,0 +1,3 @@ +package test + +private fun dummy() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt index dcdc8f6d32a..7b7f50ed9b5 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/srcAndTests/tests/SrcAndTestsTests.kt @@ -1,3 +1,9 @@ +package test + +import src.srcAndTests + fun testSrcAndTests() { srcAndTests() } + +fun ambiguous() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt index 2035cec6386..a4442b1ed71 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency/tests/MainTests.kt @@ -1,3 +1,6 @@ +import src.* +import test.* + fun testMain() { main() srcAndTests() From fac356c690891236dc7a97d82c2a6a8e1d33bcfd Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Sat, 4 Mar 2017 14:35:20 +0300 Subject: [PATCH 0966/1557] Kotlin Facet: Get rid of duplicating data in facet configuration Original commit: 641a9a7153ebb3562c67a86e3ea6edda8360cec9 --- .../kotlin/config/KotlinFacetSettings.kt | 91 +++++++++++-------- .../kotlin/jps/JpsKotlinCompilerSettings.kt | 17 +--- 2 files changed, 56 insertions(+), 52 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 974af76d7c8..8dafa4c77e5 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -19,11 +19,10 @@ package org.jetbrains.kotlin.config import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.module.Module import com.intellij.openapi.project.Project -import com.intellij.util.xmlb.annotations.Property -import com.intellij.util.xmlb.annotations.Transient import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.utils.DescriptionAware sealed class TargetPlatformKind( @@ -45,24 +44,12 @@ sealed class TargetPlatformKind( object Common : TargetPlatformKind(DescriptionAware.NoVersion, "Common (experimental)") companion object { - val ALL_PLATFORMS: List> by lazy { Jvm.JVM_PLATFORMS + JavaScript + Common } + val DEFAULT_PLATFORM: TargetPlatformKind<*> + get() = Jvm[JvmTarget.DEFAULT] } } -data class KotlinVersionInfo( - var languageLevel: LanguageVersion? = null, - var apiLevel: LanguageVersion? = null, - @get:Transient var targetPlatformKind: TargetPlatformKind<*>? = null -) { - // To be serialized - var targetPlatformName: String - get() = targetPlatformKind?.description ?: "" - set(value) { - targetPlatformKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == value } - } -} - enum class CoroutineSupport( override val description: String, val compilerArgument: String @@ -90,38 +77,62 @@ enum class CoroutineSupport( } } -class KotlinCompilerInfo { - // To be serialized - @Property private var _commonCompilerArguments: CommonCompilerArguments.DummyImpl? = null - @get:Transient var commonCompilerArguments: CommonCompilerArguments? - get() = _commonCompilerArguments - set(value) { - _commonCompilerArguments = value as? CommonCompilerArguments.DummyImpl - } - var k2jsCompilerArguments: K2JSCompilerArguments? = null - var k2jvmCompilerArguments: K2JVMCompilerArguments? = null - var compilerSettings: CompilerSettings? = null - - @get:Transient var coroutineSupport: CoroutineSupport - get() = CoroutineSupport.byCompilerArguments(commonCompilerArguments) - set(value) { - commonCompilerArguments?.coroutinesEnable = value == CoroutineSupport.ENABLED - commonCompilerArguments?.coroutinesWarn = value == CoroutineSupport.ENABLED_WITH_WARNING - commonCompilerArguments?.coroutinesError = value == CoroutineSupport.DISABLED - } -} - class KotlinFacetSettings { companion object { // Increment this when making serialization-incompatible changes to configuration data - val CURRENT_VERSION = 1 + val CURRENT_VERSION = 2 val DEFAULT_VERSION = 0 } var useProjectSettings: Boolean = true - var versionInfo = KotlinVersionInfo() - var compilerInfo = KotlinCompilerInfo() + var compilerArguments: CommonCompilerArguments? = null + var compilerSettings: CompilerSettings? = null + + var languageLevel: LanguageVersion? + get() = compilerArguments?.languageVersion?.let { LanguageVersion.fromFullVersionString(it) } + set(value) { + compilerArguments!!.languageVersion = value?.versionString + } + + var apiLevel: LanguageVersion? + get() = compilerArguments?.apiVersion?.let { LanguageVersion.fromFullVersionString(it) } + set(value) { + compilerArguments!!.apiVersion = value?.versionString + } + + val targetPlatformKind: TargetPlatformKind<*>? + get() = compilerArguments?.let { + when (it) { + is K2JVMCompilerArguments -> { + val jvmTarget = it.jvmTarget ?: JvmTarget.DEFAULT.description + TargetPlatformKind.Jvm.JVM_PLATFORMS.firstOrNull { it.version.description >= jvmTarget } + } + is K2JSCompilerArguments -> TargetPlatformKind.JavaScript + is K2MetadataCompilerArguments -> TargetPlatformKind.Common + else -> null + } + } + + var coroutineSupport: CoroutineSupport + get() = CoroutineSupport.byCompilerArguments(compilerArguments) + set(value) { + with(compilerArguments!!) { + coroutinesEnable = value == CoroutineSupport.ENABLED + coroutinesWarn = value == CoroutineSupport.ENABLED_WITH_WARNING + coroutinesError = value == CoroutineSupport.DISABLED + } + } +} + +fun TargetPlatformKind<*>.createCompilerArguments(): CommonCompilerArguments { + return when (this) { + is TargetPlatformKind.Jvm -> { + K2JVMCompilerArguments().apply { jvmTarget = this@createCompilerArguments.version.description } + } + is TargetPlatformKind.JavaScript -> K2JSCompilerArguments() + is TargetPlatformKind.Common -> K2MetadataCompilerArguments() + } } interface KotlinFacetSettingsProvider { diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt index b7632daa9a8..ad41e628273 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.kt @@ -66,11 +66,8 @@ class JpsKotlinCompilerSettings : JpsElementBase() { val defaultArguments = getSettings(module.project).commonCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments if (facetSettings.useProjectSettings) return defaultArguments - val (languageLevel, apiLevel) = facetSettings.versionInfo - val facetArguments = facetSettings.compilerInfo.commonCompilerArguments ?: return defaultArguments + val facetArguments = facetSettings.compilerArguments ?: return defaultArguments return copyBean(facetArguments).apply { - languageVersion = languageLevel?.description - apiVersion = apiLevel?.description multiPlatform = module .dependenciesList .dependencies @@ -86,11 +83,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { val defaultArguments = getSettings(module.project).k2JvmCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments if (facetSettings.useProjectSettings) return defaultArguments - val targetPlatform = facetSettings.versionInfo.targetPlatformKind as? TargetPlatformKind.Jvm ?: return defaultArguments - val arguments = facetSettings.compilerInfo.k2jvmCompilerArguments ?: defaultArguments - return copyBean(arguments).apply { - jvmTarget = targetPlatform.version.description - } + return facetSettings.compilerArguments as? K2JVMCompilerArguments ?: defaultArguments } fun setK2JvmCompilerArguments(project: JpsProject, k2JvmCompilerArguments: K2JVMCompilerArguments) { @@ -101,7 +94,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { val defaultArguments = getSettings(module.project).k2JsCompilerArguments val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultArguments if (facetSettings.useProjectSettings) return defaultArguments - return facetSettings.compilerInfo.k2jsCompilerArguments ?: defaultArguments + return facetSettings.compilerArguments as? K2JSCompilerArguments ?: defaultArguments } fun setK2JsCompilerArguments(project: JpsProject, k2JsCompilerArguments: K2JSCompilerArguments) { @@ -112,7 +105,7 @@ class JpsKotlinCompilerSettings : JpsElementBase() { val defaultSettings = getSettings(module.project).compilerSettings val facetSettings = module.kotlinFacetExtension?.settings ?: return defaultSettings if (facetSettings.useProjectSettings) return defaultSettings - return facetSettings.compilerInfo.compilerSettings ?: defaultSettings + return facetSettings.compilerSettings ?: defaultSettings } fun setCompilerSettings(project: JpsProject, compilerSettings: CompilerSettings) { @@ -122,4 +115,4 @@ class JpsKotlinCompilerSettings : JpsElementBase() { } val JpsModule.targetPlatform: TargetPlatformKind<*>? - get() = kotlinFacetExtension?.settings?.versionInfo?.targetPlatformKind \ No newline at end of file + get() = kotlinFacetExtension?.settings?.targetPlatformKind \ No newline at end of file From e24fd4e98632e38e245674b635907577891d8e3b Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 7 Mar 2017 20:50:28 +0300 Subject: [PATCH 0967/1557] Kotlin Facet: Reuse configuration serialization in JPS (previous implementation is not usable after configuration refactoring) Original commit: 278cc71c4a57321f39c66abad470ef5b1a536f01 --- .../kotlin/config/facetSerialization.kt | 130 ++++++++++++++++++ .../JpsKotlinFacetConfigurationSerializer.kt | 8 +- 2 files changed, 134 insertions(+), 4 deletions(-) create mode 100644 jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt new file mode 100644 index 00000000000..c696d3bd62c --- /dev/null +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -0,0 +1,130 @@ +/* + * Copyright 2010-2017 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.kotlin.config + +import com.intellij.util.xmlb.SkipDefaultsSerializationFilter +import com.intellij.util.xmlb.XmlSerializer +import org.jdom.DataConversionException +import org.jdom.Element +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments + +private fun Element.getOption(name: String) = getChildren("option").firstOrNull { it.getAttribute("name").value == name } + +private fun Element.getOptionValue(name: String) = getOption(name)?.getAttribute("value")?.value + +private fun Element.getOptionBody(name: String) = getOption(name)?.children?.firstOrNull() + +private fun readV1Config(element: Element): KotlinFacetSettings { + return KotlinFacetSettings().apply { + val useProjectSettings = element.getOptionValue("useProjectSettings")?.toBoolean() + + val targetPlatformName = element.getOptionBody("versionInfo")?.getOptionValue("targetPlatformName") + val targetPlatform = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == targetPlatformName } + ?: TargetPlatformKind.Jvm[JvmTarget.DEFAULT] + + val compilerInfoElement = element.getOptionBody("compilerInfo") + + val compilerSettings = CompilerSettings().apply { + compilerInfoElement?.getOptionBody("compilerSettings")?.let { compilerSettingsElement -> + XmlSerializer.deserializeInto(this, compilerSettingsElement) + } + } + + val commonArgumentsElement = compilerInfoElement?.getOptionBody("_commonCompilerArguments") + val jvmArgumentsElement = compilerInfoElement?.getOptionBody("k2jvmCompilerArguments") + val jsArgumentsElement = compilerInfoElement?.getOptionBody("k2jsCompilerArguments") + + val compilerArguments = targetPlatform.createCompilerArguments() + + commonArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) } + when (compilerArguments) { + is K2JVMCompilerArguments -> jvmArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) } + is K2JSCompilerArguments -> jsArgumentsElement?.let { XmlSerializer.deserializeInto(compilerArguments, it) } + } + + if (useProjectSettings != null) { + this.useProjectSettings = useProjectSettings + } + else { + // Migration problem workaround for pre-1.1-beta releases (mainly 1.0.6) -> 1.1-rc+ + // Problematic cases: 1.1-beta/1.1-beta2 -> 1.1-rc+ (useProjectSettings gets reset to false) + // This heuristic detects old enough configurations: + if (jvmArgumentsElement == null) { + this.useProjectSettings = false + } + } + + this.compilerSettings = compilerSettings + this.compilerArguments = compilerArguments + } +} + +private fun readV2Config(element: Element): KotlinFacetSettings { + return KotlinFacetSettings().apply { + element.getAttributeValue("useProjectSettings")?.let { useProjectSettings = it.toBoolean() } + val platformName = element.getAttributeValue("platform") + val platformKind = TargetPlatformKind.ALL_PLATFORMS.firstOrNull { it.description == platformName } ?: TargetPlatformKind.DEFAULT_PLATFORM + element.getChild("compilerSettings")?.let { + compilerSettings = CompilerSettings() + XmlSerializer.deserializeInto(compilerSettings!!, it) + } + element.getChild("compilerArguments")?.let { + compilerArguments = platformKind.createCompilerArguments() + XmlSerializer.deserializeInto(compilerArguments!!, it) + } + } +} + +fun deserializeFacetSettings(element: Element): KotlinFacetSettings { + val version = + try { + element.getAttribute("version")?.intValue + } + catch(e: DataConversionException) { + null + } ?: KotlinFacetSettings.DEFAULT_VERSION + return when (version) { + 1 -> readV1Config(element) + 2 -> readV2Config(element) + else -> KotlinFacetSettings() // Reset facet configuration if versions don't match + } +} + +fun KotlinFacetSettings.serializeFacetSettings(element: Element) { + val filter = SkipDefaultsSerializationFilter() + + element.setAttribute("version", KotlinFacetSettings.CURRENT_VERSION.toString()) + targetPlatformKind?.let { + element.setAttribute("platform", it.description) + } + if (!useProjectSettings) { + element.setAttribute("useProjectSettings", useProjectSettings.toString()) + } + compilerSettings?.let { + Element("compilerSettings").apply { + XmlSerializer.serializeInto(it, this, filter) + element.addContent(this) + } + } + compilerArguments?.let { + Element("compilerArguments").apply { + XmlSerializer.serializeInto(it, this, filter) + element.addContent(this) + } + } +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetConfigurationSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetConfigurationSerializer.kt index 9bf0e88d700..202b7389d4a 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetConfigurationSerializer.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/JpsKotlinFacetConfigurationSerializer.kt @@ -16,12 +16,12 @@ package org.jetbrains.kotlin.jps.model -import com.intellij.util.xmlb.XmlSerializer import org.jdom.Element import org.jetbrains.jps.model.JpsElement import org.jetbrains.jps.model.module.JpsModule import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer -import org.jetbrains.kotlin.config.KotlinFacetSettings +import org.jetbrains.kotlin.config.deserializeFacetSettings +import org.jetbrains.kotlin.config.serializeFacetSettings object JpsKotlinFacetConfigurationSerializer : JpsFacetConfigurationSerializer( JpsKotlinFacetModuleExtension.KIND, @@ -34,7 +34,7 @@ object JpsKotlinFacetConfigurationSerializer : JpsFacetConfigurationSerializer Date: Tue, 7 Mar 2017 21:21:51 +0300 Subject: [PATCH 0968/1557] Kotlin Facet: Escape additional compiler arguments when converting them to string and unescape before parsing #KT-16700 Fixed Original commit: 811b8978c21e412101049d19c237317a45c1d52d --- .../src/org/jetbrains/kotlin/config/CompilerSettings.kt | 7 +++++++ .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 89af21eee09..67326926e1c 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -16,6 +16,8 @@ package org.jetbrains.kotlin.config +import com.intellij.openapi.util.text.StringUtil + class CompilerSettings { @JvmField var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS @JvmField var scriptTemplates: String = "" @@ -28,3 +30,8 @@ class CompilerSettings { private val DEFAULT_OUTPUT_DIRECTORY = "lib" } } + +val CompilerSettings.additionalArgumentsAsList: List + get() = StringUtil.splitHonorQuotes(additionalArguments, ' ').map { + if (it.startsWith('"')) StringUtil.unescapeChar(StringUtil.unquoteString(it), '"') else it + } \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 485f72aee0b..447b226c316 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.cli.common.arguments.mergeBeans import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.config.CompilerSettings +import org.jetbrains.kotlin.config.additionalArgumentsAsList import org.jetbrains.kotlin.daemon.common.* import org.jetbrains.kotlin.jps.build.KotlinBuilder import java.io.ByteArrayOutputStream @@ -129,7 +130,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { private fun withAdditionalCompilerArgs(compilerArgs: CommonCompilerArguments): Array { val allArgs = ArgumentUtils.convertArgumentsToStringList(compilerArgs) + - (compilerSettings?.additionalArguments?.split(" ") ?: emptyList()) + (compilerSettings?.additionalArgumentsAsList ?: emptyList()) return allArgs.toTypedArray() } From cc7091bb3c0063f1dd2fa317ffcfc06469fa1647 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 9 Mar 2017 11:29:26 +0300 Subject: [PATCH 0969/1557] JPS: Fix earlier configurations with incorrect combination of language and API version Original commit: e8640b441db7c9e649b26a7c15f2ee1e2457e0c2 --- .../jps/model/KotlinCommonCompilerArgumentsSerializer.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt index 3c8b6490436..2f15f384cfe 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.kt @@ -16,15 +16,15 @@ package org.jetbrains.kotlin.jps.model +import com.intellij.util.text.VersionComparatorUtil import com.intellij.util.xmlb.XmlSerializer import org.jdom.Element -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer -import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings - +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION import org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE +import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings internal class KotlinCommonCompilerArgumentsSerializer : JpsProjectExtensionSerializer(KOTLIN_COMPILER_SETTINGS_FILE, KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION) { @@ -32,6 +32,9 @@ internal class KotlinCommonCompilerArgumentsSerializer : JpsProjectExtensionSeri override fun loadExtension(project: JpsProject, componentTag: Element) { val settings = XmlSerializer.deserialize(componentTag, CommonCompilerArguments.DummyImpl::class.java) ?: CommonCompilerArguments.DummyImpl() + if (VersionComparatorUtil.compare(settings.languageVersion, settings.apiVersion) < 0) { + settings.apiVersion = settings.languageVersion + } JpsKotlinCompilerSettings.setCommonCompilerArguments(project, settings) } From 8789a40617a341bee2c90a11447027800095a8a1 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 10 Mar 2017 18:24:02 +0300 Subject: [PATCH 0970/1557] Misc: Include cli-parser 1.1.2 sources into the project under different package and drop original library dependency This would allow building the project with Kotlin JPS plugin on TeamCity where older library takes precendence due to appearing earlier in JPS classpath Original commit: 73b879ea8957c4550d1c58607db96924010c022b --- jps/jps-plugin/jps-plugin.iml | 1 - 1 file changed, 1 deletion(-) diff --git a/jps/jps-plugin/jps-plugin.iml b/jps/jps-plugin/jps-plugin.iml index f5fcf5cec86..59e6dad560b 100644 --- a/jps/jps-plugin/jps-plugin.iml +++ b/jps/jps-plugin/jps-plugin.iml @@ -21,6 +21,5 @@ - \ No newline at end of file From f936dea85045f315a6517a728d3eff3108cc6651 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 3 Mar 2017 18:59:57 +0300 Subject: [PATCH 0971/1557] JPS: Parse and merge additional arguments with primary ones instead of appending them (to avoid duplication) #KT-16788 Fixed Original commit: e5a128ab2ef442d6ad51bdee2c0ed5d5267794dd --- .../compilerRunner/JpsKotlinCompilerRunner.kt | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 447b226c316..68227368eed 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -19,10 +19,7 @@ package org.jetbrains.kotlin.compilerRunner import org.jetbrains.jps.api.GlobalOptions import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -import org.jetbrains.kotlin.cli.common.arguments.mergeBeans +import org.jetbrains.kotlin.cli.common.arguments.* import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.config.CompilerSettings @@ -122,16 +119,23 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { val compilerMode = CompilerMode.JPS_COMPILER val verbose = compilerArgs.verbose val options = CompilationOptions(compilerMode, targetPlatform, reportCategories(verbose), reportSeverity(verbose), requestedCompilationResults = emptyArray()) - daemon.compile(sessionId, withAdditionalCompilerArgs(compilerArgs), options, JpsCompilerServicesFacadeImpl(environment), null) + daemon.compile(sessionId, serializeWithAdditionalCompilerArgs(compilerArgs), options, JpsCompilerServicesFacadeImpl(environment), null) } return res?.get()?.let { exitCodeFromProcessExitCode(it) } } - private fun withAdditionalCompilerArgs(compilerArgs: CommonCompilerArguments): Array { - val allArgs = ArgumentUtils.convertArgumentsToStringList(compilerArgs) + - (compilerSettings?.additionalArgumentsAsList ?: emptyList()) - return allArgs.toTypedArray() + private fun withAdditionalArguments(compilerArgs: CommonCompilerArguments): CommonCompilerArguments { + val compilerSettings = compilerSettings ?: return compilerArgs + return copyBean(compilerArgs).apply { + parseArguments(compilerSettings.additionalArgumentsAsList.toTypedArray(), this) + freeArgs.addAll(0, compilerArgs.freeArgs) + unknownExtraFlags.addAll(0, compilerArgs.unknownExtraFlags) + } + } + + private fun serializeWithAdditionalCompilerArgs(compilerArgs: CommonCompilerArguments): Array { + return ArgumentUtils.convertArgumentsToStringList(withAdditionalArguments(compilerArgs)).toTypedArray() } private fun reportCategories(verbose: Boolean): Array { @@ -172,7 +176,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { if (System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false").toBoolean()) System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") - val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, withAdditionalCompilerArgs(compilerArgs), environment, out) + val rc = CompilerRunnerUtil.invokeExecMethod(compilerClassName, serializeWithAdditionalCompilerArgs(compilerArgs), environment, out) // exec() returns an ExitCode object, class of which is loaded with a different class loader, // so we take it's contents through reflection From 6ea2a6540f251fa36d7a246905cff4881bf57a09 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 9 Mar 2017 15:37:28 +0300 Subject: [PATCH 0972/1557] Configuration: Don't create kotlinc.xml if the settings don't differ from the defaults #KT-16647 Fixed Original commit: 6b6d7a50302446b1d83c139cce9e45806099e776 --- .../src/org/jetbrains/kotlin/config/facetSerialization.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index c696d3bd62c..348190d62cb 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -23,7 +23,7 @@ import org.jdom.Element import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments -private fun Element.getOption(name: String) = getChildren("option").firstOrNull { it.getAttribute("name").value == name } +fun Element.getOption(name: String) = getChildren("option").firstOrNull { it.getAttribute("name").value == name } private fun Element.getOptionValue(name: String) = getOption(name)?.getAttribute("value")?.value From d01eed9849f922c8ae5e2891d00e2e5ad804a816 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 1 Mar 2017 19:23:14 +0300 Subject: [PATCH 0973/1557] Move JvmTarget to frontend.java, introduce TargetPlatformVersion Previously JvmTarget was declared in module 'util' which is accessible for example from 'frontend', which is not very good. Also add a superinterface named TargetPlatformVersion which is going to be used in platform-independent injectors in 'frontend' in the following commits. Use it in one place (LanguageVersionSettingsProviderImpl.kt) instead of DescriptionAware because TargetPlatformVersion sounds like a better abstraction than DescriptionAware here Original commit: 573c6ab5d497a5f2866c7bf5e6d354baf967a7e9 --- jps/jps-common/idea-jps-common.iml | 1 + .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jps/jps-common/idea-jps-common.iml b/jps/jps-common/idea-jps-common.iml index e38866647e8..8f2dd089f68 100644 --- a/jps/jps-common/idea-jps-common.iml +++ b/jps/jps-common/idea-jps-common.iml @@ -12,5 +12,6 @@ + \ No newline at end of file diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 8dafa4c77e5..392af29446b 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.utils.DescriptionAware -sealed class TargetPlatformKind( +sealed class TargetPlatformKind( val version: Version, val name: String ) : DescriptionAware { @@ -39,9 +39,9 @@ sealed class TargetPlatformKind( } } - object JavaScript : TargetPlatformKind(DescriptionAware.NoVersion, "JavaScript") + object JavaScript : TargetPlatformKind(TargetPlatformVersion.NoVersion, "JavaScript") - object Common : TargetPlatformKind(DescriptionAware.NoVersion, "Common (experimental)") + object Common : TargetPlatformKind(TargetPlatformVersion.NoVersion, "Common (experimental)") companion object { val ALL_PLATFORMS: List> by lazy { Jvm.JVM_PLATFORMS + JavaScript + Common } @@ -141,4 +141,4 @@ interface KotlinFacetSettingsProvider { companion object { fun getInstance(project: Project) = ServiceManager.getService(project, KotlinFacetSettingsProvider::class.java)!! } -} \ No newline at end of file +} From 848d3761d1ad7df98d52e7a693f756519e9eb733 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 13 Mar 2017 10:34:45 +0300 Subject: [PATCH 0974/1557] Move skipMetadataVersionCheck flag to LanguageVersionSettings This makes it possible to avoid the CompilerConfiguration instance in injectors, because CompilerDeserializationConfiguration was the only left component that required it. LanguageVersionSettings is not a good name for this entity anymore, it should be renamed in the future Original commit: ac530ac49c60d2e62847806addc54fe8bded56c7 --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 392af29446b..19f449cb599 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -123,6 +123,12 @@ class KotlinFacetSettings { coroutinesError = value == CoroutineSupport.DISABLED } } + + var skipMetadataVersionCheck: Boolean + get() = compilerArguments?.skipMetadataVersionCheck == true + set(value) { + compilerArguments!!.skipMetadataVersionCheck = value + } } fun TargetPlatformKind<*>.createCompilerArguments(): CommonCompilerArguments { From d74d5085254f70c84c1c4371e2615ef956379308 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 13 Mar 2017 13:04:06 +0300 Subject: [PATCH 0975/1557] Introduce LanguageFeature.State, drop coroutines-related pseudofeatures Previously there were three LanguageFeature instances -- Coroutines, DoNotWarnOnCoroutines and ErrorOnCoroutines -- which were handled very awkwardly in the compiler and in the IDE to basically support a language feature with a more complex state: not just enabled/disabled, but also enabled with warning and enabled with error. Introduce a new enum LanguageFeature.State for this and allow LanguageVersionSettings to get the state of any language feature with 'getFeatureSupport'. One noticeable drawback of this approach is that looking at the API, one may assume that any language feature can be in one of the four states (enabled, warning, error, disabled). This is not true however; there's only one language feature at the moment (coroutines) for which these intermediate states (warning, error) are handled in any way. This may be refactored further by abstracting the logic that checks the language feature availability so that it would work exactly the same for any feature. Another issue is that the difference among ENABLED_WITH_ERROR and DISABLED is not clear. They are left as separate states because at the moment, different diagnostics are reported in these two cases and quick-fixes in IDE rely on that Original commit: 32826c168638f516bdb764b28c90d7bf3f9f5c13 --- .../src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 19f449cb599..fbda4ced164 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -50,6 +50,7 @@ sealed class TargetPlatformKind( } } +// TODO: merge with LanguageFeature.State enum class CoroutineSupport( override val description: String, val compilerArgument: String From 2c4f3c059decab21f0578140f98000b6b07045ac Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 13 Mar 2017 13:44:58 +0300 Subject: [PATCH 0976/1557] Use LanguageFeature.State enum instead of CoroutineSupport Original commit: 7a240b63c7cee378877ad26ae2a8008abb202e75 --- .../kotlin/config/KotlinFacetSettings.kt | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index fbda4ced164..4336cb0cf33 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -50,31 +50,27 @@ sealed class TargetPlatformKind( } } -// TODO: merge with LanguageFeature.State -enum class CoroutineSupport( - override val description: String, - val compilerArgument: String -) : DescriptionAware { - ENABLED("Enabled", "enable"), - ENABLED_WITH_WARNING("Enabled with warning", "warn"), - DISABLED("Disabled", "error"); +object CoroutineSupport { + @JvmStatic + fun byCompilerArguments(arguments: CommonCompilerArguments?): LanguageFeature.State = + byCompilerArgumentsOrNull(arguments) ?: LanguageFeature.Coroutines.defaultState - companion object { - val DEFAULT = ENABLED_WITH_WARNING + fun byCompilerArgumentsOrNull(arguments: CommonCompilerArguments?): LanguageFeature.State? = when { + arguments == null -> null + arguments.coroutinesEnable -> LanguageFeature.State.ENABLED + arguments.coroutinesWarn -> LanguageFeature.State.ENABLED_WITH_WARNING + arguments.coroutinesError -> LanguageFeature.State.ENABLED_WITH_ERROR + else -> null + } - @JvmStatic fun byCompilerArguments(arguments: CommonCompilerArguments?) = byCompilerArgumentsOrNull(arguments) ?: DEFAULT + fun byCompilerArgument(argument: String): LanguageFeature.State = + LanguageFeature.State.values().find { getCompilerArgument(it).equals(argument, ignoreCase = true) } + ?: LanguageFeature.Coroutines.defaultState - fun byCompilerArgumentsOrNull(arguments: CommonCompilerArguments?) = when { - arguments == null -> null - arguments.coroutinesEnable -> ENABLED - arguments.coroutinesWarn -> ENABLED_WITH_WARNING - arguments.coroutinesError -> DISABLED - else -> null - } - - fun byCompilerArgument(argument: String): CoroutineSupport { - return CoroutineSupport.values().find { it.compilerArgument.equals(argument, ignoreCase = true) } ?: DEFAULT - } + fun getCompilerArgument(state: LanguageFeature.State): String = when (state) { + LanguageFeature.State.ENABLED -> "enable" + LanguageFeature.State.ENABLED_WITH_WARNING -> "warn" + LanguageFeature.State.ENABLED_WITH_ERROR, LanguageFeature.State.DISABLED -> "error" } } @@ -115,13 +111,17 @@ class KotlinFacetSettings { } } - var coroutineSupport: CoroutineSupport - get() = CoroutineSupport.byCompilerArguments(compilerArguments) + var coroutineSupport: LanguageFeature.State + get() { + val languageVersion = languageLevel ?: return LanguageFeature.Coroutines.defaultState + if (languageVersion < LanguageFeature.Coroutines.sinceVersion!!) return LanguageFeature.State.DISABLED + return CoroutineSupport.byCompilerArguments(compilerArguments) + } set(value) { with(compilerArguments!!) { - coroutinesEnable = value == CoroutineSupport.ENABLED - coroutinesWarn = value == CoroutineSupport.ENABLED_WITH_WARNING - coroutinesError = value == CoroutineSupport.DISABLED + coroutinesEnable = value == LanguageFeature.State.ENABLED + coroutinesWarn = value == LanguageFeature.State.ENABLED_WITH_WARNING + coroutinesError = value == LanguageFeature.State.ENABLED_WITH_ERROR || value == LanguageFeature.State.DISABLED } } From f307821704af59bbb65d6ccc371bd477da9d8108 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 21 Feb 2017 17:38:43 +0300 Subject: [PATCH 0977/1557] Cleanup: fix some compiler warnings (mostly deprecations, javaClass) Original commit: b121bf880221cc1ba8f1d16f9a7248c8be074555 --- .../jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt | 2 +- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 2 +- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index e711b055b75..0040e9e183f 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -37,7 +37,7 @@ abstract class AbstractLookupTrackerTest : AbstractIncrementalJpsTest( val COMMENT_WITH_LOOKUP_INFO = "/\\*[^*]+\\*/".toRegex() override fun checkLookups(lookupTracker: LookupTracker, compiledFiles: Set) { - if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker.javaClass}") + if (lookupTracker !is TestLookupTracker) throw AssertionError("Expected TestLookupTracker, but: ${lookupTracker::class.java}") val fileToLookups = lookupTracker.lookups.groupBy { it.filePath } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 68227368eed..ac426c7192d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -207,7 +207,7 @@ class JpsKotlinCompilerRunner : KotlinCompilerRunner() { private fun getReturnCodeFromObject(rc: Any?): String { when { rc == null -> return INTERNAL_ERROR - ExitCode::class.java.name == rc.javaClass.name -> return rc.toString() + ExitCode::class.java.name == rc::class.java.name -> return rc.toString() else -> throw IllegalStateException("Unexpected return: " + rc) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index cf33b1e5ab7..920ffba1df3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -450,7 +450,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { messageCollector.report( INFO, - "Plugin loaded: ${argumentProvider.javaClass.simpleName}", + "Plugin loaded: ${argumentProvider::class.java.simpleName}", CompilerMessageLocation.NO_LOCATION ) } @@ -627,7 +627,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { ) { if (!IncrementalCompilation.isExperimental()) return - if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker.javaClass}") + if (lookupTracker !is LookupTrackerImpl) throw AssertionError("Lookup tracker is expected to be LookupTrackerImpl, got ${lookupTracker::class.java}") val lookupStorage = dataManager.getStorage(KotlinDataContainerTarget, JpsLookupStorageProvider) From 61934ff4b3d58d312a039d545f4a181b05f92d7e Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 22 Feb 2017 16:12:01 +0300 Subject: [PATCH 0978/1557] Cleanup: apply "Convert lambda to reference" Original commit: 045a23ae1067f7fcc4ba16e74aff5f1068971a06 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- .../jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 920ffba1df3..7ceda24399c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -431,7 +431,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { if (IncrementalCompilation.isEnabled()) { for (target in chunk.targets) { val cache = incrementalCaches[target]!! - val removedAndDirtyFiles = filesToCompile[target] + dirtyFilesHolder.getRemovedFiles(target).map { File(it) } + val removedAndDirtyFiles = filesToCompile[target] + dirtyFilesHolder.getRemovedFiles(target).map(::File) cache.markOutputClassesDirty(removedAndDirtyFiles) } } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt index 1f8782e6712..409c1f35141 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/JpsIncrementalCacheImpl.kt @@ -66,7 +66,7 @@ class JpsIncrementalCacheImpl( } } - return result.map { File(it) } + return result.map(::File) } fun cleanDirtyInlineFunctions() { From 416a5027df970d08a295535f259914d592487674 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 14 Mar 2017 21:18:24 +0300 Subject: [PATCH 0979/1557] Kotlin Facet: Validate "additional arguments" Validate consistency of "additional arguments" with respect to settings specified in other UI controls Original commit: 88a394e892077eba6b6c9961294ceceff5e5017a --- .../src/org/jetbrains/kotlin/config/CompilerSettings.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt index 67326926e1c..a25232cf9d9 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/CompilerSettings.kt @@ -32,6 +32,8 @@ class CompilerSettings { } val CompilerSettings.additionalArgumentsAsList: List - get() = StringUtil.splitHonorQuotes(additionalArguments, ' ').map { - if (it.startsWith('"')) StringUtil.unescapeChar(StringUtil.unquoteString(it), '"') else it - } \ No newline at end of file + get() = splitArgumentString(additionalArguments) + +fun splitArgumentString(arguments: String) = StringUtil.splitHonorQuotes(arguments, ' ').map { + if (it.startsWith('"')) StringUtil.unescapeChar(StringUtil.unquoteString(it), '"') else it +} \ No newline at end of file From fcd77261d047d78bf9dfae7bd3136b9dabde982b Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Thu, 16 Mar 2017 02:48:27 +0300 Subject: [PATCH 0980/1557] Kotlin Facet: Fix reading of v1 configuration Favor language/api version specified in element in case it differs from the one in ()?.let(settingReference::get) + if (isEnabledByCompilerArgument == true) return true + val isEnabledByAdditionalSettings = run { + val stringArgumentName = settingReference.findAnnotation()?.value ?: return@run null + compilerSettings?.additionalArguments?.contains(stringArgumentName, ignoreCase = true) + } + return isEnabledByAdditionalSettings ?: false + } + var languageLevel: LanguageVersion? get() = compilerArguments?.languageVersion?.let { LanguageVersion.fromFullVersionString(it) } set(value) { From 8b1e8995edb4ea33c9ad01ad2f19db6c3fb68fe5 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 5 Feb 2020 20:31:54 +0300 Subject: [PATCH 1482/1557] Build: Make all compile dependencies on toolsJar compileOnly tools.jar differs between different versions of JDK reducing cache reuse so better to not leak it to other modules Original commit: 0db69cadb60b866ff189098b2033f80ad2af7f49 --- jps/jps-plugin/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts index cc33028f21c..fa47a71a2f4 100644 --- a/jps/jps-plugin/build.gradle.kts +++ b/jps/jps-plugin/build.gradle.kts @@ -48,6 +48,7 @@ dependencies { testRuntimeOnly(intellijPluginDep("java")) } + testRuntimeOnly(toolsJar()) testRuntime(project(":kotlin-reflect")) testRuntime(project(":kotlin-script-runtime")) } From be41b876024758b7528f6aa116c0da4e78364ad1 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 10 Mar 2020 11:53:02 +0100 Subject: [PATCH 1483/1557] Minor, fix typo in KotlinChunk.kt #KT-37159 Fixed Original commit: 43d6ddd4058a2a24688a679e6941810cb99c0027 --- .../src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt index ee403420c12..24b5982e1f9 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinChunk.kt @@ -153,7 +153,7 @@ class KotlinChunk internal constructor(val context: KotlinCompileContext, val ta if (containsTests) append("tests of ") append(targets.first().module.name) if (targets.size > 1) { - val andXMore = "and ${targets.size - 1} more" + val andXMore = " and ${targets.size - 1} more" val other = ", " + targets.asSequence().drop(1).joinToString() append(if (other.length < andXMore.length) other else andXMore) } From c06a236e3607eda5bd1dac02a6c4ce6bd7a66c22 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 3 Feb 2020 20:08:48 +0300 Subject: [PATCH 1484/1557] Always checkout/checkin text files with lf endings Different line endings on linux/windows prevents gradle from reusing build cache since endings make task inputs completely different between systems Original commit: bcefa68df01766a059d202a47d968378f6ab5fa1 --- .../jslib-example/META-INF/MANIFEST.MF | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF index 5d1ec1e9192..9ed17555cdc 100644 --- a/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF +++ b/jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF @@ -1,8 +1,8 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.9.1 -Created-By: 1.7.0_72-b14 (Oracle Corporation) -Built-By: JetBrains -Implementation-Vendor: JetBrains -Implementation-Version: snapshot -Specification-Title: Kotlin JavaScript Lib - +Manifest-Version: 1.0 +Ant-Version: Apache Ant 1.9.1 +Created-By: 1.7.0_72-b14 (Oracle Corporation) +Built-By: JetBrains +Implementation-Vendor: JetBrains +Implementation-Version: snapshot +Specification-Title: Kotlin JavaScript Lib + From be8edcdb198b1d8fd4db75240e390322bc0c2db0 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 26 Mar 2020 13:21:41 +0700 Subject: [PATCH 1485/1557] Rename: KonanPlatform, KonanPlatforms -> NativePlatform, NativePlatforms Original commit: 9bbfe9c1acbf116c1bff87fb84756944ac157182 --- .../jetbrains/kotlin/config/facetSerialization.kt | 4 ++-- .../kotlin/platform/compat/compatConversions.kt | 12 ++++++------ .../kotlin/platform/impl/NativeIdePlatformKind.kt | 8 ++++---- .../kotlin/jps/build/dependeciestxt/ModulesTxt.kt | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index 64cb27329ed..1c4fd51330c 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind import org.jetbrains.kotlin.platform.js.JsPlatform import org.jetbrains.kotlin.platform.jvm.JdkPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatform -import org.jetbrains.kotlin.platform.konan.KonanPlatform +import org.jetbrains.kotlin.platform.konan.NativePlatform import java.lang.reflect.Modifier import kotlin.reflect.KClass import kotlin.reflect.full.superclasses @@ -40,7 +40,7 @@ fun TargetPlatform.createArguments(init: (CommonCompilerArguments).() -> Unit = jvmTarget = (singlePlatform as? JdkPlatform)?.targetVersion?.description ?: JvmTarget.DEFAULT.description } is JsPlatform -> K2JSCompilerArguments().apply { init() } - is KonanPlatform -> FakeK2NativeCompilerArguments().apply { init() } + is NativePlatform -> FakeK2NativeCompilerArguments().apply { init() } else -> error("Unknown platform $singlePlatform") } } diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt index 2cdd9419208..28ee4c441cd 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt @@ -19,8 +19,8 @@ import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.jvm.JdkPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatforms -import org.jetbrains.kotlin.platform.konan.KonanPlatform -import org.jetbrains.kotlin.platform.konan.KonanPlatforms +import org.jetbrains.kotlin.platform.konan.NativePlatforms +import org.jetbrains.kotlin.platform.konan.NativePlatform typealias OldPlatform = org.jetbrains.kotlin.resolve.TargetPlatform typealias NewPlatform = org.jetbrains.kotlin.platform.TargetPlatform @@ -29,7 +29,7 @@ fun NewPlatform.toOldPlatform(): OldPlatform = when (val single = singleOrNull() null -> CommonPlatforms.CompatCommonPlatform is JvmPlatform -> JvmPlatforms.CompatJvmPlatform is JsPlatform -> JsPlatforms.CompatJsPlatform - is KonanPlatform -> KonanPlatforms.CompatKonanPlatform + is NativePlatform -> NativePlatforms.CompatNativePlatform else -> error("Unknown platform $single") } @@ -37,7 +37,7 @@ fun OldPlatform.toNewPlatform(): NewPlatform = when (this) { is CommonPlatforms.CompatCommonPlatform -> this is JvmPlatforms.CompatJvmPlatform -> this is JsPlatforms.CompatJsPlatform -> this - is KonanPlatforms.CompatKonanPlatform -> this + is NativePlatforms.CompatNativePlatform -> this else -> error( "Can't convert org.jetbrains.kotlin.resolve.TargetPlatform to org.jetbrains.kotlin.platform.TargetPlatform: " + "non-Compat instance passed\n" + @@ -51,7 +51,7 @@ fun IdePlatform<*, *>.toNewPlatform(): NewPlatform = when (this) { is CommonIdePlatformKind.Platform -> CommonPlatforms.defaultCommonPlatform is JvmIdePlatformKind.Platform -> JvmPlatforms.jvmPlatformByTargetVersion(this.version) is JsIdePlatformKind.Platform -> JsPlatforms.defaultJsPlatform - is NativeIdePlatformKind.Platform -> KonanPlatforms.defaultKonanPlatform + is NativeIdePlatformKind.Platform -> NativePlatforms.defaultNativePlatform else -> error("Unknown platform $this") } @@ -60,6 +60,6 @@ fun NewPlatform.toIdePlatform(): IdePlatform<*, *> = when (val single = singleOr is JdkPlatform -> JvmIdePlatformKind.Platform(single.targetVersion) is JvmPlatform -> JvmIdePlatformKind.Platform(JvmTarget.DEFAULT) is JsPlatform -> JsIdePlatformKind.Platform - is KonanPlatform -> NativeIdePlatformKind.Platform + is NativePlatform -> NativeIdePlatformKind.Platform else -> error("Unknown platform $single") } diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt index a637a9538c4..f5ef2c579ae 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt @@ -13,14 +13,14 @@ import org.jetbrains.kotlin.platform.IdePlatform import org.jetbrains.kotlin.platform.IdePlatformKind import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatformVersion -import org.jetbrains.kotlin.platform.konan.KonanPlatforms +import org.jetbrains.kotlin.platform.konan.NativePlatforms object NativeIdePlatformKind : IdePlatformKind() { - override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform == KonanPlatforms.defaultKonanPlatform + override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform == NativePlatforms.defaultNativePlatform override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? { return if (arguments is FakeK2NativeCompilerArguments) - KonanPlatforms.defaultKonanPlatform + NativePlatforms.defaultNativePlatform else null } @@ -30,7 +30,7 @@ object NativeIdePlatformKind : IdePlatformKind() { } override val defaultPlatform: TargetPlatform - get() = KonanPlatforms.defaultKonanPlatform + get() = NativePlatforms.defaultNativePlatform @Deprecated( message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform", diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt index 53a4aebe2f6..7f51474fb7c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.platform.isCommon import org.jetbrains.kotlin.platform.js.JsPlatforms import org.jetbrains.kotlin.platform.jvm.JvmPlatforms import org.jetbrains.kotlin.platform.jvm.isJvm -import org.jetbrains.kotlin.platform.konan.KonanPlatforms +import org.jetbrains.kotlin.platform.konan.NativePlatforms import java.io.File import kotlin.reflect.KMutableProperty1 import kotlin.reflect.full.findAnnotation @@ -264,7 +264,7 @@ class ModulesTxtBuilder { "js" -> settings.compilerArguments = K2JSCompilerArguments().also { settings.targetPlatform = JsPlatforms.defaultJsPlatform } "native" -> settings.compilerArguments = - FakeK2NativeCompilerArguments().also { settings.targetPlatform = KonanPlatforms.defaultKonanPlatform } + FakeK2NativeCompilerArguments().also { settings.targetPlatform = NativePlatforms.defaultNativePlatform } else -> { val flagProperty = ModulesTxt.Module.flags[flag] if (flagProperty != null) flagProperty.set(module, true) From e1a6bef0eca1a9990b163038292b93f59cf88a7d Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Tue, 21 Jan 2020 07:06:52 +0300 Subject: [PATCH 1486/1557] Make use of contracts of time measurement functions Original commit: fcada0a5e32e0fea8c944ff3c9d0e992bb328187 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index b8985d3405a..76d51459808 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -128,7 +128,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } private fun initializeKotlinContext(context: CompileContext): KotlinCompileContext { - lateinit var kotlinContext: KotlinCompileContext + val kotlinContext: KotlinCompileContext val time = measureTimeMillis { kotlinContext = KotlinCompileContext(context) From 2386a0b1ee42ec99341b74bf67e35fe2d357a4fa Mon Sep 17 00:00:00 2001 From: Konstantin Tskhovrebov Date: Tue, 7 Apr 2020 15:47:29 +0300 Subject: [PATCH 1487/1557] Add native run tasks data to KotlinTarget. Original commit: e1a88de3143584b39b5fc8be9c865140fa03cde9 --- .../kotlin/config/KotlinFacetSettings.kt | 38 ++++++++++++++++--- .../kotlin/config/facetSerialization.kt | 35 +++++++++++++---- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index c11fbd99dfa..2e2ec9eb36d 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -140,16 +140,44 @@ val KotlinMultiplatformVersion?.isNewMPP: Boolean val KotlinMultiplatformVersion?.isHmpp: Boolean get() = this == KotlinMultiplatformVersion.M3 -data class ExternalSystemTestTask(val testName: String, val externalSystemProjectId: String, val targetName: String?) { +interface ExternalSystemRunTask { + val taskName: String + val externalSystemProjectId: String + val targetName: String? +} - fun toStringRepresentation() = "$testName|$externalSystemProjectId|$targetName" +data class ExternalSystemTestRunTask( + override val taskName: String, + override val externalSystemProjectId: String, + override val targetName: String? +) : ExternalSystemRunTask { + + fun toStringRepresentation() = "$taskName|$externalSystemProjectId|$targetName" companion object { fun fromStringRepresentation(line: String) = - line.split("|").let { if (it.size == 3) ExternalSystemTestTask(it[0], it[1], it[2]) else null } + line.split("|").let { if (it.size == 3) ExternalSystemTestRunTask(it[0], it[1], it[2]) else null } } - override fun toString() = "$testName@$externalSystemProjectId [$targetName]" + override fun toString() = "$taskName@$externalSystemProjectId [$targetName]" +} + +data class ExternalSystemNativeMainRunTask( + override val taskName: String, + override val externalSystemProjectId: String, + override val targetName: String?, + val entryPoint: String, + val debuggable: Boolean, +) : ExternalSystemRunTask { + + fun toStringRepresentation() = "$taskName|$externalSystemProjectId|$targetName|$entryPoint|$debuggable" + + companion object { + fun fromStringRepresentation(line: String): ExternalSystemNativeMainRunTask? = + line.split("|").let { + if (it.size == 5) ExternalSystemNativeMainRunTask(it[0], it[1], it[2], it[3], it[4].toBoolean()) else null + } + } } class KotlinFacetSettings { @@ -231,7 +259,7 @@ class KotlinFacetSettings { return field } - var externalSystemTestTasks: List = emptyList() + var externalSystemRunTasks: List = emptyList() @Suppress("DEPRECATION_ERROR") @Deprecated( diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index 1c4fd51330c..5d751b901eb 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -126,8 +126,15 @@ private fun readV2AndLaterConfig(element: Element): KotlinFacetSettings { this.targetPlatform = targetPlatform readElementsList(element, "implements", "implement")?.let { implementedModuleNames = it } readElementsList(element, "dependsOnModuleNames", "dependsOn")?.let { dependsOnModuleNames = it } - readElementsList(element, "externalSystemTestTasks", "externalSystemTestTask")?.let { - externalSystemTestTasks = it.mapNotNull { ExternalSystemTestTask.fromStringRepresentation(it) } + element.getChild("externalSystemTestTasks")?.let { + val testRunTasks = it.getChildren("externalSystemTestTask") + .mapNotNull { (it.content.firstOrNull() as? Text)?.textTrim } + .mapNotNull { ExternalSystemTestRunTask.fromStringRepresentation(it) } + val nativeMainRunTasks = it.getChildren("externalSystemNativeMainRunTask") + .mapNotNull { (it.content.firstOrNull() as? Text)?.textTrim } + .mapNotNull { ExternalSystemNativeMainRunTask.fromStringRepresentation(it) } + + externalSystemRunTasks = testRunTasks + nativeMainRunTasks } element.getChild("sourceSets")?.let { @@ -318,12 +325,24 @@ private fun KotlinFacetSettings.writeLatestConfig(element: Element) { if (isHmppEnabled) { element.setAttribute("isHmppProject", mppVersion.isHmpp.toString()) } - if (externalSystemTestTasks.isNotEmpty()) { - saveElementsList( - element, - externalSystemTestTasks.map { it.toStringRepresentation() }, - "externalSystemTestTasks", - "externalSystemTestTask" + if (externalSystemRunTasks.isNotEmpty()) { + element.addContent( + Element("externalSystemTestTasks").apply { + externalSystemRunTasks.forEach { task -> + when(task) { + is ExternalSystemTestRunTask -> { + addContent( + Element("externalSystemTestTask").apply { addContent(task.toStringRepresentation()) } + ) + } + is ExternalSystemNativeMainRunTask -> { + addContent( + Element("externalSystemNativeMainRunTask").apply { addContent(task.toStringRepresentation()) } + ) + } + } + } + } ) } if (pureKotlinSourceFolders.isNotEmpty()) { From 5c27cf0c71a4bcf8d293d65e982a9f4ffb90e526 Mon Sep 17 00:00:00 2001 From: pyos Date: Mon, 3 Feb 2020 16:01:26 +0100 Subject: [PATCH 1488/1557] JVM_IR: reuse MethodNodes for inline functions in same module This fixes the weird cases when a class gets overwritten by an imperfect copy, reduces the number of classes in the output if an inline function contains an inline call that causes it to have regenerated anonymous objects, and makes inlining of same module functions a bit faster in general. On the other hand, this may increase memory footprint a bit because classes cannot be flushed to the output jar, as the inliner would not be able to locate classes for anonymous objects if they have already been unloaded from memory. Original commit: 82899e624355b3fb7c48bc0359ec2ff4cd983b4b --- .../other/innerClassNotGeneratedWhenRebuilding/directives.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/directives.txt diff --git a/jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/directives.txt b/jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/directives.txt deleted file mode 100644 index 5099b2ad971..00000000000 --- a/jps/jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding/directives.txt +++ /dev/null @@ -1 +0,0 @@ -// IGNORE_BACKEND: JVM_IR From 4fe55d228fccc13c6a03f56541b355fddc57095d Mon Sep 17 00:00:00 2001 From: pyos Date: Thu, 26 Mar 2020 15:46:18 +0100 Subject: [PATCH 1489/1557] JVM_IR: delay writes to the source map until `generateMethod` `generateMethodNode` should not have any side effects for the output to be stable under incremental compilation. Original commit: 9ed73439f83688cbb46db5f197a2fe74049df5f4 --- .../inlineFunctionRegeneratedObjectStability/a.kt | 3 +++ .../inlineFunctionRegeneratedObjectStability/b.kt | 7 +++++++ .../inlineFunctionRegeneratedObjectStability/b.kt.new | 7 +++++++ .../inlineFunctionRegeneratedObjectStability/build.log | 6 ++++++ .../inlineFunctionRegeneratedObjectStability/c.kt | 5 +++++ .../directives.txt | 1 + .../inlineFunctionSmapStability/a.kt | 3 +++ .../inlineFunctionSmapStability/b.kt | 7 +++++++ .../inlineFunctionSmapStability/b.kt.new | 7 +++++++ .../inlineFunctionSmapStability/build.log | 6 ++++++ .../inlineFunctionSmapStability/c.kt | 3 +++ 11 files changed, 55 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log create mode 100644 jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt new file mode 100644 index 00000000000..7aadff7093a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/a.kt @@ -0,0 +1,3 @@ +import inline1.* + +fun f() = h() diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt new file mode 100644 index 00000000000..24893eca0b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt @@ -0,0 +1,7 @@ +package inline1 + +import inline2.* + +fun g() = h() + +inline fun h() = root { "OK" } diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new new file mode 100644 index 00000000000..70a33ea0c38 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/b.kt.new @@ -0,0 +1,7 @@ +package inline1 + +import inline2.* + +fun g() = h() + "!" + +inline fun h() = root { "OK" } diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log new file mode 100644 index 00000000000..c838ee57b45 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/build.log @@ -0,0 +1,6 @@ +================ Step #1 ================= +Compiling files: + src/b.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt new file mode 100644 index 00000000000..318b4ec6337 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/c.kt @@ -0,0 +1,5 @@ +package inline2 + +inline fun root(crossinline x: () -> String) = object { + fun run() = x() +}.run() diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt new file mode 100644 index 00000000000..2323594d941 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionRegeneratedObjectStability/directives.txt @@ -0,0 +1 @@ +// IGNORE_BACKEND: JVM \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt new file mode 100644 index 00000000000..7aadff7093a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/a.kt @@ -0,0 +1,3 @@ +import inline1.* + +fun f() = h() diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt new file mode 100644 index 00000000000..bca02800969 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt @@ -0,0 +1,7 @@ +package inline1 + +import inline2.* + +fun g() = root() + +inline fun h() = root() diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new new file mode 100644 index 00000000000..439c9780e77 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/b.kt.new @@ -0,0 +1,7 @@ +package inline1 + +import inline2.* + +fun g() = root() + "!" + +inline fun h() = root() diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log new file mode 100644 index 00000000000..c838ee57b45 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/build.log @@ -0,0 +1,6 @@ +================ Step #1 ================= +Compiling files: + src/b.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt new file mode 100644 index 00000000000..78ce0b545f7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/incrementalJvmCompilerOnly/inlineFunctionSmapStability/c.kt @@ -0,0 +1,3 @@ +package inline2 + +inline fun root() = "OK" From da1c48254d1a56b81e828de1fdcc7e983952ad82 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Tue, 10 Mar 2020 06:25:02 +0300 Subject: [PATCH 1490/1557] Add tests for lookup tracker with JS KLIB compiler Original commit: 6acf9385bd69b2630524b5dc1805969366d8cd94 --- jps/jps-plugin/build.gradle.kts | 1 + .../jps/build/AbstractLookupTrackerTest.kt | 39 +++++++++- .../JsKlibLookupTrackerTestGenerated.java | 60 ++++++++++++++++ .../jsKlib/classifierMembers/bar.kt | 5 ++ .../jsKlib/classifierMembers/build.log | 21 ++++++ .../jsKlib/classifierMembers/constraints.kt | 7 ++ .../jsKlib/classifierMembers/foo.kt | 71 +++++++++++++++++++ .../jsKlib/classifierMembers/usages.kt | 50 +++++++++++++ .../jsKlib/classifierMembers/usages.kt.new.2 | 54 ++++++++++++++ .../classifierMembers/usages.kt.touch.1 | 0 .../jsKlib/conventions/build.log | 16 +++++ .../jsKlib/conventions/comparison.kt | 18 +++++ .../jsKlib/conventions/comparison.kt.touch | 0 .../jsKlib/conventions/declarations.kt | 35 +++++++++ .../jsKlib/conventions/delegateProperty.kt | 30 ++++++++ .../conventions/delegateProperty.kt.touch | 0 .../jsKlib/conventions/mathematicalLike.kt | 24 +++++++ .../conventions/mathematicalLike.kt.touch | 0 .../lookupTracker/jsKlib/conventions/other.kt | 16 +++++ .../jsKlib/conventions/other.kt.touch | 0 .../jsKlib/expressionType/build.log | 7 ++ .../jsKlib/expressionType/genericType.kt | 15 ++++ .../jsKlib/expressionType/inferredType.kt | 19 +++++ .../expressionType/lambdaParameterType.kt | 11 +++ .../expressionType/localInnerClassType.kt | 9 +++ .../jsKlib/localDeclarations/bar.kt | 1 + .../jsKlib/localDeclarations/build.log | 5 ++ .../jsKlib/localDeclarations/locals.kt | 49 +++++++++++++ .../jsKlib/packageDeclarations/bar.kt | 7 ++ .../jsKlib/packageDeclarations/baz.kt | 7 ++ .../jsKlib/packageDeclarations/build.log | 13 ++++ .../jsKlib/packageDeclarations/foo1.kt | 17 +++++ .../jsKlib/packageDeclarations/foo1.kt.touch | 0 .../jsKlib/packageDeclarations/foo2.kt | 7 ++ .../jsKlib/packageDeclarations/foo2.kt.touch | 0 .../lookupTracker/jsKlib/simple/build.log | 4 ++ .../lookupTracker/jsKlib/simple/main.kt | 6 ++ 37 files changed, 621 insertions(+), 3 deletions(-) create mode 100644 jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1 create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/build.log create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/build.log create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/build.log create mode 100644 jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts index fa47a71a2f4..2bb19dede65 100644 --- a/jps/jps-plugin/build.gradle.kts +++ b/jps/jps-plugin/build.gradle.kts @@ -66,6 +66,7 @@ projectTest(parallel = true) { // do not replace with compile/runtime dependency, // because it forces Intellij reindexing after each compiler change dependsOn(":kotlin-compiler:dist") + dependsOn(":kotlin-stdlib-js-ir:packFullRuntimeKLib") workingDir = rootDir } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 898faa75878..f93d80e40c8 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -43,6 +43,7 @@ import org.jetbrains.kotlin.jps.incremental.createTestingCompilerEnvironment import org.jetbrains.kotlin.jps.incremental.runJSCompiler import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.utils.JsMetadataVersion +import org.jetbrains.kotlin.utils.PathUtil import java.io.* import java.util.* @@ -109,21 +110,40 @@ abstract class AbstractJvmLookupTrackerTest : AbstractLookupTrackerTest() { } } +abstract class AbstractJsKlibLookupTrackerTest : AbstractJsLookupTrackerTest() { + override val jsStdlibFile: File + get() = File("build/js-ir-runtime/full-runtime.klib") + + override fun configureAdditionalArgs(args: K2JSCompilerArguments) { + args.irProduceKlibDir = true + args.irOnly = true + args.outputFile = outDir.resolve("out.klib").absolutePath + } +} + abstract class AbstractJsLookupTrackerTest : AbstractLookupTrackerTest() { private var header: ByteArray? = null private val packageParts: MutableMap = hashMapOf() + private val serializedIrFiles: MutableMap = hashMapOf() override fun setUp() { super.setUp() header = null packageParts.clear() + serializedIrFiles.clear() } override fun Services.Builder.registerAdditionalServices() { if (header != null) { register( IncrementalDataProvider::class.java, - IncrementalDataProviderImpl(header!!, packageParts, JsMetadataVersion.INSTANCE.toArray(), emptyMap(), emptyMap()) // TODO pass correct metadata + IncrementalDataProviderImpl( + headerMetadata = header!!, + compiledPackageParts = packageParts, + metadataVersion = JsMetadataVersion.INSTANCE.toArray(), + packageMetadata = emptyMap(), // TODO pass correct metadata + serializedIrFiles = serializedIrFiles + ) ) } @@ -131,21 +151,34 @@ abstract class AbstractJsLookupTrackerTest : AbstractLookupTrackerTest() { } override fun markDirty(removedAndModifiedSources: Iterable) { - removedAndModifiedSources.forEach { packageParts.remove(it) } + removedAndModifiedSources.forEach { + packageParts.remove(it) + serializedIrFiles.remove(it) + } } override fun processCompilationResults(outputItemsCollector: OutputItemsCollectorImpl, services: Services) { val incrementalResults = services.get(IncrementalResultsConsumer::class.java) as IncrementalResultsConsumerImpl header = incrementalResults.headerMetadata packageParts.putAll(incrementalResults.packageParts) + serializedIrFiles.putAll(incrementalResults.irFileData) + } + + protected open val jsStdlibFile: File + get() = PathUtil.kotlinPathsForDistDirectory.jsStdLibJarPath + + protected open fun configureAdditionalArgs(args: K2JSCompilerArguments) { + args.outputFile = File(outDir, "out.js").canonicalPath } override fun runCompiler(filesToCompile: Iterable, env: JpsCompilerEnvironment): Any? { val args = K2JSCompilerArguments().apply { - outputFile = File(outDir, "out.js").canonicalPath + val libPaths = arrayListOf(jsStdlibFile.absolutePath) + (libraries ?: "").split(File.pathSeparator) + libraries = libPaths.joinToString(File.pathSeparator) reportOutputFiles = true freeArgs = filesToCompile.map { it.canonicalPath } } + configureAdditionalArgs(args) return runJSCompiler(args, env) } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java new file mode 100644 index 00000000000..7ad7897706c --- /dev/null +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java @@ -0,0 +1,60 @@ +/* + * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.jps.build; + +import com.intellij.testFramework.TestDataPath; +import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; +import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.TestMetadata; +import org.junit.runner.RunWith; + +import java.io.File; +import java.util.regex.Pattern; + +/** This class is generated by {@link org.jetbrains.kotlin.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ +@SuppressWarnings("all") +@TestMetadata("jps-plugin/testData/incremental/lookupTracker/jsKlib") +@TestDataPath("$PROJECT_ROOT") +@RunWith(JUnit3RunnerWithInners.class) +public class JsKlibLookupTrackerTestGenerated extends AbstractJsKlibLookupTrackerTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInJsKlib() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/jsKlib"), Pattern.compile("^([^\\.]+)$"), null, false); + } + + @TestMetadata("classifierMembers") + public void testClassifierMembers() throws Exception { + runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/"); + } + + @TestMetadata("conventions") + public void testConventions() throws Exception { + runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/"); + } + + @TestMetadata("expressionType") + public void testExpressionType() throws Exception { + runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/"); + } + + @TestMetadata("localDeclarations") + public void testLocalDeclarations() throws Exception { + runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/"); + } + + @TestMetadata("packageDeclarations") + public void testPackageDeclarations() throws Exception { + runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/"); + } + + @TestMetadata("simple") + public void testSimple() throws Exception { + runTest("jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/"); + } +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt new file mode 100644 index 00000000000..3798ab0118a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/bar.kt @@ -0,0 +1,5 @@ +package bar + +// To force creating bar package + +/*p:bar(Dummy)*/private class Dummy diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log new file mode 100644 index 00000000000..536cf259677 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/build.log @@ -0,0 +1,21 @@ +==== INITIAL BUILD ==== +Compiling files: + src/bar.kt + src/constraints.kt + src/foo.kt + src/usages.kt +Exit code: OK + +==== STEP 1 ==== +Compiling files: + src/usages.kt +Exit code: OK + +==== STEP 2 ==== +Compiling files: + src/usages.kt +Exit code: COMPILATION_ERROR + Unresolved reference: vala + Unresolved reference: vara + Unresolved reference: foo + Unresolved reference: bar \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt new file mode 100644 index 00000000000..c86fa5ded13 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt @@ -0,0 +1,7 @@ +package foo + +import bar.* + +/*p:foo*/fun , C, D> test() + where C : /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Number, C : /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Comparable, D : B +{} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt new file mode 100644 index 00000000000..c8a86b7ce73 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt @@ -0,0 +1,71 @@ +package foo + +import bar.* + +/*p:foo*/class A { + val a = /*p:kotlin(Int)*/1 + var b = /*p:kotlin(String)*/"" + + val c: /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String + get() = /*c:foo.A p:kotlin(String)*/b + + var d: /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String = /*p:kotlin(String)*/"ddd" + get() = /*p:kotlin(String)*/field + set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v } + + fun foo() { + /*c:foo.A p:kotlin(Int)*/a + /*c:foo.A*/foo() + /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a + /*p:foo(A)*/this./*c:foo.A*/foo() + /*c:foo.A c:foo.A.Companion p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar*/baz() + /*c:foo.A c:foo.A.Companion p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + } + + class B { + val a = /*p:kotlin(Int)*/1 + + companion object CO { + fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} + } + } + + inner class C + + companion object { + val a = /*p:kotlin(Int)*/1 + fun baz() {} + } + + object O { + var v = /*p:kotlin(String)*/"vvv" + } +} + +/*p:foo*/interface I { + var a: /*c:foo.I p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int + fun foo() + + class NI +} + +/*p:foo*/object Obj : /*p:foo*/I { + override var a = /*p:kotlin(Int)*/1 + override fun foo() {} + val b = /*p:kotlin(Int)*/1 + fun bar(): /*c:foo.Obj p:foo*/I = /*p:kotlin(Nothing) p:foo(I)*/null as /*c:foo.Obj p:foo*/I +} + +/*p:foo*/enum class E { + X, + Y; + + val a = /*p:kotlin(Int)*/1 + fun foo() { + /*c:foo.E p:kotlin(Int)*/a + /*c:foo.E c:kotlin.Enum p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js c:kotlin.Enum.Companion p:foo p:bar p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E c:kotlin.Enum*/foo() + /*c:foo.E c:kotlin.Enum p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js c:kotlin.Enum.Companion p:foo p:bar*/X./*c:foo.E c:kotlin.Enum*/foo() + } +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt new file mode 100644 index 00000000000..eaf1734a271 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt @@ -0,0 +1,50 @@ +package foo + +import bar.* + +/*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{ + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) + /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo c:foo.A(Companion)*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() + /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion + /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() + /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O + /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + + /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 + /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a + /*p:foo*/Obj./*c:foo.Obj*/foo() + var ii: /*p:foo*/I = /*p:foo*/Obj + /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a + /*p:foo(I)*/ii./*c:foo.I*/foo() + /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b + val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() + /*p:foo(I)*/iii./*c:foo.I*/foo() + + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/X + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo() + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") +} + +/*p:foo*/fun classifiers( + a: /*p:foo*/A, + ab: /*p:foo*/A./*c:foo.A*/B, + ac: /*p:foo*/A./*c:foo.A*/C, + abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO, + aCompanion: /*p:foo*/A./*c:foo.A*/Companion, + aO: /*p:foo*/A./*c:foo.A*/O, + i: /*p:foo*/I, + ni: /*p:foo*/I./*c:foo.I*/NI, + obj: /*p:foo*/Obj, + e: /*p:foo*/E +) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 new file mode 100644 index 00000000000..bb655f2171b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 @@ -0,0 +1,54 @@ +package foo + +import bar.* + +/*p:foo*/fun usages(i: /*p:foo*/I) { + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" + /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) + /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) + /*p:foo c:foo.A(Companion)*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a + /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() + /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion + /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() + /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O + /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*p:foo*/A./*c:foo.A.Companion c:foo.A p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar*/vara() + + /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 + /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a + /*p:foo*/Obj./*c:foo.Obj*/foo() + var ii: /*p:foo*/I = /*p:foo*/Obj + /*p:foo(I) p:kotlin(Int)*/ii./*c:foo.I*/a + /*p:foo(I)*/ii./*c:foo.I*/foo() + /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/b + val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() + /*p:foo(I)*/iii./*c:foo.I*/foo() + + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/X + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo() + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:kotlin(Array)*/E./*c:foo.E*/values() + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/foo + /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/bar() +} + +/*p:foo*/fun classifiers( + a: /*p:foo*/A, + ab: /*p:foo*/A./*c:foo.A*/B, + ac: /*p:foo*/A./*c:foo.A*/C, + abCo: /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO, + aCompanion: /*p:foo*/A./*c:foo.A*/Companion, + aO: /*p:foo*/A./*c:foo.A*/O, + i: /*p:foo*/I, + ni: /*p:foo*/I./*c:foo.I*/NI, + obj: /*p:foo*/Obj, + e: /*p:foo*/E +) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1 b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.touch.1 new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/build.log new file mode 100644 index 00000000000..a03aebe0d5f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/build.log @@ -0,0 +1,16 @@ +==== INITIAL BUILD ==== +Compiling files: + src/comparison.kt + src/declarations.kt + src/delegateProperty.kt + src/mathematicalLike.kt + src/other.kt +Exit code: OK + +==== STEP 1 ==== +Compiling files: + src/comparison.kt + src/delegateProperty.kt + src/mathematicalLike.kt + src/other.kt +Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt new file mode 100644 index 00000000000..291a49175d8 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt @@ -0,0 +1,18 @@ +package foo.bar + +/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a + /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:kotlin(Nothing)*/null + + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/> /*p:kotlin(Int)*/b + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/< /*p:kotlin(Int)*/b + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b + + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt new file mode 100644 index 00000000000..51618a870d2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt @@ -0,0 +1,35 @@ +package foo.bar + +/*p:foo.bar*/class A { + operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:foo.bar(A)*/this + operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?) {} + operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this + + operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:kotlin(Int)*/1 + operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/false + operator fun invoke() {} + + operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:kotlin(Int)*/0 + + operator fun component1() = /*p:foo.bar(A)*/this + + operator fun iterator() = /*p:foo.bar(A)*/this + operator fun next() = /*p:foo.bar(A)*/this +} + +/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:foo.bar(A)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this + +/*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {} + +/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/true +/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} + +/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:kotlin(Int)*/0 + +/*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this + +/*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!! +/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt new file mode 100644 index 00000000000..47c1a4a9f94 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt @@ -0,0 +1,30 @@ +package foo.bar + +/*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty + +/*p:foo.bar*/class D1 { + operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 +} + +/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} + +/*p:foo.bar(D2)*/open class D2 { + operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} +} + +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:foo.bar(D2)*/this + +/*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { + operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:foo.bar(D3)*/this +} + + +/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.js(provideDelegate) c:foo.bar.D1(getValue)*/D1() +/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.js(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue)*/D1() + +/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) p:foo.bar(getValue)*/D2() +/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() + +/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue)*/D3() +/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt new file mode 100644 index 00000000000..ac8000e4b87 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt @@ -0,0 +1,24 @@ +package foo.bar + +/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) { + var d = /*p:foo.bar(A)*/a + + /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++ + /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d + /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- + /*c:foo.bar.A(dec) p:foo.bar(dec) p:foo.bar(A)*/--/*p:foo.bar(A)*/d + + /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b + /*c:foo.bar.A(not) p:foo.bar(not)*/!/*p:foo.bar(A)*/a + + // for val + /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b + + // for var + /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.js(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.js(minusAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) p:kotlin.comparisons(times) p:kotlin.js(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) p:kotlin.comparisons(div) p:kotlin.js(div)*//= /*p:kotlin(Int)*/b +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt new file mode 100644 index 00000000000..39217d0700e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt @@ -0,0 +1,16 @@ +package foo.bar + +/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any, na: /*p:foo.bar*/A?) { + /*p:foo.bar(A) c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*p:foo.bar(A) c:foo.bar.A(get) p:kotlin(Int)*/a[2] + + /*p:kotlin(Int) p:kotlin(Boolean)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a + /*p:kotlin(String) p:kotlin(Boolean)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a + + /*c:foo.bar.A(invoke)*/a() + /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) + + val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a; + + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/build.log new file mode 100644 index 00000000000..74d3d30ab54 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/build.log @@ -0,0 +1,7 @@ +==== INITIAL BUILD ==== +Compiling files: + src/genericType.kt + src/inferredType.kt + src/lambdaParameterType.kt + src/localInnerClassType.kt +Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt new file mode 100644 index 00000000000..7eb6d235268 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt @@ -0,0 +1,15 @@ +package foo + +// From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25 + +/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Nothing) p:kotlin(Function1)*/null as (T) -> T + +/*p:foo*/fun compute(f: () -> T) { + val result = f() +} + +/*p:foo*/class Bar(val t: T) { + init { + val a = /*c:foo.Bar c:foo.Bar(T)*/t + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt new file mode 100644 index 00000000000..c462d71231f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt @@ -0,0 +1,19 @@ +package foo + +/*p:foo(A)*/open class A +/*p:foo*/class B : /*p:foo*/A() + +/*p:foo*/fun getA() = /*p:foo*/A() +/*p:foo*/fun getB() = /*p:foo*/B() + +/*p:foo*/fun getListOfA() = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) + +/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/List) {} +/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/List) {} + +/*p:foo*/fun testInferredType() { + /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(A)*/getListOfA()) + /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) + /*p:foo*/useListOfB(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt new file mode 100644 index 00000000000..f532b716c6d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt @@ -0,0 +1,11 @@ +package foo + +/*p:foo*/class C + +/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Unit) {} +/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Unit) {} + +/*p:foo*/fun testLambdaParameterType() { + /*p:foo*/lambdaConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/it } + /*p:foo*/extensionConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/this } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt new file mode 100644 index 00000000000..c9e10d74f07 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/localInnerClassType.kt @@ -0,0 +1,9 @@ +package foo + +/*p:foo*/fun bar() { + class A { + inner class B + } + + val b = A().B() +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt new file mode 100644 index 00000000000..ddac0faf273 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/bar.kt @@ -0,0 +1 @@ +package bar diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log new file mode 100644 index 00000000000..dc6965bc972 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/build.log @@ -0,0 +1,5 @@ +==== INITIAL BUILD ==== +Compiling files: + src/bar.kt(no lookups) + src/locals.kt +Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt new file mode 100644 index 00000000000..8acbdc11b74 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt @@ -0,0 +1,49 @@ +package local.declarations + +import bar.* + +/*p:local.declarations*/fun f(p: /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) /*p:kotlin(Int)*/{ + /*p:kotlin(Any) p:kotlin(String)*/p./*c:kotlin.Any*/toString() + + val a = /*p:kotlin(Int)*/1 + val b = /*p:kotlin(Int)*/a + fun localFun() = /*p:kotlin(Int)*/b + fun /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() + + abstract class LocalI { + abstract var a: /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int + abstract fun foo() + } + + class LocalC : LocalI() { + override var a = /*p:kotlin(Int)*/1 + + override fun foo() {} + + var b = /*p:kotlin(String)*/"bbb" + + fun bar() = /*p:kotlin(Int)*/b + } + + val o = object { + val a = /*p:kotlin(String)*/"aaa" + fun foo(): LocalI = /*p:kotlin(Nothing)*/null as LocalI + } + + /*p:kotlin(Int)*/localFun() + /*p:kotlin(Int)*/1./*c:kotlin.Int c:kotlin.Number*/localExtFun() + + val c = LocalC() + /*p:kotlin(Int)*/c.a + /*p:kotlin(String)*/c.b + c.foo() + /*p:kotlin(Int)*/c.bar() + + val i: LocalI = c + /*p:kotlin(Int)*/i.a + i.foo() + + /*p:kotlin(String)*/o.a + val ii = o.foo() + /*p:kotlin(Int)*/ii.a +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt new file mode 100644 index 00000000000..d69fc70de05 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/bar.kt @@ -0,0 +1,7 @@ +package bar + +/*p:bar*/class A + +/*p:bar*/class B + +/*p:bar*/object O diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt new file mode 100644 index 00000000000..b6af61fb0db --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/baz.kt @@ -0,0 +1,7 @@ +package baz + +/*p:baz*/class A + +/*p:baz*/class B + +/*p:baz*/class C diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log new file mode 100644 index 00000000000..6c6710fba2c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/build.log @@ -0,0 +1,13 @@ +==== INITIAL BUILD ==== +Compiling files: + src/bar.kt + src/baz.kt + src/foo1.kt + src/foo2.kt +Exit code: OK + +==== STEP 1 ==== +Compiling files: + src/foo1.kt + src/foo2.kt +Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt new file mode 100644 index 00000000000..edf2129aab9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt @@ -0,0 +1,17 @@ +package foo + +import bar.* +/*p:baz(C)*/import baz.C + +/*p:foo*/val a = /*p:bar p:foo*/A() +/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/baz./*p:baz*/B = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar p:baz(B)*/baz./*p:baz*/B() + +/*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ + /*p:foo p:bar(A)*/a + /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B() +} + +/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ + /*c:foo.MyClass p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:baz(B)*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/MyClass() +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt new file mode 100644 index 00000000000..cf303aa5f0d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt @@ -0,0 +1,7 @@ +package foo + +/*p:foo*/interface MyInterface + +/*p:foo*/class MyClass : /*p:foo*/MyInterface + +/*p:foo*/enum class MyEnum diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo2.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/build.log b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/build.log new file mode 100644 index 00000000000..5aaa84efb3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/build.log @@ -0,0 +1,4 @@ +==== INITIAL BUILD ==== +Compiling files: + src/main.kt +Exit code: OK \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt new file mode 100644 index 00000000000..93fa07432e1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt @@ -0,0 +1,6 @@ +package foo.bar + +/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array) { + val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array + val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String +} From 24a2194a778038dcf7a0bac6e6b6bfb556b970a9 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Fri, 10 Apr 2020 17:16:33 +0300 Subject: [PATCH 1491/1557] JPS: provide SourcesPreprocessor extension point Original commit: fd9bec81cfcefb1de367a91047ffad913353db96 --- .../jps/targets/KotlinJvmModuleBuildTarget.kt | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt index 3f66e44ab4c..f8faf7a0149 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt @@ -17,6 +17,7 @@ import org.jetbrains.jps.builders.storage.BuildDataPaths import org.jetbrains.jps.incremental.* import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.module.JpsSdkDependency +import org.jetbrains.jps.service.JpsServiceManager import org.jetbrains.kotlin.build.GeneratedFile import org.jetbrains.kotlin.build.GeneratedJvmClass import org.jetbrains.kotlin.build.JvmBuildMetaInfo @@ -186,13 +187,16 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB } val kotlinModuleId = target.targetId + val allFiles = sources.allFiles + val commonSourceFiles = sources.crossCompiledFiles + builder.addModule( kotlinModuleId.name, outputDir.absolutePath, - sources.allFiles, + preprocessSources(allFiles), target.findSourceRoots(dirtyFilesHolder.context), target.findClassPathRoots(), - sources.crossCompiledFiles, + preprocessSources(commonSourceFiles), target.findModularJdkRoot(), kotlinModuleId.type, isTests, @@ -209,6 +213,28 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB return scriptFile } + /** + * Internal API for source level code preprocessors. + * + * Currently used in https://plugins.jetbrains.com/plugin/13355-spot-profiler-for-java + */ + interface SourcesPreprocessor { + /** + * Preprocess some sources and return path to the resulting file. + * This function should be pure and should return the same output for given input + * (required for incremental compilation). + */ + fun preprocessSources(srcFiles: List): List + } + + fun preprocessSources(srcFiles: List): List { + var result = srcFiles + JpsServiceManager.getInstance().getExtensions(SourcesPreprocessor::class.java).forEach { + result = it.preprocessSources(result) + } + return result + } + private fun createTempFileForChunkModuleDesc(): File { val readableSuffix = buildString { append(StringUtil.sanitizeJavaIdentifier(chunk.representativeTarget.module.name)) From 382884f27354d557af94ed77023daaa230154018 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Tue, 31 Mar 2020 12:00:59 +0700 Subject: [PATCH 1492/1557] HMPP: Parameterize NativePlatform with KonanTarget Original commit: 8d2e9997766031390bc8dac4fcda2992098d3ffe --- .../jetbrains/kotlin/platform/compat/compatConversions.kt | 2 +- .../kotlin/platform/impl/NativeIdePlatformKind.kt | 7 ++++--- .../kotlin/jps/build/dependeciestxt/ModulesTxt.kt | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt index 28ee4c441cd..2b8d7d2ea87 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/compat/compatConversions.kt @@ -51,7 +51,7 @@ fun IdePlatform<*, *>.toNewPlatform(): NewPlatform = when (this) { is CommonIdePlatformKind.Platform -> CommonPlatforms.defaultCommonPlatform is JvmIdePlatformKind.Platform -> JvmPlatforms.jvmPlatformByTargetVersion(this.version) is JsIdePlatformKind.Platform -> JsPlatforms.defaultJsPlatform - is NativeIdePlatformKind.Platform -> NativePlatforms.defaultNativePlatform + is NativeIdePlatformKind.Platform -> NativePlatforms.unspecifiedNativePlatform else -> error("Unknown platform $this") } diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt index f5ef2c579ae..d6ab4adfa55 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/NativeIdePlatformKind.kt @@ -14,13 +14,14 @@ import org.jetbrains.kotlin.platform.IdePlatformKind import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatformVersion import org.jetbrains.kotlin.platform.konan.NativePlatforms +import org.jetbrains.kotlin.platform.konan.isNative object NativeIdePlatformKind : IdePlatformKind() { - override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform == NativePlatforms.defaultNativePlatform + override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform.isNative() override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? { return if (arguments is FakeK2NativeCompilerArguments) - NativePlatforms.defaultNativePlatform + NativePlatforms.unspecifiedNativePlatform else null } @@ -30,7 +31,7 @@ object NativeIdePlatformKind : IdePlatformKind() { } override val defaultPlatform: TargetPlatform - get() = NativePlatforms.defaultNativePlatform + get() = NativePlatforms.unspecifiedNativePlatform @Deprecated( message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform", diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt index 7f51474fb7c..eeedd28f334 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/ModulesTxt.kt @@ -264,7 +264,7 @@ class ModulesTxtBuilder { "js" -> settings.compilerArguments = K2JSCompilerArguments().also { settings.targetPlatform = JsPlatforms.defaultJsPlatform } "native" -> settings.compilerArguments = - FakeK2NativeCompilerArguments().also { settings.targetPlatform = NativePlatforms.defaultNativePlatform } + FakeK2NativeCompilerArguments().also { settings.targetPlatform = NativePlatforms.unspecifiedNativePlatform } else -> { val flagProperty = ModulesTxt.Module.flags[flag] if (flagProperty != null) flagProperty.set(module, true) From c2291ab234f2c0c1b62f750bb1845f2f6b9e98ed Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Thu, 2 Apr 2020 14:13:55 +0700 Subject: [PATCH 1493/1557] JVM, JS: Use faster checks in IdePlatformKind.supportsTargetPlatform() Original commit: 76b0e7994bcb0228903238adfe889e7848efe9e7 --- .../org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt | 3 ++- .../org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt index 1e73d24561c..6b145c67ceb 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JsIdePlatformKind.kt @@ -15,9 +15,10 @@ import org.jetbrains.kotlin.platform.IdePlatformKind import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.TargetPlatformVersion import org.jetbrains.kotlin.platform.js.JsPlatforms +import org.jetbrains.kotlin.platform.js.isJs object JsIdePlatformKind : IdePlatformKind() { - override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platforms.contains(platform) + override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform.isJs() override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? { return if (arguments is K2JSCompilerArguments) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt index a0ab9b1af92..125b8313cab 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt @@ -16,9 +16,10 @@ import org.jetbrains.kotlin.platform.IdePlatform import org.jetbrains.kotlin.platform.IdePlatformKind import org.jetbrains.kotlin.platform.TargetPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatforms +import org.jetbrains.kotlin.platform.jvm.isJvm object JvmIdePlatformKind : IdePlatformKind() { - override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platforms.contains(platform) + override fun supportsTargetPlatform(platform: TargetPlatform): Boolean = platform.isJvm() override fun platformByCompilerArguments(arguments: CommonCompilerArguments): TargetPlatform? { if (arguments !is K2JVMCompilerArguments) return null From 11523fc8c4d23dde7372d08779a388c7af567d5c Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 6 Apr 2020 22:13:47 +0700 Subject: [PATCH 1494/1557] HMPP: Fix serialization of TargetPlatform in Kotlin facet Original commit: fee6a752e082a849e724ac9cc414306d159e92f6 --- .../kotlin/config/facetSerialization.kt | 55 ++++++++++++++----- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index 5d751b901eb..8489487d4b6 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -21,6 +21,9 @@ import org.jetbrains.kotlin.platform.js.JsPlatform import org.jetbrains.kotlin.platform.jvm.JdkPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatform import org.jetbrains.kotlin.platform.konan.NativePlatform +import org.jetbrains.kotlin.platform.konan.NativePlatformUnspecifiedTarget +import org.jetbrains.kotlin.platform.konan.NativePlatforms +import org.jetbrains.kotlin.platform.konan.legacySerializeToString import java.lang.reflect.Modifier import kotlin.reflect.KClass import kotlin.reflect.full.superclasses @@ -104,19 +107,40 @@ private fun readV1Config(element: Element): KotlinFacetSettings { } } +// TODO: Introduce new version of facet serialization. See https://youtrack.jetbrains.com/issue/KT-38235 +// This is necessary to avoid having too much custom logic for platform serialization. fun Element.getFacetPlatformByConfigurationElement(): TargetPlatform { val platformNames = getAttributeValue("allPlatforms")?.split('/')?.toSet() - if (platformNames != null) { - return TargetPlatform(CommonPlatforms.allSimplePlatforms - .flatMap { it.componentPlatforms } - .filter { platformNames.contains(it.serializeToString()) } - .toSet()) + if (platformNames != null && platformNames.isNotEmpty()) { + val knownSimplePlatforms = HashMap() // serialization presentation to simple platform + + // first, collect serialization presentations for every known simple platform + CommonPlatforms.allSimplePlatforms + .flatMap { it.componentPlatforms } + .forEach { knownSimplePlatforms[it.serializeToString()] = it } + + // next, add legacy aliases for some of the simple platforms; ex: unspecifiedNativePlatform + NativePlatformUnspecifiedTarget.let { knownSimplePlatforms[it.legacySerializeToString()] = it } + + val simplePlatforms = platformNames.mapNotNull(knownSimplePlatforms::get) + if (simplePlatforms.isNotEmpty()) return TargetPlatform(simplePlatforms.toSet()) + + // empty set of simple platforms is not allowed, in such case fallback to legacy algorithm } - // failed to read list of all platforms. Fallback to legacy algorythm - val platformName = getAttributeValue("platform") - // this code could be simplified using union after fixing the equals method in SimplePlatform - val allPlatforms = ArrayList(CommonPlatforms.allSimplePlatforms).also { it.add(CommonPlatforms.defaultCommonPlatform) } - return allPlatforms.firstOrNull { it.oldFashionedDescription == platformName }.orDefault() + + // failed to read list of all platforms. Fallback to legacy algorithm + val platformName = getAttributeValue("platform") as String + + return CommonPlatforms.allSimplePlatforms.firstOrNull { + // first, look for exact match through all simple platforms + it.oldFashionedDescription == platformName + } ?: CommonPlatforms.defaultCommonPlatform.takeIf { + // then, check exact match for the default common platform + it.oldFashionedDescription == platformName + } ?: NativePlatforms.unspecifiedNativePlatform.takeIf { + // if none of the above succeeded, check if it's an old-style record about native platform (without suffix with target name) + it.oldFashionedDescription.startsWith(platformName) + }.orDefault() // finally, fallback to the default platform } private fun readV2AndLaterConfig(element: Element): KotlinFacetSettings { @@ -298,9 +322,14 @@ private fun buildChildElement(element: Element, tag: String, bean: Any, filter: private fun KotlinFacetSettings.writeLatestConfig(element: Element) { val filter = SkipDefaultsSerializationFilter() - targetPlatform?.let { - element.setAttribute("platform", it.oldFashionedDescription) - element.setAttribute("allPlatforms", it.componentPlatforms.map { it.serializeToString() }.sorted().joinToString(separator = "/")) + // TODO: Introduce new version of facet serialization. See https://youtrack.jetbrains.com/issue/KT-38235 + // This is necessary to avoid having too much custom logic for platform serialization. + targetPlatform?.let { targetPlatform -> + element.setAttribute("platform", targetPlatform.oldFashionedDescription) + element.setAttribute( + "allPlatforms", + targetPlatform.componentPlatforms.map { it.serializeToString() }.sorted().joinToString(separator = "/") + ) } if (!useProjectSettings) { element.setAttribute("useProjectSettings", useProjectSettings.toString()) From 2af9acb32aadbd7f001c57919bbe8639d2271ba3 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 17 Apr 2020 12:56:27 +0300 Subject: [PATCH 1495/1557] Minor: move non-JPS MPP IC tests under incremental/mpp dir Original commit: 876d6d209fca8784bbe143db998c10383a112af5 --- .../{singleModule/common => mpp/allPlatforms}/README.md | 0 .../{singleModule/common => mpp/allPlatforms}/touchActual/X.kt | 0 .../common => mpp/allPlatforms}/touchActual/X.kt.touch.1 | 0 .../{singleModule/common => mpp/allPlatforms}/touchActual/Y.kt | 0 .../{singleModule/common => mpp/allPlatforms}/touchActual/Z.kt | 0 .../common => mpp/allPlatforms}/touchActual/build.log | 0 .../common => mpp/allPlatforms}/touchActual/commonX.kt | 0 .../common => mpp/allPlatforms}/touchActual/commonY.kt | 0 .../common => mpp/allPlatforms}/touchActual/commonZ.kt | 0 .../common => mpp/allPlatforms}/touchActual/dummy.kt | 0 .../{singleModule/common => mpp/allPlatforms}/touchActual/useX.kt | 0 .../common => mpp/allPlatforms}/touchActual/useYZ.kt | 0 .../common => mpp/allPlatforms}/touchActual/useYZ.kt.touch.2 | 0 .../{singleModule/common => mpp/allPlatforms}/touchExpect/X.kt | 0 .../{singleModule/common => mpp/allPlatforms}/touchExpect/Y.kt | 0 .../{singleModule/common => mpp/allPlatforms}/touchExpect/Z.kt | 0 .../common => mpp/allPlatforms}/touchExpect/build.log | 0 .../common => mpp/allPlatforms}/touchExpect/commonX.kt | 0 .../common => mpp/allPlatforms}/touchExpect/commonX.kt.touch.1 | 0 .../common => mpp/allPlatforms}/touchExpect/commonY.kt | 0 .../common => mpp/allPlatforms}/touchExpect/commonY.kt.touch.2 | 0 .../common => mpp/allPlatforms}/touchExpect/commonZ.kt | 0 .../common => mpp/allPlatforms}/touchExpect/dummy.kt | 0 .../{singleModule/common => mpp/allPlatforms}/touchExpect/useX.kt | 0 .../common => mpp/allPlatforms}/touchExpect/useXIncompatible.kt | 0 .../common => mpp/allPlatforms}/touchExpect/useYZ.kt | 0 26 files changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/README.md (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/X.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/X.kt.touch.1 (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/Y.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/Z.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/build.log (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/commonX.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/commonY.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/commonZ.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/dummy.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/useX.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/useYZ.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchActual/useYZ.kt.touch.2 (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/X.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/Y.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/Z.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/build.log (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/commonX.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/commonX.kt.touch.1 (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/commonY.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/commonY.kt.touch.2 (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/commonZ.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/dummy.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/useX.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/useXIncompatible.kt (100%) rename jps/jps-plugin/testData/incremental/{singleModule/common => mpp/allPlatforms}/touchExpect/useYZ.kt (100%) diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/README.md b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/README.md similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/README.md rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/README.md diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt.touch.1 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/X.kt.touch.1 rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/X.kt.touch.1 diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/Y.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/Y.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Y.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/Z.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/Z.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/Z.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/build.log b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/build.log rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/build.log diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonX.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonX.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonY.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonY.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonY.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/commonZ.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/commonZ.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/dummy.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/dummy.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useX.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useX.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchActual/useYZ.kt.touch.2 rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchActual/useYZ.kt.touch.2 diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/X.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/X.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/X.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/Y.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/Y.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Y.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/Z.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/Z.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/Z.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/build.log b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/build.log rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/build.log diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1 similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonX.kt.touch.1 rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonX.kt.touch.1 diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2 b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2 similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonY.kt.touch.2 rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonY.kt.touch.2 diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/commonZ.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/commonZ.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/dummy.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/dummy.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useX.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useX.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useX.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useXIncompatible.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useXIncompatible.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useXIncompatible.kt diff --git a/jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useYZ.kt b/jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt similarity index 100% rename from jps/jps-plugin/testData/incremental/singleModule/common/touchExpect/useYZ.kt rename to jps/jps-plugin/testData/incremental/mpp/allPlatforms/touchExpect/useYZ.kt From c3abb27b31c022f339be90410e238b415737c666 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 17 Apr 2020 12:37:11 +0300 Subject: [PATCH 1496/1557] Add test for KT-35957 Original commit: 2442abadc379fd7fb7826ae957e3d7db4fa67db7 --- .../mpp/jvmOnly/multifilePartChanged/X.kt | 4 ++++ .../mpp/jvmOnly/multifilePartChanged/build.log | 14 ++++++++++++++ .../mpp/jvmOnly/multifilePartChanged/commonX.kt | 5 +++++ .../mpp/jvmOnly/multifilePartChanged/dummy.kt | 1 + .../jvmOnly/multifilePartChanged/utilsActual.kt | 4 ++++ .../multifilePartChanged/utilsActual.kt.new | 6 ++++++ .../jvmOnly/multifilePartChanged/utilsNoActual.kt | 4 ++++ 7 files changed, 38 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new create mode 100644 jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt new file mode 100644 index 00000000000..e47e8dbdb7d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/X.kt @@ -0,0 +1,4 @@ +actual class X { + actual fun foo(): Any = 0 + fun bar(): Any = 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log new file mode 100644 index 00000000000..5cec33fd7c5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log @@ -0,0 +1,14 @@ +================ Step #1 ================= + +Compiling files: + src/X.kt + src/commonX.kt + src/utilsActual.kt + src/utilsNoActual.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Class 'X' has several compatible actual declarations in modules , +Function 'foo' has several compatible actual declarations in modules , +Function 'useX' has several compatible actual declarations in modules , \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt new file mode 100644 index 00000000000..14468f025b7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/commonX.kt @@ -0,0 +1,5 @@ +expect class X { + fun foo(): Any +} + +expect fun useX(x: X): Any \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt new file mode 100644 index 00000000000..3f0c1c77242 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/dummy.kt @@ -0,0 +1 @@ +fun dummy() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt new file mode 100644 index 00000000000..fa048f3f576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt @@ -0,0 +1,4 @@ +@file:JvmMultifileClass +@file:JvmName("Utils") + +actual fun useX(x: X): Any = x.foo() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new new file mode 100644 index 00000000000..eda951b5556 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsActual.kt.new @@ -0,0 +1,6 @@ +@file:JvmMultifileClass +@file:JvmName("Utils") + +actual fun useX(x: X): Any = x.foo() + +fun newFun() = 1 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt new file mode 100644 index 00000000000..c58549d42e4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/utilsNoActual.kt @@ -0,0 +1,4 @@ +@file:JvmMultifileClass +@file:JvmName("Utils") + +fun useXBar(x: X) = x.bar() \ No newline at end of file From 334ae8b2b70683069f1416c4a02b9601db583a0e Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 17 Apr 2020 12:54:19 +0300 Subject: [PATCH 1497/1557] Remove dirty output files when expanding IC scope early Previously IC could go to the next iteration without removing outputs for the files compiled during the last iteration. For example, it could happen, when a multifile part is changed (we add sources for other parts and recompile everything together). In case of MPP it could lead to compile error, because the compiler would see the same actual declarations from dirty sources and dirty outputs from previous iteration (which should have been removed). That behaviour did not raise an error before a5c976d0f751830704daa8b7386fcc288139c35c because actual declarations from binaries (e.g. compile classpath) were ignored. #KT-35957 Fixed Original commit: 4ccec5218ffc54d4e418cdcb6c27f307077b7dcf --- .../incremental/mpp/jvmOnly/multifilePartChanged/build.log | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log index 5cec33fd7c5..48a7a882c76 100644 --- a/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log +++ b/jps/jps-plugin/testData/incremental/mpp/jvmOnly/multifilePartChanged/build.log @@ -6,9 +6,4 @@ Compiling files: src/utilsActual.kt src/utilsNoActual.kt End of files -Exit code: ABORT ------------------------------------------- -COMPILATION FAILED -Class 'X' has several compatible actual declarations in modules , -Function 'foo' has several compatible actual declarations in modules , -Function 'useX' has several compatible actual declarations in modules , \ No newline at end of file +Exit code: OK \ No newline at end of file From 6f7fffbffc45e770a9918bdf6815ed09ead3845a Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 17 Apr 2020 13:06:19 +0300 Subject: [PATCH 1498/1557] JPS: remove outputs for additional dirty files for current iteration JPS does not remove output files for files marked as dirty for current iteration. This is a problem for adding complementary files during JPS MPP IC. If output files are not removed, the compiler might raise an error for duplicated actual declarations. Original commit: 06275a201cfaff69440671a19c60d0fb178cd5f7 --- .../kotlin/jps/build/FSOperationsHelper.kt | 19 ++++++++++++++++++- .../multiplatform/custom/buildError/build.log | 3 +++ .../custom/buildError2Levels/build.log | 3 +++ .../custom/complementaryFiles/build.log | 4 ++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt index 51ff82208df..d38aebdc087 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/FSOperationsHelper.kt @@ -21,8 +21,11 @@ import com.intellij.util.containers.ContainerUtil import org.jetbrains.jps.ModuleChunk import org.jetbrains.jps.builders.BuildRootDescriptor import org.jetbrains.jps.builders.BuildTarget +import org.jetbrains.jps.builders.FileProcessor +import org.jetbrains.jps.builders.impl.DirtyFilesHolderBase import org.jetbrains.jps.builders.java.JavaSourceRootDescriptor import org.jetbrains.jps.builders.java.dependencyView.Mappings +import org.jetbrains.jps.incremental.BuildOperations import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.incremental.FSOperations import org.jetbrains.jps.incremental.ModuleBuildTarget @@ -76,19 +79,33 @@ class FSOperationsHelper( /** * Marks given [files] as dirty for current round and given [target] of [chunk]. */ - fun markFilesForCurrentRound(target: ModuleBuildTarget, files: Iterable) { + fun markFilesForCurrentRound(target: ModuleBuildTarget, files: Collection) { require(target in chunk.targets) val targetDirtyFiles = dirtyFilesHolder.byTarget.getValue(target) + val dirtyFileToRoot = HashMap() files.forEach { file -> val root = compileContext.projectDescriptor.buildRootIndex .findAllParentDescriptors(file, compileContext) .single { sourceRoot -> sourceRoot.target == target } targetDirtyFiles._markDirty(file, root as JavaSourceRootDescriptor) + dirtyFileToRoot[file] = root } markFilesImpl(files, currentRound = true) { it.exists() } + cleanOutputsForNewDirtyFilesInCurrentRound(target, dirtyFileToRoot) + } + + private fun cleanOutputsForNewDirtyFilesInCurrentRound(target: ModuleBuildTarget, dirtyFiles: Map) { + val dirtyFilesHolder = object : DirtyFilesHolderBase(compileContext) { + override fun processDirtyFiles(processor: FileProcessor) { + dirtyFiles.forEach { (file, root) -> processor.apply(target, file, root) } + } + + override fun hasDirtyFiles(): Boolean = dirtyFiles.isNotEmpty() + } + BuildOperations.cleanOutputsCorrespondingToChangedFiles(compileContext, dirtyFilesHolder) } fun markFiles(files: Iterable) { diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log index 186234f80fb..104fae8b14b 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError/build.log @@ -31,6 +31,9 @@ Building pJvm Cleaning output files: out/production/pJvm/META-INF/pJvm.kotlin_module End of files +Cleaning output files: + out/production/pJvm/FJvmKt.class +End of files Compiling files: c/src/f.kt pJvm/src/fJvm.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log index 2f051fcd555..75f18a0efbb 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels/build.log @@ -35,6 +35,9 @@ Building pJvm Cleaning output files: out/production/pJvm/META-INF/pJvm.kotlin_module End of files +Cleaning output files: + out/production/pJvm/FgKt.class +End of files Compiling files: c/src/f.kt c/src/g.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log index 55fe16560c0..d50092a5710 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log @@ -6,6 +6,10 @@ Cleaning output files: out/production/pJvm/FJvmKt.class out/production/pJvm/META-INF/pJvm.kotlin_module End of files +Cleaning output files: + out/production/pJvm/FKt.class + out/production/pJvm/SharedImmutable.class +End of files Compiling files: c/src/f.kt pJvm/src/fJvm.kt From 403f7a9bb5fda997d4c82aae9abc3054e64002a8 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Wed, 29 Apr 2020 14:01:58 +0700 Subject: [PATCH 1499/1557] HMPP: Backward-compatible Kotlin facet serialization ^KT-38634 Original commit: 9d27ba5b5951f7281790a069823e3f6518b23027 --- .../kotlin/config/facetSerialization.kt | 75 ++++++++++++------- 1 file changed, 50 insertions(+), 25 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index 8489487d4b6..22624066174 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -20,10 +20,7 @@ import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind import org.jetbrains.kotlin.platform.js.JsPlatform import org.jetbrains.kotlin.platform.jvm.JdkPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatform -import org.jetbrains.kotlin.platform.konan.NativePlatform -import org.jetbrains.kotlin.platform.konan.NativePlatformUnspecifiedTarget -import org.jetbrains.kotlin.platform.konan.NativePlatforms -import org.jetbrains.kotlin.platform.konan.legacySerializeToString +import org.jetbrains.kotlin.platform.konan.* import java.lang.reflect.Modifier import kotlin.reflect.KClass import kotlin.reflect.full.superclasses @@ -110,23 +107,8 @@ private fun readV1Config(element: Element): KotlinFacetSettings { // TODO: Introduce new version of facet serialization. See https://youtrack.jetbrains.com/issue/KT-38235 // This is necessary to avoid having too much custom logic for platform serialization. fun Element.getFacetPlatformByConfigurationElement(): TargetPlatform { - val platformNames = getAttributeValue("allPlatforms")?.split('/')?.toSet() - if (platformNames != null && platformNames.isNotEmpty()) { - val knownSimplePlatforms = HashMap() // serialization presentation to simple platform - - // first, collect serialization presentations for every known simple platform - CommonPlatforms.allSimplePlatforms - .flatMap { it.componentPlatforms } - .forEach { knownSimplePlatforms[it.serializeToString()] = it } - - // next, add legacy aliases for some of the simple platforms; ex: unspecifiedNativePlatform - NativePlatformUnspecifiedTarget.let { knownSimplePlatforms[it.legacySerializeToString()] = it } - - val simplePlatforms = platformNames.mapNotNull(knownSimplePlatforms::get) - if (simplePlatforms.isNotEmpty()) return TargetPlatform(simplePlatforms.toSet()) - - // empty set of simple platforms is not allowed, in such case fallback to legacy algorithm - } + val targetPlatform = getAttributeValue("allPlatforms").deserializeTargetPlatformByComponentPlatforms() + if (targetPlatform != null) return targetPlatform // failed to read list of all platforms. Fallback to legacy algorithm val platformName = getAttributeValue("platform") as String @@ -326,10 +308,7 @@ private fun KotlinFacetSettings.writeLatestConfig(element: Element) { // This is necessary to avoid having too much custom logic for platform serialization. targetPlatform?.let { targetPlatform -> element.setAttribute("platform", targetPlatform.oldFashionedDescription) - element.setAttribute( - "allPlatforms", - targetPlatform.componentPlatforms.map { it.serializeToString() }.sorted().joinToString(separator = "/") - ) + element.setAttribute("allPlatforms", targetPlatform.serializeComponentPlatforms()) } if (!useProjectSettings) { element.setAttribute("useProjectSettings", useProjectSettings.toString()) @@ -459,3 +438,49 @@ fun KotlinFacetSettings.serializeFacetSettings(element: Element) { writeLatestConfig(element) } } + +private fun TargetPlatform.serializeComponentPlatforms(): String { + val componentPlatforms = componentPlatforms + val componentPlatformNames = componentPlatforms.mapTo(ArrayList()) { it.serializeToString() } + + // workaround for old Kotlin IDE plugins, KT-38634 + if (componentPlatforms.any { it is NativePlatform }) + componentPlatformNames.add(NativePlatformUnspecifiedTarget.legacySerializeToString()) + + return componentPlatformNames.sorted().joinToString("/") +} + +private fun String?.deserializeTargetPlatformByComponentPlatforms(): TargetPlatform? { + val componentPlatformNames = this?.split('/')?.toSet() + if (componentPlatformNames == null || componentPlatformNames.isEmpty()) + return null + + val knownComponentPlatforms = HashMap() // "serialization presentation" to "simple platform name" + + // first, collect serialization presentations for every known simple platform + CommonPlatforms.allSimplePlatforms + .flatMap { it.componentPlatforms } + .forEach { knownComponentPlatforms[it.serializeToString()] = it } + + // next, add legacy aliases for some of the simple platforms; ex: unspecifiedNativePlatform + NativePlatformUnspecifiedTarget.let { knownComponentPlatforms[it.legacySerializeToString()] = it } + + val componentPlatforms = componentPlatformNames.mapNotNull(knownComponentPlatforms::get).toSet() + return when (componentPlatforms.size) { + 0 -> { + // empty set of component platforms is not allowed, in such case fallback to legacy algorithm + null + } + 1 -> TargetPlatform(componentPlatforms) + else -> { + // workaround for old Kotlin IDE plugins, KT-38634 + if (componentPlatforms.any { it is NativePlatformUnspecifiedTarget } + && componentPlatforms.any { it is NativePlatformWithTarget } + ) { + TargetPlatform(componentPlatforms - NativePlatformUnspecifiedTarget) + } else { + TargetPlatform(componentPlatforms) + } + } + } +} From 76674906e5739d1bf492ee2fb08e5aed5556ac5d Mon Sep 17 00:00:00 2001 From: Mikhail Zarechenskiy Date: Mon, 4 May 2020 14:39:45 +0300 Subject: [PATCH 1500/1557] Revert "Add option to enable new inference only for IDE analysis" This reverts commit 36580d46daae39e32bdc8ba99f726fb4057c190c. #KT-37378 Fixed Original commit: c01a171d4cdb8e2cdcdcf62cb99777d8d39aa54b --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 35 ------------------- .../kotlinProject.iml | 12 ------- .../kotlinProject.ipr | 17 --------- .../src/test1.kt | 5 --- .../errors.txt | 1 - .../kotlinProject.iml | 12 ------- .../kotlinProject.ipr | 14 -------- .../src/test1.kt | 5 --- 8 files changed, 101 deletions(-) delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.iml delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.ipr delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/src/test1.kt delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/errors.txt delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.iml delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.ipr delete mode 100644 jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/src/test1.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 2cd0d298d76..5262f188e42 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -58,7 +58,6 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.KotlinCompilerVersion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY -import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.withIC import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTestBase.LibraryDependency.* @@ -626,40 +625,6 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { result.assertSuccessful() } - /* - * Here we're checking that enabling inference in IDE doesn't affect compilation via JPS - * - * the following two tests are connected: - * - testKotlinProjectWithEnabledNewInferenceInIDE checks that project is compiled when new inference is enabled only in IDE - * - this is done via project component - * - testKotlinProjectWithErrorsBecauseOfNewInference checks that project isn't compiled when new inference is enabled in the compiler - * - * So, if the former will fail => option affects JPS compilation, it's bad. Also, if the latter test fails => test is useless as it's - * compiled with new and old inference. - * - */ - fun testKotlinProjectWithEnabledNewInferenceInIDE() { - initProject(JVM_MOCK_RUNTIME) - val module = myProject.modules.single() - val args = module.kotlinCompilerArguments - args.languageVersion = LanguageVersion.KOTLIN_1_3.versionString - myProject.kotlinCommonCompilerArguments = args - - buildAllModules().assertSuccessful() - } - - fun testKotlinProjectWithErrorsBecauseOfNewInference() { - initProject(JVM_MOCK_RUNTIME) - val module = myProject.modules.single() - val args = module.kotlinCompilerArguments - args.newInference = true - myProject.kotlinCommonCompilerArguments = args - - val result = buildAllModules() - result.assertFailed() - result.checkErrors() - } - private fun createKotlinJavaScriptLibraryArchive() { val jarFile = File(workDir, KOTLIN_JS_LIBRARY_JAR) try { diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.iml deleted file mode 100644 index a0cbe548242..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.ipr deleted file mode 100644 index f04957c330e..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/kotlinProject.ipr +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/src/test1.kt b/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/src/test1.kt deleted file mode 100644 index 5f41546490a..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithEnabledNewInferenceInIDE/src/test1.kt +++ /dev/null @@ -1,5 +0,0 @@ -fun foo() { - ByteArray(42) { - when (Any()) {} - } -} \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/errors.txt b/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/errors.txt deleted file mode 100644 index df2e59d5fe9..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/errors.txt +++ /dev/null @@ -1 +0,0 @@ -Type mismatch: inferred type is Unit but Byte was expected at line 3, column 9 diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.iml b/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.iml deleted file mode 100644 index a0cbe548242..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.ipr b/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.ipr deleted file mode 100644 index 90747786771..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/kotlinProject.ipr +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/src/test1.kt b/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/src/test1.kt deleted file mode 100644 index 5f41546490a..00000000000 --- a/jps/jps-plugin/testData/general/KotlinProjectWithErrorsBecauseOfNewInference/src/test1.kt +++ /dev/null @@ -1,5 +0,0 @@ -fun foo() { - ByteArray(42) { - when (Any()) {} - } -} \ No newline at end of file From 59993b1441a725919e97fb557b77729d1f11c8ad Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Tue, 12 May 2020 10:50:18 +0300 Subject: [PATCH 1501/1557] JPS: ignore removed java files #KT-27458 Fixed Original commit: 800fcc511a46661633f3476551580613e280fc3f --- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 23 +++++++++++++++++++ .../kotlin/jps/build/KotlinBuilder.kt | 8 ++++--- .../jps/build/KotlinDirtySourceFilesHolder.kt | 7 ++++-- .../kotlin/jps/build/TestingBuildLogger.kt | 15 ++++++------ .../general/PureJavaProject/kotlinProject.iml | 12 ++++++++++ .../general/PureJavaProject/kotlinProject.ipr | 14 +++++++++++ .../general/PureJavaProject/src/Test.java | 5 ++++ 7 files changed, 72 insertions(+), 12 deletions(-) create mode 100644 jps/jps-plugin/testData/general/PureJavaProject/kotlinProject.iml create mode 100644 jps/jps-plugin/testData/general/PureJavaProject/kotlinProject.ipr create mode 100644 jps/jps-plugin/testData/general/PureJavaProject/src/Test.java diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 5262f188e42..66657f2bc1d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -463,6 +463,29 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { buildAllModules().assertSuccessful() } + fun testPureJavaProject() { + initProject(JVM_FULL_RUNTIME) + + fun build() { + var someFilesCompiled = false + + buildCustom(CanceledStatus.NULL, TestProjectBuilderLogger(), BuildResult()) { + project.setTestingContext(TestingContext(LookupTracker.DO_NOTHING, object : TestingBuildLogger { + override fun compilingFiles(files: Collection, allRemovedFilesFiles: Collection) { + someFilesCompiled = true + } + })) + } + + assertFalse("Kotlin builder should return early if there are no Kotlin files", someFilesCompiled) + } + + build() + + rename("${workDir}/src/Test.java", "${workDir}/src/Test1.java") + build() + } + fun testKotlinJavaProject() { doTestWithRuntime() } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 76d51459808..887425b0058 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -27,7 +27,6 @@ import org.jetbrains.jps.builders.storage.BuildDataCorruptedException import org.jetbrains.jps.incremental.* import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.java.JavaBuilder -import org.jetbrains.jps.incremental.storage.BuildDataManager import org.jetbrains.jps.model.JpsProject import org.jetbrains.kotlin.build.GeneratedFile import org.jetbrains.kotlin.cli.common.ExitCode @@ -35,7 +34,6 @@ import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.* import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil -import org.jetbrains.kotlin.cli.common.toBooleanLenient import org.jetbrains.kotlin.compilerRunner.* import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.KotlinModuleKind @@ -55,7 +53,6 @@ import org.jetbrains.kotlin.preloading.ClassCondition import org.jetbrains.kotlin.utils.KotlinPaths import org.jetbrains.kotlin.utils.KotlinPathsFromHomeDir import org.jetbrains.kotlin.utils.PathUtil -import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.util.* import kotlin.collections.HashSet @@ -406,6 +403,11 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { messageCollector ) ?: return ABORT + context.testingContext?.buildLogger?.compilingFiles( + kotlinDirtyFilesHolder.allDirtyFiles, + kotlinDirtyFilesHolder.allRemovedFilesFiles + ) + if (LOG.isDebugEnabled) { LOG.debug("Compiling files: ${kotlinDirtyFilesHolder.allDirtyFiles}") } diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt index 81a6d11c819..32aca9b2949 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinDirtySourceFilesHolder.kt @@ -73,13 +73,16 @@ class KotlinDirtySourceFilesHolder( val byTarget = mutableMapOf() chunk.targets.forEach { target -> - val removedFiles = delegate.getRemovedFiles(target).map { File(it) } + val removedFiles = delegate.getRemovedFiles(target) + .map { File(it) } + .filter { it.isKotlinSourceFile } + byTarget[target] = TargetFiles(target, removedFiles) } delegate.processDirtyFiles { target, file, root -> val targetInfo = byTarget[target] - ?: error("processDirtyFiles should callback only on chunk `$chunk` targets (`$target` is not)") + ?: error("processDirtyFiles should callback only on chunk `$chunk` targets (`$target` is not)") if (file.isKotlinSourceFile) { targetInfo._markDirty(file, root) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt index f7911aed25c..9beec30eec2 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/TestingBuildLogger.kt @@ -26,11 +26,12 @@ import java.io.File * Used for assertions in tests. */ interface TestingBuildLogger { - fun invalidOrUnusedCache(chunk: KotlinChunk?, target: KotlinModuleBuildTarget<*>?, attributesDiff: CacheAttributesDiff<*>) - fun chunkBuildStarted(context: CompileContext, chunk: org.jetbrains.jps.ModuleChunk) - fun afterChunkBuildStarted(context: CompileContext, chunk: org.jetbrains.jps.ModuleChunk) - fun addCustomMessage(message: String) - fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) - fun markedAsDirtyBeforeRound(files: Iterable) - fun markedAsDirtyAfterRound(files: Iterable) + fun invalidOrUnusedCache(chunk: KotlinChunk?, target: KotlinModuleBuildTarget<*>?, attributesDiff: CacheAttributesDiff<*>) = Unit + fun chunkBuildStarted(context: CompileContext, chunk: org.jetbrains.jps.ModuleChunk) = Unit + fun afterChunkBuildStarted(context: CompileContext, chunk: org.jetbrains.jps.ModuleChunk) = Unit + fun compilingFiles(files: Collection, allRemovedFilesFiles: Collection) = Unit + fun addCustomMessage(message: String) = Unit + fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) = Unit + fun markedAsDirtyBeforeRound(files: Iterable) = Unit + fun markedAsDirtyAfterRound(files: Iterable) = Unit } diff --git a/jps/jps-plugin/testData/general/PureJavaProject/kotlinProject.iml b/jps/jps-plugin/testData/general/PureJavaProject/kotlinProject.iml new file mode 100644 index 00000000000..d04ecd6e02e --- /dev/null +++ b/jps/jps-plugin/testData/general/PureJavaProject/kotlinProject.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/PureJavaProject/kotlinProject.ipr b/jps/jps-plugin/testData/general/PureJavaProject/kotlinProject.ipr new file mode 100644 index 00000000000..90747786771 --- /dev/null +++ b/jps/jps-plugin/testData/general/PureJavaProject/kotlinProject.ipr @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jps/jps-plugin/testData/general/PureJavaProject/src/Test.java b/jps/jps-plugin/testData/general/PureJavaProject/src/Test.java new file mode 100644 index 00000000000..fc22b4f6f3b --- /dev/null +++ b/jps/jps-plugin/testData/general/PureJavaProject/src/Test.java @@ -0,0 +1,5 @@ +class A { + public static void main(String[] args) { + System.out.println("Hello"); + } +} \ No newline at end of file From 83ec05b31daec31dbf190c1135c22456ffc4557f Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 17 Dec 2019 17:43:42 +0100 Subject: [PATCH 1502/1557] Support new scheme of compilation of OptionalExpectation annotations Instead of generating these annotation classes as package-private on JVM, serialize their metadata to the .kotlin_module file, and load it when compiling dependent multiplatform modules. The problem with generating them as package-private was that kotlin-stdlib for JVM would end up declaring symbols from other platforms, which would include some annotations from package kotlin.native. But using that package is discouraged by some tools because it has a Java keyword in its name. In particular, jlink refused to work with such artifact altogether (KT-21266). #KT-38652 Fixed Original commit: 012ffa299343e9d9fe23133dd3c14a4e8c027c30 --- .../build/IncrementalJvmJpsTestGenerated.java | 18 ++++++++++++++ .../custom/complementaryFiles/build.log | 1 - .../_dependencies.txt | 7 ++++++ .../modifyOptionalAnnotationUsage/build.log | 24 +++++++++++++++++++ .../c_declaration.kt | 3 +++ .../modifyOptionalAnnotationUsage/c_usage.kt | 2 ++ .../c_usage.kt.new.1 | 2 ++ 7 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt create mode 100644 jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1 diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index fa0ed3f2b4d..8f6dc896138 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -598,6 +598,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/"); } + @TestMetadata("modifyOptionalAnnotationUsage") + public void testModifyOptionalAnnotationUsage() throws Exception { + runTest("jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/"); + } + @TestMetadata("notSameCompiler") public void testNotSameCompiler() throws Exception { runTest("jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler/"); @@ -655,6 +660,19 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } } + @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class ModifyOptionalAnnotationUsage extends AbstractIncrementalJvmJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInModifyOptionalAnnotationUsage() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage"), Pattern.compile("^([^\\.]+)$"), null, true); + } + } + @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log index d50092a5710..3a90f366b38 100644 --- a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles/build.log @@ -8,7 +8,6 @@ Cleaning output files: End of files Cleaning output files: out/production/pJvm/FKt.class - out/production/pJvm/SharedImmutable.class End of files Compiling files: c/src/f.kt diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt new file mode 100644 index 00000000000..94161f8d01d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/_dependencies.txt @@ -0,0 +1,7 @@ +c [sourceSetHolder] + +pJvm [compilationAndSourceSetHolder, jvm] +pJvm -> c [include] + +pJs [compilationAndSourceSetHolder, js] +pJs -> c [include] diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log new file mode 100644 index 00000000000..85eb646b8c3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/build.log @@ -0,0 +1,24 @@ +================ Step #1 ================= + +Building c +Building pJs +Cleaning output files: + out/production/pJs/pJs.js + out/production/pJs/pJs.meta.js + out/production/pJs/pJs/root-package.kjsm +End of files +Compiling files: + c/src/usage.kt +End of files +Exit code: OK +------------------------------------------ +Building pJvm +Cleaning output files: + out/production/pJvm/META-INF/pJvm.kotlin_module + out/production/pJvm/Usage.class +End of files +Compiling files: + c/src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt new file mode 100644 index 00000000000..84c59ee8284 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_declaration.kt @@ -0,0 +1,3 @@ +@OptIn(ExperimentalMultiplatform::class) +@OptionalExpectation +expect annotation class Optional(val value: String) diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt new file mode 100644 index 00000000000..a76180ac767 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt @@ -0,0 +1,2 @@ +@Optional("1") +class Usage diff --git a/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1 b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1 new file mode 100644 index 00000000000..834e6ff534d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage/c_usage.kt.new.1 @@ -0,0 +1,2 @@ +@Optional("2") +class Usage From 673779df69c642e8f564fa4705c5455695bb3380 Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Mon, 25 May 2020 10:06:11 +0300 Subject: [PATCH 1503/1557] jps: testPureJavaProject fix Original commit: 9574ac83e4242fe9792b0b1c7b01f9acecec49a0 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 66657f2bc1d..0ca88f64b0f 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -482,7 +482,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { build() - rename("${workDir}/src/Test.java", "${workDir}/src/Test1.java") + rename("${workDir}/src/Test.java", "Test1.java") build() } From d1020981963f850bd1178347128a862f5be6da17 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 9 Apr 2020 18:34:53 +0900 Subject: [PATCH 1504/1557] 202: Fix compatibility with 202 IDEA branch (code) Original commit: 46ac241e2ff9ea8ec210fc5c3cff9d542df6aac3 --- .../build/AbstractIncrementalJpsTest.kt.202 | 660 ++++++++++ .../jps/build/KotlinJpsBuildTest.kt.202 | 1131 +++++++++++++++++ 2 files changed, 1791 insertions(+) create mode 100644 jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.202 create mode 100644 jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.202 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.202 new file mode 100644 index 00000000000..ae59ed0dab8 --- /dev/null +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.202 @@ -0,0 +1,660 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.build + +import com.intellij.openapi.Disposable +import com.intellij.openapi.util.Disposer +import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.io.FileUtilRt +import com.intellij.testFramework.TestLoggerFactory +import com.intellij.testFramework.UsefulTestCase +import junit.framework.TestCase +import org.apache.log4j.ConsoleAppender +import org.apache.log4j.Level +import org.apache.log4j.Logger +import org.apache.log4j.PatternLayout +import org.jetbrains.jps.ModuleChunk +import org.jetbrains.jps.api.CanceledStatus +import org.jetbrains.jps.builders.BuildResult +import org.jetbrains.jps.builders.CompileScopeTestBuilder +import org.jetbrains.jps.builders.impl.BuildDataPathsImpl +import org.jetbrains.jps.builders.impl.logging.ProjectBuilderLoggerBase +import org.jetbrains.jps.builders.java.dependencyView.Callbacks +import org.jetbrains.jps.builders.logging.BuildLoggingManager +import org.jetbrains.jps.cmdline.ProjectDescriptor +import org.jetbrains.jps.incremental.* +import org.jetbrains.jps.incremental.messages.BuildMessage +import org.jetbrains.jps.model.JpsDummyElement +import org.jetbrains.jps.model.JpsModuleRootModificationUtil +import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.jps.model.library.sdk.JpsSdk +import org.jetbrains.jps.util.JpsPathUtil +import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments +import org.jetbrains.kotlin.incremental.LookupSymbol +import org.jetbrains.kotlin.incremental.testingUtils.* +import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt +import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxtBuilder +import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture +import org.jetbrains.kotlin.jps.incremental.* +import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension +import org.jetbrains.kotlin.jps.model.kotlinFacet +import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget +import org.jetbrains.kotlin.platform.idePlatformKind +import org.jetbrains.kotlin.platform.impl.isJavaScript +import org.jetbrains.kotlin.platform.impl.isJvm +import org.jetbrains.kotlin.platform.orDefault +import org.jetbrains.kotlin.utils.Printer +import java.io.ByteArrayInputStream +import java.io.ByteArrayOutputStream +import java.io.File +import java.io.PrintStream +import java.util.* +import kotlin.reflect.jvm.javaField + +abstract class AbstractIncrementalJpsTest( + private val allowNoFilesWithSuffixInTestData: Boolean = false, + private val checkDumpsCaseInsensitively: Boolean = false +) : BaseKotlinJpsBuildTestCase() { + companion object { + private val COMPILATION_FAILED = "COMPILATION FAILED" + + // change to "/tmp" or anything when default is too long (for easier debugging) + private val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) + + private val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" + } + + protected lateinit var testDataDir: File + protected lateinit var workDir: File + protected lateinit var projectDescriptor: ProjectDescriptor + // is used to compare lookup dumps in a human readable way (lookup symbols are hashed in an actual lookup storage) + protected lateinit var lookupsDuringTest: MutableSet + private var isJvmICEnabledBackup: Boolean = false + private var isJsICEnabledBackup: Boolean = false + + protected var mapWorkingToOriginalFile: MutableMap = hashMapOf() + + lateinit var kotlinCompileContext: KotlinCompileContext + + protected open val buildLogFinder: BuildLogFinder + get() = BuildLogFinder() + + private fun enableDebugLogging() { + com.intellij.openapi.diagnostic.Logger.setFactory(TestLoggerFactory::class.java) + TestLoggerFactory.dumpLogToStdout("") + TestLoggerFactory.enableDebugLogging(testRootDisposable, "#org") + + val console = ConsoleAppender() + console.layout = PatternLayout("%d [%p|%c|%C{1}] %m%n") + console.threshold = Level.ALL + console.activateOptions() + Logger.getRootLogger().addAppender(console) + } + + private var systemPropertiesBackup = run { + val props = System.getProperties() + val output = ByteArrayOutputStream() + props.store(output, "System properties backup") + output.toByteArray() + } + + private fun restoreSystemProperties() { + val input = ByteArrayInputStream(systemPropertiesBackup) + val props = Properties() + props.load(input) + System.setProperties(props) + } + + private val enableICFixture = EnableICFixture() + + override fun setUp() { + super.setUp() + + enableICFixture.setUp() + lookupsDuringTest = hashSetOf() + System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") + + if (DEBUG_LOGGING_ENABLED) { + enableDebugLogging() + } + } + + override fun tearDown() { + restoreSystemProperties() + + (AbstractIncrementalJpsTest::myProject).javaField!![this] = null + (AbstractIncrementalJpsTest::projectDescriptor).javaField!![this] = null + (AbstractIncrementalJpsTest::systemPropertiesBackup).javaField!![this] = null + + lookupsDuringTest.clear() + enableICFixture.tearDown() + super.tearDown() + } + + // JPS forces rebuild of all files when JVM constant has been changed and Callbacks.ConstantAffectionResolver + // is not provided, so ConstantAffectionResolver is mocked with empty implementation + // Usages in Kotlin files are expected to be found by KotlinLookupConstantSearch + protected open val mockConstantSearch: Callbacks.ConstantAffectionResolver? + get() = MockJavaConstantSearch(workDir) + + private fun build( + name: String?, + scope: CompileScopeTestBuilder = CompileScopeTestBuilder.make().allModules() + ): MakeResult { + val workDirPath = FileUtil.toSystemIndependentName(workDir.absolutePath) + + val logger = MyLogger(workDirPath) + projectDescriptor = createProjectDescriptor(BuildLoggingManager(logger)) + + val lookupTracker = TestLookupTracker() + val testingContext = TestingContext(lookupTracker, logger) + projectDescriptor.project.setTestingContext(testingContext) + + try { + val builder = IncProjectBuilder( + projectDescriptor, + BuilderRegistry.getInstance(), + myBuildParams, + CanceledStatus.NULL, + true + ) + val buildResult = BuildResult() + builder.addMessageHandler(buildResult) + val finalScope = scope.build() + + builder.build(finalScope, false) + + // testingContext.kotlinCompileContext is initialized in KotlinBuilder.initializeKotlinContext + kotlinCompileContext = testingContext.kotlinCompileContext!! + + lookupTracker.lookups.mapTo(lookupsDuringTest) { LookupSymbol(it.name, it.scopeFqName) } + + if (!buildResult.isSuccessful) { + val errorMessages = + buildResult + .getMessages(BuildMessage.Kind.ERROR) + .map { it.messageText } + .map { it.replace("^.+:\\d+:\\s+".toRegex(), "").trim() } + .joinToString("\n") + return MakeResult( + log = logger.log + "$COMPILATION_FAILED\n" + errorMessages + "\n", + makeFailed = true, + mappingsDump = null, + name = name + ) + } else { + return MakeResult( + log = logger.log, + makeFailed = false, + mappingsDump = createMappingsDump(projectDescriptor, kotlinCompileContext, lookupsDuringTest), + name = name + ) + } + } finally { + projectDescriptor.dataManager.flush(false) + projectDescriptor.release() + } + } + + private fun initialMake(): MakeResult { + val makeResult = build(null) + + val initBuildLogFile = File(testDataDir, "init-build.log") + if (initBuildLogFile.exists()) { + UsefulTestCase.assertSameLinesWithFile(initBuildLogFile.absolutePath, makeResult.log) + } else { + assertFalse("Initial make failed:\n$makeResult", makeResult.makeFailed) + } + + return makeResult + } + + private fun make(name: String?): MakeResult { + return build(name) + } + + private fun rebuild(): MakeResult { + return build(null, CompileScopeTestBuilder.rebuild().allModules()) + } + + private fun rebuildAndCheckOutput(makeOverallResult: MakeResult) { + val outDir = File(getAbsolutePath("out")) + val outAfterMake = File(getAbsolutePath("out-after-make")) + + if (outDir.exists()) { + FileUtil.copyDir(outDir, outAfterMake) + } + + val rebuildResult = rebuild() + assertEquals( + "Rebuild failed: ${rebuildResult.makeFailed}, last make failed: ${makeOverallResult.makeFailed}. Rebuild result: $rebuildResult", + rebuildResult.makeFailed, makeOverallResult.makeFailed + ) + + if (!outAfterMake.exists()) { + assertFalse(outDir.exists()) + } else { + assertEqualDirectories(outDir, outAfterMake, makeOverallResult.makeFailed) + } + + if (!makeOverallResult.makeFailed) { + if (checkDumpsCaseInsensitively && rebuildResult.mappingsDump?.toLowerCase() == makeOverallResult.mappingsDump?.toLowerCase()) { + // do nothing + } else { + TestCase.assertEquals(rebuildResult.mappingsDump, makeOverallResult.mappingsDump) + } + } + + FileUtil.delete(outAfterMake) + } + + private fun clearCachesRebuildAndCheckOutput(makeOverallResult: MakeResult) { + FileUtil.delete(BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot!!) + + rebuildAndCheckOutput(makeOverallResult) + } + + open val modulesTxtFile + get() = File(testDataDir, "dependencies.txt") + + private fun readModulesTxt(): ModulesTxt? { + var actualModulesTxtFile = modulesTxtFile + + if (!actualModulesTxtFile.exists()) { + // also try `"_${fileName}.txt"`. Useful for sorting files in IDE. + actualModulesTxtFile = modulesTxtFile.parentFile.resolve("_" + modulesTxtFile.name) + if (!actualModulesTxtFile.exists()) return null + } + + return ModulesTxtBuilder().readFile(actualModulesTxtFile) + } + + protected open fun createBuildLog(incrementalMakeResults: List): String = + buildString { + incrementalMakeResults.forEachIndexed { i, makeResult -> + if (i > 0) append("\n") + if (makeResult.name != null) { + append("================ Step #${i + 1} ${makeResult.name} =================\n\n") + } else { + append("================ Step #${i + 1} =================\n\n") + } + append(makeResult.log) + } + } + + protected open fun doTest(testDataPath: String) { + testDataDir = File(testDataPath) + workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) + val buildLogFile = buildLogFinder.findBuildLog(testDataDir) + Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) + + val modulesTxt = configureModules() + if (modulesTxt?.muted == true) return + + initialMake() + + val otherMakeResults = performModificationsAndMake( + modulesTxt?.modules?.map { it.name }, + hasBuildLog = buildLogFile != null + ) + + buildLogFile?.let { + val logs = createBuildLog(otherMakeResults) + UsefulTestCase.assertSameLinesWithFile(buildLogFile.absolutePath, logs) + + val lastMakeResult = otherMakeResults.last() + clearCachesRebuildAndCheckOutput(lastMakeResult) + } + } + + protected data class MakeResult( + val log: String, + val makeFailed: Boolean, + val mappingsDump: String?, + val name: String? = null + ) + + open val testDataSrc: File + get() = testDataDir + + private fun performModificationsAndMake( + moduleNames: Collection?, + hasBuildLog: Boolean + ): List { + val results = arrayListOf() + val modifications = getModificationsToPerform( + testDataSrc, + moduleNames, + allowNoFilesWithSuffixInTestData = allowNoFilesWithSuffixInTestData || !hasBuildLog, + touchPolicy = TouchPolicy.TIMESTAMP + ) + + if (!hasBuildLog) { + check(modifications.size == 1 && modifications.single().isEmpty()) { + "Bad test data: build steps are provided, but there is no `build.log` file" + } + return results + } + + val stepsTxt = File(testDataSrc, "_steps.txt") + val modificationNames = if (stepsTxt.exists()) stepsTxt.readLines() else null + + modifications.forEachIndexed { index, step -> + step.forEach { it.perform(workDir, mapWorkingToOriginalFile) } + performAdditionalModifications(step) + if (moduleNames == null) { + preProcessSources(File(workDir, "src")) + } else { + moduleNames.forEach { preProcessSources(File(workDir, "$it/src")) } + } + + val name = modificationNames?.getOrNull(index) + val makeResult = make(name) + results.add(makeResult) + } + return results + } + + protected open fun performAdditionalModifications(modifications: List) { + } + + protected open fun generateModuleSources(modulesTxt: ModulesTxt) = Unit + + // null means one module + private fun configureModules(): ModulesTxt? { + JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myProject).outputUrl = + JpsPathUtil.pathToUrl(getAbsolutePath("out")) + + val jdk = addJdk("my jdk") + val modulesTxt = readModulesTxt() + mapWorkingToOriginalFile = hashMapOf() + + if (modulesTxt == null) configureSingleModuleProject(jdk) + else configureMultiModuleProject(modulesTxt, jdk) + + overrideModuleSettings() + configureRequiredLibraries() + + return modulesTxt + } + + open fun overrideModuleSettings() { + } + + private fun configureSingleModuleProject(jdk: JpsSdk?) { + addModule("module", arrayOf(getAbsolutePath("src")), null, null, jdk) + + val sourceDestinationDir = File(workDir, "src") + val sourcesMapping = copyTestSources(testDataDir, File(workDir, "src"), "") + mapWorkingToOriginalFile.putAll(sourcesMapping) + + preProcessSources(sourceDestinationDir) + } + + protected open val ModulesTxt.Module.sourceFilePrefix: String + get() = "${name}_" + + private fun configureMultiModuleProject( + modulesTxt: ModulesTxt, + jdk: JpsSdk? + ) { + modulesTxt.modules.forEach { module -> + module.jpsModule = addModule( + module.name, + arrayOf(getAbsolutePath("${module.name}/src")), + null, + null, + jdk + )!! + + val kotlinFacetSettings = module.kotlinFacetSettings + if (kotlinFacetSettings != null) { + val compilerArguments = kotlinFacetSettings.compilerArguments + if (compilerArguments is K2MetadataCompilerArguments) { + val out = getAbsolutePath("${module.name}/out") + File(out).mkdirs() + compilerArguments.destination = out + } else if (compilerArguments is K2JVMCompilerArguments) { + compilerArguments.disableDefaultScriptingPlugin = true + } + + module.jpsModule.container.setChild( + JpsKotlinFacetModuleExtension.KIND, + JpsKotlinFacetModuleExtension(kotlinFacetSettings) + ) + } + } + + modulesTxt.dependencies.forEach { + JpsModuleRootModificationUtil.addDependency( + it.from.jpsModule, it.to.jpsModule, + it.scope, it.exported + ) + } + + // configure module contents + generateModuleSources(modulesTxt) + modulesTxt.modules.forEach { module -> + val sourceDirName = "${module.name}/src" + val sourceDestinationDir = File(workDir, sourceDirName) + val sourcesMapping = copyTestSources(testDataSrc, sourceDestinationDir, module.sourceFilePrefix) + mapWorkingToOriginalFile.putAll(sourcesMapping) + + preProcessSources(sourceDestinationDir) + } + } + + private fun configureRequiredLibraries() { + myProject.modules.forEach { module -> + val platformKind = module.kotlinFacet?.settings?.targetPlatform?.idePlatformKind.orDefault() + + when { + platformKind.isJvm -> { + JpsModuleRootModificationUtil.addDependency(module, requireLibrary(KotlinJpsLibrary.JvmStdLib)) + JpsModuleRootModificationUtil.addDependency(module, requireLibrary(KotlinJpsLibrary.JvmTest)) + } + platformKind.isJavaScript -> { + JpsModuleRootModificationUtil.addDependency(module, requireLibrary(KotlinJpsLibrary.JsStdLib)) + JpsModuleRootModificationUtil.addDependency(module, requireLibrary(KotlinJpsLibrary.JsTest)) + } + } + } + } + + protected open fun preProcessSources(srcDir: File) { + } + + override fun doGetProjectDir(): File? = workDir + + internal class MyLogger(val rootPath: String) : ProjectBuilderLoggerBase(), TestingBuildLogger { + private val markedDirtyBeforeRound = ArrayList() + private val markedDirtyAfterRound = ArrayList() + private val customMessages = mutableListOf() + + override fun invalidOrUnusedCache( + chunk: KotlinChunk?, + target: KotlinModuleBuildTarget<*>?, + attributesDiff: CacheAttributesDiff<*> + ) { + val cacheManager = attributesDiff.manager + val cacheTitle = when (cacheManager) { + is CacheVersionManager -> "Local cache for ${chunk ?: target}" + is CompositeLookupsCacheAttributesManager -> "Lookups cache" + else -> error("Unknown cache manager $cacheManager") + } + + logLine("$cacheTitle are ${attributesDiff.status}") + } + + override fun markedAsDirtyBeforeRound(files: Iterable) { + markedDirtyBeforeRound.addAll(files) + } + + override fun markedAsDirtyAfterRound(files: Iterable) { + markedDirtyAfterRound.addAll(files) + } + + override fun chunkBuildStarted(context: CompileContext, chunk: ModuleChunk) { + logDirtyFiles(markedDirtyBeforeRound) // files can be marked as dirty during build start (KotlinCompileContext initialization) + + if (!chunk.isDummy(context) && context.projectDescriptor.project.modules.size > 1) { + logLine("Building ${chunk.modules.sortedBy { it.name }.joinToString { it.name }}") + } + } + + override fun afterChunkBuildStarted(context: CompileContext, chunk: ModuleChunk) { + logDirtyFiles(markedDirtyBeforeRound) + } + + override fun addCustomMessage(message: String) { + customMessages.add(message) + } + + override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) { + customMessages.forEach { + logLine(it) + } + customMessages.clear() + logDirtyFiles(markedDirtyAfterRound) + logLine("Exit code: $exitCode") + logLine("------------------------------------------") + } + + private fun logDirtyFiles(files: MutableList) { + if (files.isEmpty()) return + + logLine("Marked as dirty by Kotlin:") + files.apply { + map { FileUtil.toSystemIndependentName(it.path) } + .sorted() + .forEach { logLine(it) } + + clear() + } + } + + private val logBuf = StringBuilder() + val log: String + get() = logBuf.toString() + + val compiledFiles = hashSetOf() + + override fun isEnabled(): Boolean = true + + override fun logCompiledFiles(files: MutableCollection?, builderName: String?, description: String?) { + super.logCompiledFiles(files, builderName, description) + + if (builderName == KotlinBuilder.KOTLIN_BUILDER_NAME) { + compiledFiles.addAll(files!!) + } + } + + override fun logLine(message: String?) { + logBuf.append(message!!.replace("^$rootPath/".toRegex(), " ")).append('\n') + } + } +} + +private fun createMappingsDump( + project: ProjectDescriptor, + kotlinContext: KotlinCompileContext, + lookupsDuringTest: Set +) = createKotlinCachesDump(project, kotlinContext, lookupsDuringTest) + "\n\n\n" + + createCommonMappingsDump(project) + "\n\n\n" + + createJavaMappingsDump(project) + +internal fun createKotlinCachesDump( + project: ProjectDescriptor, + kotlinContext: KotlinCompileContext, + lookupsDuringTest: Set +) = createKotlinIncrementalCacheDump(project, kotlinContext) + "\n\n\n" + + createLookupCacheDump(kotlinContext, lookupsDuringTest) + +private fun createKotlinIncrementalCacheDump( + project: ProjectDescriptor, + kotlinContext: KotlinCompileContext +): String { + return buildString { + for (target in project.allModuleTargets.sortedBy { it.presentableName }) { + val kotlinCache = project.dataManager.getKotlinCache(kotlinContext.targetsBinding[target]) + if (kotlinCache != null) { + append("\n") + append(kotlinCache.dump()) + append("\n\n\n") + } + } + } +} + +private fun createLookupCacheDump(kotlinContext: KotlinCompileContext, lookupsDuringTest: Set): String { + val sb = StringBuilder() + val p = Printer(sb) + p.println("Begin of Lookup Maps") + p.println() + + kotlinContext.lookupStorageManager.withLookupStorage { lookupStorage -> + lookupStorage.forceGC() + p.print(lookupStorage.dump(lookupsDuringTest)) + } + + p.println() + p.println("End of Lookup Maps") + return sb.toString() +} + +private fun createCommonMappingsDump(project: ProjectDescriptor): String { + val resultBuf = StringBuilder() + val result = Printer(resultBuf) + + result.println("Begin of SourceToOutputMap") + result.pushIndent() + + for (target in project.allModuleTargets) { + result.println(target) + result.pushIndent() + + val mapping = project.dataManager.getSourceToOutputMap(target) + mapping.sources.sorted().forEach { + val outputs = mapping.getOutputs(it)!!.sorted() + if (outputs.isNotEmpty()) { + result.println("source $it -> $outputs") + } + } + + result.popIndent() + } + + result.popIndent() + result.println("End of SourceToOutputMap") + + return resultBuf.toString() +} + +private fun createJavaMappingsDump(project: ProjectDescriptor): String { + val byteArrayOutputStream = ByteArrayOutputStream() + PrintStream(byteArrayOutputStream).use { + project.dataManager.mappings.toStream(it) + } + return byteArrayOutputStream.toString() +} + +internal val ProjectDescriptor.allModuleTargets: Collection + get() = buildTargetIndex.allTargets.filterIsInstance() + +private val EXPORTED_SUFFIX = "[exported]" diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 new file mode 100644 index 00000000000..125ffde238d --- /dev/null +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 @@ -0,0 +1,1131 @@ +/* + * Copyright 2010-2016 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.kotlin.jps.build + +import com.google.common.collect.Lists +import com.intellij.openapi.util.io.FileUtil +import com.intellij.openapi.util.io.FileUtil.toSystemIndependentName +import com.intellij.openapi.util.io.FileUtilRt +import com.intellij.openapi.util.text.StringUtil +import com.intellij.openapi.vfs.StandardFileSystems +import com.intellij.testFramework.LightVirtualFile +import com.intellij.testFramework.UsefulTestCase +import com.intellij.util.io.URLUtil +import com.intellij.util.io.ZipUtil +import org.jetbrains.jps.ModuleChunk +import org.jetbrains.jps.api.CanceledStatus +import org.jetbrains.jps.builders.BuildResult +import org.jetbrains.jps.builders.CompileScopeTestBuilder +import org.jetbrains.jps.builders.JpsBuildTestCase +import org.jetbrains.jps.builders.TestProjectBuilderLogger +import org.jetbrains.jps.builders.impl.BuildDataPathsImpl +import org.jetbrains.jps.builders.logging.BuildLoggingManager +import org.jetbrains.jps.cmdline.ProjectDescriptor +import org.jetbrains.jps.devkit.model.JpsPluginModuleType +import org.jetbrains.jps.incremental.BuilderRegistry +import org.jetbrains.jps.incremental.CompileContext +import org.jetbrains.jps.incremental.IncProjectBuilder +import org.jetbrains.jps.incremental.ModuleLevelBuilder +import org.jetbrains.jps.incremental.messages.BuildMessage +import org.jetbrains.jps.incremental.messages.CompilerMessage +import org.jetbrains.jps.model.JpsModuleRootModificationUtil +import org.jetbrains.jps.model.JpsProject +import org.jetbrains.jps.model.java.JavaSourceRootType +import org.jetbrains.jps.model.java.JpsJavaDependencyScope +import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.jps.model.java.JpsJavaSdkType +import org.jetbrains.jps.model.library.JpsOrderRootType +import org.jetbrains.jps.model.module.JpsModule +import org.jetbrains.jps.util.JpsPathUtil +import org.jetbrains.kotlin.cli.common.Usage +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler +import org.jetbrains.kotlin.codegen.AsmUtil +import org.jetbrains.kotlin.codegen.JvmCodegenUtil +import org.jetbrains.kotlin.config.IncrementalCompilation +import org.jetbrains.kotlin.config.KotlinCompilerVersion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY +import org.jetbrains.kotlin.config.LanguageVersion +import org.jetbrains.kotlin.incremental.components.LookupTracker +import org.jetbrains.kotlin.incremental.withIC +import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTestBase.LibraryDependency.* +import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff +import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments +import org.jetbrains.kotlin.jps.model.kotlinCompilerArguments +import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget +import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils +import org.jetbrains.kotlin.name.FqName +import org.jetbrains.kotlin.test.KotlinTestUtils +import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.utils.PathUtil +import org.jetbrains.kotlin.utils.Printer +import org.jetbrains.org.objectweb.asm.ClassReader +import org.jetbrains.org.objectweb.asm.ClassVisitor +import org.jetbrains.org.objectweb.asm.MethodVisitor +import org.jetbrains.org.objectweb.asm.Opcodes +import org.junit.Assert +import java.io.File +import java.io.FileNotFoundException +import java.io.FileOutputStream +import java.io.IOException +import java.net.URLClassLoader +import java.util.* +import java.util.zip.ZipOutputStream + +open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { + companion object { + private val ADDITIONAL_MODULE_NAME = "module2" + + private val EXCLUDE_FILES = arrayOf("Excluded.class", "YetAnotherExcluded.class") + private val NOTHING = arrayOf() + private val KOTLIN_JS_LIBRARY = "jslib-example" + private val PATH_TO_KOTLIN_JS_LIBRARY = AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/KotlinJavaScriptProjectWithDirectoryAsLibrary/" + KOTLIN_JS_LIBRARY + private val KOTLIN_JS_LIBRARY_JAR = "$KOTLIN_JS_LIBRARY.jar" + + private fun getMethodsOfClass(classFile: File): Set { + val result = TreeSet() + ClassReader(FileUtil.loadFileBytes(classFile)).accept(object : ClassVisitor(Opcodes.API_VERSION) { + override fun visitMethod(access: Int, name: String, desc: String, signature: String?, exceptions: Array?): MethodVisitor? { + result.add(name) + return null + } + }, 0) + return result + } + + @JvmStatic + protected fun klass(moduleName: String, classFqName: String): String { + val outputDirPrefix = "out/production/$moduleName/" + return outputDirPrefix + classFqName.replace('.', '/') + ".class" + } + + @JvmStatic + protected fun module(moduleName: String): String { + return "out/production/$moduleName/${JvmCodegenUtil.getMappingFileName(moduleName)}" + } + } + + fun doTest() { + initProject(JVM_MOCK_RUNTIME) + buildAllModules().assertSuccessful() + } + + fun doTestWithRuntime() { + initProject(JVM_FULL_RUNTIME) + buildAllModules().assertSuccessful() + } + + fun doTestWithKotlinJavaScriptLibrary() { + initProject(JS_STDLIB) + createKotlinJavaScriptLibraryArchive() + addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + buildAllModules().assertSuccessful() + } + + fun testKotlinProject() { + doTest() + + checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "Test1Kt")) + } + + fun testSourcePackagePrefix() { + doTest() + } + + fun testSourcePackageLongPrefix() { + initProject(JVM_MOCK_RUNTIME) + val buildResult = buildAllModules() + buildResult.assertSuccessful() + val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) + assertEquals("Warning about invalid package prefix in module 2 is expected: $warnings", 1, warnings.size) + assertEquals("Invalid package prefix name is ignored: invalid-prefix.test", warnings.first().messageText) + } + + fun testSourcePackagePrefixWithInnerClasses() { + initProject(JVM_MOCK_RUNTIME) + buildAllModules().assertSuccessful() + } + + fun testKotlinJavaScriptProject() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + + checkOutputFilesList() + checkWhen(touch("src/test1.kt"), null, pathsToDelete = k2jsOutput(PROJECT_NAME)) + } + + private fun k2jsOutput(vararg moduleNames: String): Array { + val moduleNamesSet = moduleNames.toSet() + val list = mutableListOf() + + myProject.modules.forEach { + if (it.name in moduleNamesSet) { + val outputDir = it.productionBuildTarget.outputDir!! + list.add(toSystemIndependentName(File("$outputDir/${it.name}.js").relativeTo(workDir).path)) + list.add(toSystemIndependentName(File("$outputDir/${it.name}.meta.js").relativeTo(workDir).path)) + + val kjsmFiles = outputDir.walk() + .filter { it.isFile && it.extension.equals("kjsm", ignoreCase = true) } + + list.addAll(kjsmFiles.map { toSystemIndependentName(it.relativeTo(workDir).path) }) + } + } + + return list.toTypedArray() + } + + fun testKotlinJavaScriptProjectNewSourceRootTypes() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + + checkOutputFilesList() + } + + fun testKotlinJavaScriptProjectWithCustomOutputPaths() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + + checkOutputFilesList(File(workDir, "target")) + } + + fun testKotlinJavaScriptProjectWithSourceMap() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + + val sourceMapContent = File(getOutputDir(PROJECT_NAME), "$PROJECT_NAME.js.map").readText() + val expectedPath = "prefix-dir/src/pkg/test1.kt" + assertTrue("Source map file should contain relative path ($expectedPath)", sourceMapContent.contains("\"$expectedPath\"")) + + val librarySourceMapFile = File(getOutputDir(PROJECT_NAME), "lib/kotlin.js.map") + assertTrue("Source map for stdlib should be copied to $librarySourceMapFile", librarySourceMapFile.exists()) + } + + fun testKotlinJavaScriptProjectWithSourceMapRelativePaths() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + + val sourceMapContent = File(getOutputDir(PROJECT_NAME), "$PROJECT_NAME.js.map").readText() + val expectedPath = "../../../src/pkg/test1.kt" + assertTrue("Source map file should contain relative path ($expectedPath)", sourceMapContent.contains("\"$expectedPath\"")) + + val librarySourceMapFile = File(getOutputDir(PROJECT_NAME), "lib/kotlin.js.map") + assertTrue("Source map for stdlib should be copied to $librarySourceMapFile", librarySourceMapFile.exists()) + } + + fun testKotlinJavaScriptProjectWithTwoModules() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + + checkOutputFilesList() + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) + checkWhen(touch("module2/src/module2.kt"), null, k2jsOutput(ADDITIONAL_MODULE_NAME)) + checkWhen(arrayOf(touch("src/test1.kt"), touch("module2/src/module2.kt")), null, k2jsOutput(PROJECT_NAME, ADDITIONAL_MODULE_NAME)) + } + + @WorkingDir("KotlinJavaScriptProjectWithTwoModules") + fun testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary() { + initProject() + createKotlinJavaScriptLibraryArchive() + addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + addKotlinJavaScriptStdlibDependency() + buildAllModules().assertSuccessful() + } + + fun testKotlinJavaScriptProjectWithDirectoryAsStdlib() { + initProject() + val jslibJar = PathUtil.kotlinPathsForDistDirectory.jsStdLibJarPath + val jslibDir = File(workDir, "KotlinJavaScript") + try { + ZipUtil.extract(jslibJar, jslibDir, null) + } + catch (ex: IOException) { + throw IllegalStateException(ex.message) + } + + addDependency("KotlinJavaScript", jslibDir) + buildAllModules().assertSuccessful() + + checkOutputFilesList() + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) + } + + fun testKotlinJavaScriptProjectWithDirectoryAsLibrary() { + initProject(JS_STDLIB) + addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY)) + buildAllModules().assertSuccessful() + + checkOutputFilesList() + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) + } + + fun testKotlinJavaScriptProjectWithLibrary() { + doTestWithKotlinJavaScriptLibrary() + + checkOutputFilesList() + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) + } + + fun testKotlinJavaScriptProjectWithLibraryCustomOutputDir() { + doTestWithKotlinJavaScriptLibrary() + + checkOutputFilesList() + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) + } + + fun testKotlinJavaScriptProjectWithLibraryNoCopy() { + doTestWithKotlinJavaScriptLibrary() + + checkOutputFilesList() + checkWhen(touch("src/test1.kt"), null, k2jsOutput(PROJECT_NAME)) + } + + fun testKotlinJavaScriptProjectWithLibraryAndErrors() { + initProject(JS_STDLIB) + createKotlinJavaScriptLibraryArchive() + addDependency(KOTLIN_JS_LIBRARY, File(workDir, KOTLIN_JS_LIBRARY_JAR)) + buildAllModules().assertFailed() + + checkOutputFilesList() + } + + fun testKotlinJavaScriptProjectWithEmptyDependencies() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + } + + fun testKotlinJavaScriptInternalFromSpecialRelatedModule() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + } + + fun testKotlinJavaScriptProjectWithTests() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + } + + fun testKotlinJavaScriptProjectWithTestsAndSeparateTestAndSrcModuleDependencies() { + initProject(JS_STDLIB) + buildAllModules().assertSuccessful() + } + + fun testKotlinJavaScriptProjectWithTestsAndTestAndSrcModuleDependency() { + initProject(JS_STDLIB) + val buildResult = buildAllModules() + buildResult.assertSuccessful() + + val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) + assertEquals("Warning about duplicate module definition: $warnings", 0, warnings.size) + } + + fun testKotlinJavaScriptProjectWithTwoSrcModuleDependency() { + initProject(JS_STDLIB) + val buildResult = buildAllModules() + buildResult.assertSuccessful() + + val warnings = buildResult.getMessages(BuildMessage.Kind.WARNING) + assertEquals("Warning about duplicate module definition: $warnings", 0, warnings.size) + } + + fun testExcludeFolderInSourceRoot() { + doTest() + + val module = myProject.modules.get(0) + assertFilesExistInOutput(module, "Foo.class") + assertFilesNotExistInOutput(module, *EXCLUDE_FILES) + + checkWhen( + touch("src/foo.kt"), null, + arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject")) + ) + } + + fun testExcludeModuleFolderInSourceRootOfAnotherModule() { + doTest() + + for (module in myProject.modules) { + assertFilesExistInOutput(module, "Foo.class") + } + + checkWhen( + touch("src/foo.kt"), null, + arrayOf(klass("kotlinProject", "Foo"), module("kotlinProject")) + ) + checkWhen( + touch("src/module2/src/foo.kt"), null, + arrayOf(klass("module2", "Foo"), module("module2")) + ) + } + + fun testExcludeFileUsingCompilerSettings() { + doTest() + + val module = myProject.modules.get(0) + assertFilesExistInOutput(module, "Foo.class", "Bar.class") + assertFilesNotExistInOutput(module, *EXCLUDE_FILES) + + if (IncrementalCompilation.isEnabledForJvm()) { + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) + } + else { + val allClasses = myProject.outputPaths() + checkWhen(touch("src/foo.kt"), null, allClasses) + } + + checkWhen(touch("src/Excluded.kt"), null, NOTHING) + checkWhen(touch("src/dir/YetAnotherExcluded.kt"), null, NOTHING) + } + + fun testExcludeFolderNonRecursivelyUsingCompilerSettings() { + doTest() + + val module = myProject.modules.get(0) + assertFilesExistInOutput(module, "Foo.class", "Bar.class") + assertFilesNotExistInOutput(module, *EXCLUDE_FILES) + + if (IncrementalCompilation.isEnabledForJvm()) { + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) + checkWhen(touch("src/dir/subdir/bar.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Bar"))) + } + else { + val allClasses = myProject.outputPaths() + checkWhen(touch("src/foo.kt"), null, allClasses) + checkWhen(touch("src/dir/subdir/bar.kt"), null, allClasses) + } + + checkWhen(touch("src/dir/Excluded.kt"), null, NOTHING) + checkWhen(touch("src/dir/subdir/YetAnotherExcluded.kt"), null, NOTHING) + } + + fun testExcludeFolderRecursivelyUsingCompilerSettings() { + doTest() + + val module = myProject.modules.get(0) + assertFilesExistInOutput(module, "Foo.class", "Bar.class") + assertFilesNotExistInOutput(module, *EXCLUDE_FILES) + + if (IncrementalCompilation.isEnabledForJvm()) { + checkWhen(touch("src/foo.kt"), null, arrayOf(module("kotlinProject"), klass("kotlinProject", "Foo"))) + } + else { + val allClasses = myProject.outputPaths() + checkWhen(touch("src/foo.kt"), null, allClasses) + } + + checkWhen(touch("src/exclude/Excluded.kt"), null, NOTHING) + checkWhen(touch("src/exclude/YetAnotherExcluded.kt"), null, NOTHING) + checkWhen(touch("src/exclude/subdir/Excluded.kt"), null, NOTHING) + checkWhen(touch("src/exclude/subdir/YetAnotherExcluded.kt"), null, NOTHING) + } + + fun testKotlinProjectTwoFilesInOnePackage() { + doTest() + + if (IncrementalCompilation.isEnabledForJvm()) { + checkWhen(touch("src/test1.kt"), null, packageClasses("kotlinProject", "src/test1.kt", "_DefaultPackage")) + checkWhen(touch("src/test2.kt"), null, packageClasses("kotlinProject", "src/test2.kt", "_DefaultPackage")) + } + else { + val allClasses = myProject.outputPaths() + checkWhen(touch("src/test1.kt"), null, allClasses) + checkWhen(touch("src/test2.kt"), null, allClasses) + } + + checkWhen(arrayOf(del("src/test1.kt"), del("src/test2.kt")), NOTHING, + arrayOf(packagePartClass("kotlinProject", "src/test1.kt", "_DefaultPackage"), + packagePartClass("kotlinProject", "src/test2.kt", "_DefaultPackage"), + module("kotlinProject"))) + + assertFilesNotExistInOutput(myProject.modules.get(0), "_DefaultPackage.class") + } + + fun testDefaultLanguageVersionCustomApiVersion() { + initProject(JVM_FULL_RUNTIME) + buildAllModules().assertFailed() + + assertEquals(1, myProject.modules.size) + val module = myProject.modules.first() + val args = module.kotlinCompilerArguments + args.apiVersion = "1.2" + myProject.kotlinCommonCompilerArguments = args + + buildAllModules().assertSuccessful() + } + + fun testKotlinJavaProject() { + doTestWithRuntime() + } + + fun testJKJProject() { + doTestWithRuntime() + } + + fun testKJKProject() { + doTestWithRuntime() + } + + fun testKJCircularProject() { + doTestWithRuntime() + } + + fun testJKJInheritanceProject() { + doTestWithRuntime() + } + + fun testKJKInheritanceProject() { + doTestWithRuntime() + } + + fun testCircularDependenciesNoKotlinFiles() { + doTest() + } + + fun testCircularDependenciesDifferentPackages() { + initProject(JVM_MOCK_RUNTIME) + val result = buildAllModules() + + // Check that outputs are located properly + assertFilesExistInOutput(findModule("module2"), "kt1/Kt1Kt.class") + assertFilesExistInOutput(findModule("kotlinProject"), "kt2/Kt2Kt.class") + + result.assertSuccessful() + + if (IncrementalCompilation.isEnabledForJvm()) { + checkWhen(touch("src/kt2.kt"), null, packageClasses("kotlinProject", "src/kt2.kt", "kt2.Kt2Kt")) + checkWhen(touch("module2/src/kt1.kt"), null, packageClasses("module2", "module2/src/kt1.kt", "kt1.Kt1Kt")) + } + else { + val allClasses = myProject.outputPaths() + checkWhen(touch("src/kt2.kt"), null, allClasses) + checkWhen(touch("module2/src/kt1.kt"), null, allClasses) + } + } + + fun testCircularDependenciesSamePackage() { + initProject(JVM_MOCK_RUNTIME) + val result = buildAllModules() + result.assertSuccessful() + + // Check that outputs are located properly + val facadeWithA = findFileInOutputDir(findModule("module1"), "test/AKt.class") + val facadeWithB = findFileInOutputDir(findModule("module2"), "test/BKt.class") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "getA") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "getB", "setB") + + + if (IncrementalCompilation.isEnabledForJvm()) { + checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage")) + checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) + } + else { + val allClasses = myProject.outputPaths() + checkWhen(touch("module1/src/a.kt"), null, allClasses) + checkWhen(touch("module2/src/b.kt"), null, allClasses) + } + } + + fun testCircularDependenciesSamePackageWithTests() { + initProject(JVM_MOCK_RUNTIME) + val result = buildAllModules() + result.assertSuccessful() + + // Check that outputs are located properly + val facadeWithA = findFileInOutputDir(findModule("module1"), "test/AKt.class") + val facadeWithB = findFileInOutputDir(findModule("module2"), "test/BKt.class") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithA), "", "a", "funA", "getA") + UsefulTestCase.assertSameElements(getMethodsOfClass(facadeWithB), "", "b", "funB", "getB", "setB") + + if (IncrementalCompilation.isEnabledForJvm()) { + checkWhen(touch("module1/src/a.kt"), null, packageClasses("module1", "module1/src/a.kt", "test.TestPackage")) + checkWhen(touch("module2/src/b.kt"), null, packageClasses("module2", "module2/src/b.kt", "test.TestPackage")) + } + else { + val allProductionClasses = myProject.outputPaths(tests = false) + checkWhen(touch("module1/src/a.kt"), null, allProductionClasses) + checkWhen(touch("module2/src/b.kt"), null, allProductionClasses) + } + } + + fun testInternalFromAnotherModule() { + initProject(JVM_MOCK_RUNTIME) + val result = buildAllModules() + result.assertFailed() + result.checkErrors() + } + + fun testInternalFromSpecialRelatedModule() { + initProject(JVM_MOCK_RUNTIME) + buildAllModules().assertSuccessful() + + val classpath = listOf("out/production/module1", "out/test/module2").map { File(workDir, it).toURI().toURL() }.toTypedArray() + val clazz = URLClassLoader(classpath).loadClass("test2.BarKt") + clazz.getMethod("box").invoke(null) + } + + fun testCircularDependenciesInternalFromAnotherModule() { + initProject(JVM_MOCK_RUNTIME) + val result = buildAllModules() + result.assertFailed() + result.checkErrors() + } + + fun testCircularDependenciesWrongInternalFromTests() { + initProject(JVM_MOCK_RUNTIME) + val result = buildAllModules() + result.assertFailed() + result.checkErrors() + } + + fun testCircularDependencyWithReferenceToOldVersionLib() { + initProject(JVM_MOCK_RUNTIME) + + val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") + + AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) + + val result = buildAllModules() + result.assertSuccessful() + } + + fun testDependencyToOldKotlinLib() { + initProject() + + val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") + + AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) + + addKotlinStdlibDependency() + + val result = buildAllModules() + result.assertSuccessful() + } + + fun testDevKitProject() { + initProject(JVM_MOCK_RUNTIME) + val module = myProject.modules.single() + assertEquals(module.moduleType, JpsPluginModuleType.INSTANCE) + buildAllModules().assertSuccessful() + assertFilesExistInOutput(module, "TestKt.class") + } + + fun testAccessToInternalInProductionFromTests() { + initProject(JVM_MOCK_RUNTIME) + val result = buildAllModules() + result.assertSuccessful() + } + + /* + * Here we're checking that enabling inference in IDE doesn't affect compilation via JPS + * + * the following two tests are connected: + * - testKotlinProjectWithEnabledNewInferenceInIDE checks that project is compiled when new inference is enabled only in IDE + * - this is done via project component + * - testKotlinProjectWithErrorsBecauseOfNewInference checks that project isn't compiled when new inference is enabled in the compiler + * + * So, if the former will fail => option affects JPS compilation, it's bad. Also, if the latter test fails => test is useless as it's + * compiled with new and old inference. + * + */ + fun testKotlinProjectWithEnabledNewInferenceInIDE() { + initProject(JVM_MOCK_RUNTIME) + val module = myProject.modules.single() + val args = module.kotlinCompilerArguments + args.languageVersion = LanguageVersion.KOTLIN_1_3.versionString + myProject.kotlinCommonCompilerArguments = args + + buildAllModules().assertSuccessful() + } + + fun testKotlinProjectWithErrorsBecauseOfNewInference() { + initProject(JVM_MOCK_RUNTIME) + val module = myProject.modules.single() + val args = module.kotlinCompilerArguments + args.newInference = true + myProject.kotlinCommonCompilerArguments = args + + val result = buildAllModules() + result.assertFailed() + result.checkErrors() + } + + private fun createKotlinJavaScriptLibraryArchive() { + val jarFile = File(workDir, KOTLIN_JS_LIBRARY_JAR) + try { + val zip = ZipOutputStream(FileOutputStream(jarFile)) + ZipUtil.addDirToZipRecursively(zip, jarFile, File(PATH_TO_KOTLIN_JS_LIBRARY), "", null, null) + zip.close() + } + catch (ex: FileNotFoundException) { + throw IllegalStateException(ex.message) + } + catch (ex: IOException) { + throw IllegalStateException(ex.message) + } + + } + + protected fun checkOutputFilesList(outputDir: File = productionOutputDir) { + if (!expectedOutputFile.exists()) { + expectedOutputFile.writeText("") + throw IllegalStateException("$expectedOutputFile did not exist. Created empty file.") + } + + val sb = StringBuilder() + val p = Printer(sb, " ") + outputDir.printFilesRecursively(p) + + UsefulTestCase.assertSameLinesWithFile(expectedOutputFile.canonicalPath, sb.toString(), true) + } + + private fun File.printFilesRecursively(p: Printer) { + val files = listFiles() ?: return + + for (file in files.sortedBy { it.name }) { + when { + file.isFile -> { + p.println(file.name) + } + file.isDirectory -> { + p.println(file.name + "/") + p.pushIndent() + file.printFilesRecursively(p) + p.popIndent() + } + } + } + } + + private val productionOutputDir + get() = File(workDir, "out/production") + + private fun getOutputDir(moduleName: String): File = File(productionOutputDir, moduleName) + + fun testReexportedDependency() { + initProject() + AbstractKotlinJpsBuildTestCase.addKotlinStdlibDependency(myProject.modules.filter { module -> module.name == "module2" }, true) + buildAllModules().assertSuccessful() + } + + fun testCheckIsCancelledIsCalledOftenEnough() { + val classCount = 30 + val methodCount = 30 + + fun generateFiles() { + val srcDir = File(workDir, "src") + srcDir.mkdirs() + + for (i in 0..classCount) { + val code = buildString { + appendln("package foo") + appendln("class Foo$i {") + for (j in 0..methodCount) { + appendln(" fun get${j*j}(): Int = square($j)") + } + appendln("}") + + } + File(srcDir, "Foo$i.kt").writeText(code) + } + } + + generateFiles() + initProject(JVM_MOCK_RUNTIME) + + var checkCancelledCalledCount = 0 + val countingCancelledStatus = CanceledStatus { + checkCancelledCalledCount++ + false + } + + val logger = TestProjectBuilderLogger() + val buildResult = BuildResult() + + buildCustom(countingCancelledStatus, logger, buildResult) + + buildResult.assertSuccessful() + assert(checkCancelledCalledCount > classCount) { + "isCancelled should be called at least once per class. Expected $classCount, but got $checkCancelledCalledCount" + } + } + + fun testCancelKotlinCompilation() { + initProject(JVM_MOCK_RUNTIME) + buildAllModules().assertSuccessful() + + val module = myProject.modules.get(0) + assertFilesExistInOutput(module, "foo/Bar.class") + + val buildResult = BuildResult() + val canceledStatus = object : CanceledStatus { + var checkFromIndex = 0 + + override fun isCanceled(): Boolean { + val messages = buildResult.getMessages(BuildMessage.Kind.INFO) + for (i in checkFromIndex..messages.size - 1) { + if (messages[i].messageText.matches("kotlinc-jvm .+ \\(JRE .+\\)".toRegex())) { + return true + } + } + + checkFromIndex = messages.size + return false + } + } + + touch("src/Bar.kt").apply() + buildCustom(canceledStatus, TestProjectBuilderLogger(), buildResult) + assertCanceled(buildResult) + } + + fun testFileDoesNotExistWarning() { + fun absoluteFiles(vararg paths: String): Array = + paths.map { File(it).absoluteFile }.toTypedArray() + + initProject(JVM_MOCK_RUNTIME) + + val filesToBeReported = absoluteFiles("badroot.jar", "some/test.class") + val otherFiles = absoluteFiles("test/other/file.xml", "some/other/baddir") + + AbstractKotlinJpsBuildTestCase.addDependency( + JpsJavaDependencyScope.COMPILE, + Lists.newArrayList(findModule("module")), + false, + "LibraryWithBadRoots", + *(filesToBeReported + otherFiles) + ) + + val result = buildAllModules() + result.assertSuccessful() + + val actualWarnings = result.getMessages(BuildMessage.Kind.WARNING).map { it.messageText } + val expectedWarnings = filesToBeReported.map { "Classpath entry points to a non-existent location: $it" } + + val expectedText = expectedWarnings.sorted().joinToString("\n") + val actualText = actualWarnings.sorted().joinToString("\n") + + Assert.assertEquals(expectedText, actualText) + } + + fun testHelp() { + initProject() + + val result = buildAllModules() + result.assertSuccessful() + val warning = result.getMessages(BuildMessage.Kind.WARNING).single() + + val expectedText = StringUtil.convertLineSeparators(Usage.render(K2JVMCompiler(), K2JVMCompilerArguments())) + Assert.assertEquals(expectedText, warning.messageText) + } + + fun testWrongArgument() { + initProject() + + val result = buildAllModules() + result.assertFailed() + val errors = result.getMessages(BuildMessage.Kind.ERROR).joinToString("\n\n") { it.messageText } + + Assert.assertEquals("Invalid argument: -abcdefghij-invalid-argument", errors) + } + + fun testCodeInKotlinPackage() { + initProject(JVM_MOCK_RUNTIME) + + val result = buildAllModules() + result.assertFailed() + val errors = result.getMessages(BuildMessage.Kind.ERROR) + + Assert.assertEquals("Only the Kotlin standard library is allowed to use the 'kotlin' package", errors.single().messageText) + } + + fun testDoNotCreateUselessKotlinIncrementalCaches() { + initProject(JVM_MOCK_RUNTIME) + buildAllModules().assertSuccessful() + + val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot + assertFalse(File(storageRoot, "targets/java-test/kotlinProject/kotlin").exists()) + assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) + } + + fun testDoNotCreateUselessKotlinIncrementalCachesForDependentTargets() { + initProject(JVM_MOCK_RUNTIME) + buildAllModules().assertSuccessful() + + if (IncrementalCompilation.isEnabledForJvm()) { + checkWhen(touch("src/utils.kt"), null, packageClasses("kotlinProject", "src/utils.kt", "_DefaultPackage")) + } + else { + val allClasses = findModule("kotlinProject").outputFilesPaths() + checkWhen(touch("src/utils.kt"), null, allClasses.toTypedArray()) + } + + val storageRoot = BuildDataPathsImpl(myDataStorageRoot).dataStorageRoot + assertFalse(File(storageRoot, "targets/java-production/kotlinProject/kotlin").exists()) + assertFalse(File(storageRoot, "targets/java-production/module2/kotlin").exists()) + } + + fun testKotlinProjectWithEmptyProductionOutputDir() { + initProject(JVM_MOCK_RUNTIME) + val result = buildAllModules() + result.assertFailed() + result.checkErrors() + } + + fun testKotlinProjectWithEmptyTestOutputDir() { + doTest() + } + + fun testKotlinProjectWithEmptyProductionOutputDirWithoutSrcDir() { + doTest() + } + + fun testKotlinProjectWithEmptyOutputDirInSomeModules() { + doTest() + } + + fun testEAPToReleaseIC() { + fun setPreRelease(value: Boolean) { + System.setProperty(TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY, value.toString()) + } + + try { + withIC { + initProject(JVM_MOCK_RUNTIME) + + setPreRelease(true) + buildAllModules().assertSuccessful() + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Bar.kt", "src/Foo.kt") + + touch("src/Foo.kt").apply() + buildAllModules() + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Foo.kt") + + setPreRelease(false) + touch("src/Foo.kt").apply() + buildAllModules().assertSuccessful() + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/Bar.kt", "src/Foo.kt") + } + } + finally { + System.clearProperty(TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY) + } + } + + fun testGetDependentTargets() { + fun addModuleWithSourceAndTestRoot(name: String): JpsModule { + return addModule(name, "src/").apply { + contentRootsList.addUrl(JpsPathUtil.pathToUrl("test/")) + addSourceRoot(JpsPathUtil.pathToUrl("test/"), JavaSourceRootType.TEST_SOURCE) + } + } + + // c -> b -exported-> a + // c2 -> b2 ------------^ + + val a = addModuleWithSourceAndTestRoot("a") + val b = addModuleWithSourceAndTestRoot("b") + val c = addModuleWithSourceAndTestRoot("c") + val b2 = addModuleWithSourceAndTestRoot("b2") + val c2 = addModuleWithSourceAndTestRoot("c2") + + JpsModuleRootModificationUtil.addDependency(b, a, JpsJavaDependencyScope.COMPILE, /*exported =*/ true) + JpsModuleRootModificationUtil.addDependency(c, b, JpsJavaDependencyScope.COMPILE, /*exported =*/ false) + JpsModuleRootModificationUtil.addDependency(b2, a, JpsJavaDependencyScope.COMPILE, /*exported =*/ false) + JpsModuleRootModificationUtil.addDependency(c2, b2, JpsJavaDependencyScope.COMPILE, /*exported =*/ false) + + val actual = StringBuilder() + buildCustom(CanceledStatus.NULL, TestProjectBuilderLogger(), BuildResult()) { + project.setTestingContext(TestingContext(LookupTracker.DO_NOTHING, object : TestingBuildLogger { + override fun chunkBuildStarted(context: CompileContext, chunk: ModuleChunk) { + actual.append("Targets dependent on ${chunk.targets.joinToString()}:\n") + val dependentRecursively = mutableSetOf() + context.kotlin.getChunk(chunk)!!.collectDependentChunksRecursivelyExportedOnly(dependentRecursively) + dependentRecursively.asSequence().map { it.targets.joinToString() }.sorted().joinTo(actual, "\n") + actual.append("\n---------\n") + } + + override fun afterChunkBuildStarted(context: CompileContext, chunk: ModuleChunk) {} + override fun invalidOrUnusedCache( + chunk: KotlinChunk?, + target: KotlinModuleBuildTarget<*>?, + attributesDiff: CacheAttributesDiff<*> + ) {} + override fun addCustomMessage(message: String) {} + override fun buildFinished(exitCode: ModuleLevelBuilder.ExitCode) {} + override fun markedAsDirtyBeforeRound(files: Iterable) {} + override fun markedAsDirtyAfterRound(files: Iterable) {} + })) + } + + val expectedFile = File(getCurrentTestDataRoot(), "expected.txt") + + KotlinTestUtils.assertEqualsToFile(expectedFile, actual.toString()) + } + + fun testJre9() { + val jdk9Path = KotlinTestUtils.getJdk9Home().absolutePath + + val jdk = myModel.global.addSdk(JDK_NAME, jdk9Path, "9", JpsJavaSdkType.INSTANCE) + jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + jdk9Path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED) + + loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr") + addKotlinStdlibDependency() + + buildAllModules().assertSuccessful() + } + + fun testCustomDestination() { + loadProject(workDir.absolutePath + File.separator + PROJECT_NAME + ".ipr") + addKotlinStdlibDependency() + buildAllModules().apply { + assertSuccessful() + + val aClass = File(workDir, "customOut/A.class") + assert(aClass.exists()) { "$aClass does not exist!" } + + val warnings = getMessages(BuildMessage.Kind.WARNING) + assert(warnings.isEmpty()) { "Unexpected warnings: \n${warnings.joinToString("\n")}" } + } + } + + private fun BuildResult.checkErrors() { + val actualErrors = getMessages(BuildMessage.Kind.ERROR) + .map { it as CompilerMessage } + .map { "${it.messageText} at line ${it.line}, column ${it.column}" }.sorted().joinToString("\n") + val expectedFile = File(getCurrentTestDataRoot(), "errors.txt") + KotlinTestUtils.assertEqualsToFile(expectedFile, actualErrors) + } + + private fun getCurrentTestDataRoot() = File(AbstractKotlinJpsBuildTestCase.TEST_DATA_PATH + "general/" + getTestName(false)) + + private fun buildCustom( + canceledStatus: CanceledStatus, + logger: TestProjectBuilderLogger, + buildResult: BuildResult, + setupProject: ProjectDescriptor.() -> Unit = {} + ) { + val scopeBuilder = CompileScopeTestBuilder.make().allModules() + val descriptor = this.createProjectDescriptor(BuildLoggingManager(logger)) + + descriptor.setupProject() + + try { + val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), this.myBuildParams, canceledStatus, true) + builder.addMessageHandler(buildResult) + builder.build(scopeBuilder.build(), false) + } + finally { + descriptor.dataManager.flush(false) + descriptor.release() + } + } + + private fun assertCanceled(buildResult: BuildResult) { + val list = buildResult.getMessages(BuildMessage.Kind.INFO) + assertTrue("The build has been canceled" == list.last().messageText) + } + + private fun findModule(name: String): JpsModule { + for (module in myProject.modules) { + if (module.name == name) { + return module + } + } + throw IllegalStateException("Couldn't find module $name") + } + + protected fun checkWhen(action: Action, pathsToCompile: Array?, pathsToDelete: Array?) { + checkWhen(arrayOf(action), pathsToCompile, pathsToDelete) + } + + protected fun checkWhen(actions: Array, pathsToCompile: Array?, pathsToDelete: Array?) { + for (action in actions) { + action.apply() + } + + buildAllModules().assertSuccessful() + + if (pathsToCompile != null) { + assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, *pathsToCompile) + } + + if (pathsToDelete != null) { + assertDeleted(*pathsToDelete) + } + } + + protected fun packageClasses(moduleName: String, fileName: String, packageClassFqName: String): Array { + return arrayOf(module(moduleName), packagePartClass(moduleName, fileName, packageClassFqName)) + } + + protected fun packagePartClass(moduleName: String, fileName: String, packageClassFqName: String): String { + val path = FileUtilRt.toSystemIndependentName(File(workDir, fileName).absolutePath) + val fakeVirtualFile = object : LightVirtualFile(path.substringAfterLast('/')) { + override fun getPath(): String { + // strip extra "/" from the beginning + return path.substring(1) + } + } + + val packagePartFqName = PackagePartClassUtils.getDefaultPartFqName(FqName(packageClassFqName), fakeVirtualFile) + return klass(moduleName, AsmUtil.internalNameByFqNameWithoutInnerClasses(packagePartFqName)) + } + + private fun JpsProject.outputPaths(production: Boolean = true, tests: Boolean = true) = + modules.flatMap { it.outputFilesPaths(production = production, tests = tests) }.toTypedArray() + + private fun JpsModule.outputFilesPaths(production: Boolean = true, tests: Boolean = true): List { + val outputFiles = arrayListOf() + if (production) { + prodOut.walk().filterTo(outputFiles) { it.isFile } + } + if (tests) { + testsOut.walk().filterTo(outputFiles) { it.isFile } + } + return outputFiles.map { FileUtilRt.toSystemIndependentName(it.relativeTo(workDir).path) } + } + + private val JpsModule.prodOut: File + get() = outDir(forTests = false) + + private val JpsModule.testsOut: File + get() = outDir(forTests = true) + + private fun JpsModule.outDir(forTests: Boolean) = + JpsJavaExtensionService.getInstance().getOutputDirectory(this, forTests)!! + + protected enum class Operation { + CHANGE, + DELETE + } + + protected fun touch(path: String): Action = Action(Operation.CHANGE, path) + + protected fun del(path: String): Action = Action(Operation.DELETE, path) + + // TODO inline after KT-3974 will be fixed + protected fun touch(file: File): Unit = JpsBuildTestCase.change(file.absolutePath) + + protected inner class Action constructor(private val operation: Operation, private val path: String) { + fun apply() { + val file = File(workDir, path) + when (operation) { + Operation.CHANGE -> + touch(file) + Operation.DELETE -> + assertTrue("Can not delete file \"" + file.absolutePath + "\"", file.delete()) + } + } + } +} From dd02c526adaf85cd177fc18946dc37d7c004592a Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 27 May 2020 09:10:38 +0300 Subject: [PATCH 1505/1557] as41: Build against AS 4.1 C10 Original commit: af2dce0549d73b21e2df2b3f2d6bccccb774649b --- .../jetbrains/kotlin/jps/build/ideaPlatform.kt.as41 | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as41 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as41 b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as41 new file mode 100644 index 00000000000..6546b2059d2 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as41 @@ -0,0 +1,13 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.jps.build + +import org.jetbrains.jps.incremental.CompileContext +import org.jetbrains.jps.incremental.messages.CompilerMessage + +fun jpsReportInternalBuilderError(context: CompileContext, error: Throwable) { + KotlinBuilder.LOG.info(error) +} \ No newline at end of file From 9ef5970f927e9e262e3287db54f1e0b06f1f8176 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Mon, 25 May 2020 21:36:35 +0300 Subject: [PATCH 1506/1557] Fixed KNPE when serialized Kotlin Facet is broken #KT-37428 Fixed Original commit: 104eeb9ffdf3d187a29106842250d4a1dff997c4 --- .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 2e2ec9eb36d..372eb485866 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -237,13 +237,17 @@ class KotlinFacetSettings { var languageLevel: LanguageVersion? get() = compilerArguments?.languageVersion?.let { LanguageVersion.fromFullVersionString(it) } set(value) { - compilerArguments!!.languageVersion = value?.versionString + compilerArguments?.apply { + languageVersion = value?.versionString + } } var apiLevel: LanguageVersion? get() = compilerArguments?.apiVersion?.let { LanguageVersion.fromFullVersionString(it) } set(value) { - compilerArguments!!.apiVersion = value?.versionString + compilerArguments?.apply { + apiVersion = value?.versionString + } } var targetPlatform: TargetPlatform? = null From 9381493cff4c73f4167b3fa40cd558faa766c311 Mon Sep 17 00:00:00 2001 From: Yunir Salimzyanov Date: Tue, 19 May 2020 15:08:32 +0300 Subject: [PATCH 1507/1557] Add annotation to prevent test invocation twice Cause: it helps to fix double inversion of muted non-flaky tests result (KTI-216). Original commit: 8d51b027eddb3bfe75756a831417f8c4453d0f00 --- .../jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt index 399d4024fa5..b13e7c7b926 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt @@ -19,8 +19,10 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.builders.JpsBuildTestCase import org.jetbrains.jps.model.library.JpsLibrary import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner +import org.jetbrains.kotlin.test.WithMutedInDatabaseRunTest import org.jetbrains.kotlin.test.runTest +@WithMutedInDatabaseRunTest abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { @Throws(Exception::class) override fun setUp() { From 19cf915c2dd5dd735ff172f01bbf93391859d0a0 Mon Sep 17 00:00:00 2001 From: Yunir Salimzyanov Date: Mon, 1 Jun 2020 16:11:14 +0300 Subject: [PATCH 1508/1557] Cleanup 191 extension files (KTI-240) Original commit: 3b9000cc0c8d19abb7ea1ce66ca35bcb9f3e178d --- .../jetbrains/kotlin/jps/build/ideaPlatform.kt.as35 | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as35 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as35 b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as35 deleted file mode 100644 index 6546b2059d2..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as35 +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.jps.build - -import org.jetbrains.jps.incremental.CompileContext -import org.jetbrains.jps.incremental.messages.CompilerMessage - -fun jpsReportInternalBuilderError(context: CompileContext, error: Throwable) { - KotlinBuilder.LOG.info(error) -} \ No newline at end of file From 7accbf7e28feff581a41b682a97698d1b129ac2d Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Thu, 4 Jun 2020 19:32:05 +0200 Subject: [PATCH 1509/1557] Extract interface from CompilerMessageLocation to ease extension The CompilerMessageLocation is an implicit part of the binary daemon protocol so changing it breaks compatibility with older daemons. This change allows to extend location for non-daemon uses without breaking the binary protocol. Original commit: 5e33612238c798325f25650a8d5f6df26537f72d --- .../jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt | 7 ++----- .../jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt index f603bec80e6..282fded48c8 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.kt @@ -16,19 +16,16 @@ package org.jetbrains.kotlin.compilerRunner +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.preloading.ClassPreloadingUtils import org.jetbrains.kotlin.preloading.Preloader import org.jetbrains.kotlin.utils.KotlinPaths - +import org.jetbrains.kotlin.utils.KotlinPathsFromBaseDirectory import java.io.File import java.io.PrintStream import java.lang.ref.SoftReference -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity.ERROR -import org.jetbrains.kotlin.utils.KotlinPathsFromBaseDirectory -import org.jetbrains.kotlin.utils.SmartList - object CompilerRunnerUtil { private var ourClassLoaderRef = SoftReference(null) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt index 870b4fc3d9c..3ac886c1d27 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/MessageCollectorAdapter.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.jps.build import org.jetbrains.jps.incremental.CompileContext import org.jetbrains.jps.incremental.messages.BuildMessage import org.jetbrains.jps.incremental.messages.CompilerMessage -import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation +import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSourceLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.MessageCollector import org.jetbrains.kotlin.config.CompilerRunnerConstants @@ -21,7 +21,7 @@ class MessageCollectorAdapter( ) : MessageCollector { private var hasErrors = false - override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) { + override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageSourceLocation?) { hasErrors = hasErrors || severity.isError var prefix = "" From ff2c45373296e83fb678ba51aa740b787cfdcae9 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Tue, 9 Jun 2020 13:20:35 +0300 Subject: [PATCH 1510/1557] 202: Fix compilation Original commit: ff7576f8e4137733dd11c8acbdec5e703d5fd2e2 --- .../jps/build/KotlinJpsBuildTest.kt.202 | 58 ++++++++----------- 1 file changed, 23 insertions(+), 35 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 index 125ffde238d..3ac350767d3 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 @@ -58,7 +58,6 @@ import org.jetbrains.kotlin.codegen.AsmUtil import org.jetbrains.kotlin.codegen.JvmCodegenUtil import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.KotlinCompilerVersion.TEST_IS_PRE_RELEASE_SYSTEM_PROPERTY -import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.incremental.components.LookupTracker import org.jetbrains.kotlin.incremental.withIC import org.jetbrains.kotlin.jps.build.KotlinJpsBuildTestBase.LibraryDependency.* @@ -464,6 +463,29 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { buildAllModules().assertSuccessful() } + fun testPureJavaProject() { + initProject(JVM_FULL_RUNTIME) + + fun build() { + var someFilesCompiled = false + + buildCustom(CanceledStatus.NULL, TestProjectBuilderLogger(), BuildResult()) { + project.setTestingContext(TestingContext(LookupTracker.DO_NOTHING, object : TestingBuildLogger { + override fun compilingFiles(files: Collection, allRemovedFilesFiles: Collection) { + someFilesCompiled = true + } + })) + } + + assertFalse("Kotlin builder should return early if there are no Kotlin files", someFilesCompiled) + } + + build() + + rename("${workDir}/src/Test.java", "Test1.java") + build() + } + fun testKotlinJavaProject() { doTestWithRuntime() } @@ -626,40 +648,6 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { result.assertSuccessful() } - /* - * Here we're checking that enabling inference in IDE doesn't affect compilation via JPS - * - * the following two tests are connected: - * - testKotlinProjectWithEnabledNewInferenceInIDE checks that project is compiled when new inference is enabled only in IDE - * - this is done via project component - * - testKotlinProjectWithErrorsBecauseOfNewInference checks that project isn't compiled when new inference is enabled in the compiler - * - * So, if the former will fail => option affects JPS compilation, it's bad. Also, if the latter test fails => test is useless as it's - * compiled with new and old inference. - * - */ - fun testKotlinProjectWithEnabledNewInferenceInIDE() { - initProject(JVM_MOCK_RUNTIME) - val module = myProject.modules.single() - val args = module.kotlinCompilerArguments - args.languageVersion = LanguageVersion.KOTLIN_1_3.versionString - myProject.kotlinCommonCompilerArguments = args - - buildAllModules().assertSuccessful() - } - - fun testKotlinProjectWithErrorsBecauseOfNewInference() { - initProject(JVM_MOCK_RUNTIME) - val module = myProject.modules.single() - val args = module.kotlinCompilerArguments - args.newInference = true - myProject.kotlinCommonCompilerArguments = args - - val result = buildAllModules() - result.assertFailed() - result.checkErrors() - } - private fun createKotlinJavaScriptLibraryArchive() { val jarFile = File(workDir, KOTLIN_JS_LIBRARY_JAR) try { From f3efd88bb92a1c4c8095a8a0c92e1188eca6b74e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Tue, 9 Jun 2020 21:09:45 +0200 Subject: [PATCH 1511/1557] Replace appendln with appendLine in project Original commit: 6e67e1e78d658dd4cf62511905361f617b53f0d7 --- .../jps/build/AbstractLookupTrackerTest.kt | 10 ++++----- .../kotlin/jps/build/KotlinJpsBuildTest.kt | 8 +++---- .../jps/build/KotlinJpsBuildTest.kt.202 | 8 +++---- .../dependeciestxt/MppJpsIncTestsGenerator.kt | 22 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index f93d80e40c8..395fda619cc 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -212,12 +212,12 @@ abstract class AbstractLookupTrackerTest : TestWithWorkingDir() { fun doTest(path: String) { val sb = StringBuilder() fun StringBuilder.indentln(string: String) { - appendln(" $string") + appendLine(" $string") } fun CompilerOutput.logOutput(stepName: String) { - sb.appendln("==== $stepName ====") + sb.appendLine("==== $stepName ====") - sb.appendln("Compiling files:") + sb.appendLine("Compiling files:") for (compiledFile in compiledFiles.sortedBy { it.canonicalPath }) { val lookupsFromFile = lookups[compiledFile] val lookupStatus = when { @@ -229,10 +229,10 @@ abstract class AbstractLookupTrackerTest : TestWithWorkingDir() { sb.indentln("$relativePath$lookupStatus") } - sb.appendln("Exit code: $exitCode") + sb.appendLine("Exit code: $exitCode") errors.forEach(sb::indentln) - sb.appendln() + sb.appendLine() } val testDir = File(path) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 0ca88f64b0f..e78ecb115c4 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -716,12 +716,12 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { for (i in 0..classCount) { val code = buildString { - appendln("package foo") - appendln("class Foo$i {") + appendLine("package foo") + appendLine("class Foo$i {") for (j in 0..methodCount) { - appendln(" fun get${j*j}(): Int = square($j)") + appendLine(" fun get${j*j}(): Int = square($j)") } - appendln("}") + appendLine("}") } File(srcDir, "Foo$i.kt").writeText(code) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 index 3ac350767d3..3e158535610 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 @@ -716,12 +716,12 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { for (i in 0..classCount) { val code = buildString { - appendln("package foo") - appendln("class Foo$i {") + appendLine("package foo") + appendLine("class Foo$i {") for (j in 0..methodCount) { - appendln(" fun get${j*j}(): Int = square($j)") + appendLine(" fun get${j*j}(): Int = square($j)") } - appendln("}") + appendLine("}") } File(srcDir, "Foo$i.kt").writeText(code) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/MppJpsIncTestsGenerator.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/MppJpsIncTestsGenerator.kt index 1da2abcca6a..36700d219e4 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/MppJpsIncTestsGenerator.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/dependeciestxt/MppJpsIncTestsGenerator.kt @@ -343,9 +343,9 @@ class MppJpsIncTestsGenerator(val txt: ModulesTxt, val testCaseDirProvider: (Tes serviceKtFile(module, fileNameSuffix).setFileContent(buildString { if (settings.generatePlatformDependent) - appendln("expect fun ${module.platformDependentFunName}(): String") + appendLine("expect fun ${module.platformDependentFunName}(): String") - appendln("fun ${module.platformIndependentFunName}() = \"common$fileNameSuffix\"") + appendLine("fun ${module.platformIndependentFunName}() = \"common$fileNameSuffix\"") appendTestFun(module, settings) }) @@ -364,14 +364,14 @@ class MppJpsIncTestsGenerator(val txt: ModulesTxt, val testCaseDirProvider: (Tes serviceKtFile(module, fileNameSuffix).setFileContent(buildString { if (settings.generatePlatformDependent) { for (expectedBy in settings.generateActualDeclarationsFor) { - appendln( + appendLine( "actual fun ${expectedBy.platformDependentFunName}(): String" + " = \"${module.name}$fileNameSuffix\"" ) } } - appendln( + appendLine( "fun ${module.platformOnlyFunName}()" + " = \"${module.name}$fileNameSuffix\"" ) @@ -398,29 +398,29 @@ class MppJpsIncTestsGenerator(val txt: ModulesTxt, val testCaseDirProvider: (Tes module: ModulesTxt.Module, settings: ModuleContentSettings ) { - appendln() - appendln("fun Test${module.serviceName}() {") + appendLine() + appendLine("fun Test${module.serviceName}() {") val thisAndDependencies = mutableSetOf(module) module.collectDependenciesRecursivelyTo(thisAndDependencies) thisAndDependencies.forEach { thisOrDependent -> if (thisOrDependent.isCommonModule) { - appendln(" ${thisOrDependent.platformIndependentFunName}()") + appendLine(" ${thisOrDependent.platformIndependentFunName}()") if (settings.generatePlatformDependent) { - appendln(" ${thisOrDependent.platformDependentFunName}()") + appendLine(" ${thisOrDependent.platformDependentFunName}()") } } else { // platform module - appendln(" ${thisOrDependent.platformOnlyFunName}()") + appendLine(" ${thisOrDependent.platformOnlyFunName}()") if (thisOrDependent.isJvmModule && thisOrDependent.contentsSettings.generateJavaFile) { - appendln(" ${thisOrDependent.javaClassName}().doStuff()") + appendLine(" ${thisOrDependent.javaClassName}().doStuff()") } } } - appendln("}") + appendLine("}") } private fun ModulesTxt.Module.collectDependenciesRecursivelyTo( From 68fbddd3d7847a94d90d2eabf0699c85fc163b01 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Thu, 11 Jun 2020 18:18:55 +0300 Subject: [PATCH 1512/1557] 202: Fix NPE in BaseKotlinJpsBuildTestCase.tearDown() Original commit: cb8addc4cd7a966e9166c1c3a5598924e2ec8eb4 --- .../jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt index b13e7c7b926..a07e0ab2229 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/BaseKotlinJpsBuildTestCase.kt @@ -33,10 +33,10 @@ abstract class BaseKotlinJpsBuildTestCase : JpsBuildTestCase() { @Throws(Exception::class) override fun tearDown() { System.clearProperty("kotlin.jps.tests") - super.tearDown() myModel = null myBuildParams.clear() JpsKotlinCompilerRunner.releaseCompileServiceSession() + super.tearDown() } private val libraries = mutableMapOf() From 68619252a8bbbb80a23f537ae6ad2860295400a5 Mon Sep 17 00:00:00 2001 From: Ilya Muradyan Date: Wed, 17 Jun 2020 15:33:29 +0300 Subject: [PATCH 1513/1557] Compare lookups without respect to their order Original commit: 7526ff948442b2fdce8cf979a3ec823208fcc2d1 --- .../jps/build/AbstractLookupTrackerTest.kt | 21 +++++----- .../js/classifierMembers/constraints.kt | 4 +- .../lookupTracker/js/classifierMembers/foo.kt | 20 +++++----- .../js/classifierMembers/usages.kt | 30 +++++++-------- .../js/classifierMembers/usages.kt.new.2 | 38 +++++++++---------- .../js/conventions/comparison.kt | 2 +- .../js/conventions/declarations.kt | 24 ++++++------ .../js/conventions/delegateProperty.kt | 24 ++++++------ .../js/conventions/mathematicalLike.kt | 12 +++--- .../lookupTracker/js/conventions/other.kt | 12 +++--- .../js/expressionType/genericType.kt | 4 +- .../js/expressionType/inferredType.kt | 14 +++---- .../js/expressionType/lambdaParameterType.kt | 10 ++--- .../js/localDeclarations/locals.kt | 6 +-- .../js/packageDeclarations/foo1.kt | 12 +++--- .../lookupTracker/js/simple/main.kt | 6 +-- .../jsKlib/classifierMembers/constraints.kt | 4 +- .../jsKlib/classifierMembers/foo.kt | 20 +++++----- .../jsKlib/classifierMembers/usages.kt | 30 +++++++-------- .../jsKlib/classifierMembers/usages.kt.new.2 | 38 +++++++++---------- .../jsKlib/conventions/comparison.kt | 2 +- .../jsKlib/conventions/declarations.kt | 24 ++++++------ .../jsKlib/conventions/delegateProperty.kt | 24 ++++++------ .../jsKlib/conventions/mathematicalLike.kt | 12 +++--- .../lookupTracker/jsKlib/conventions/other.kt | 12 +++--- .../jsKlib/expressionType/genericType.kt | 4 +- .../jsKlib/expressionType/inferredType.kt | 14 +++---- .../expressionType/lambdaParameterType.kt | 10 ++--- .../jsKlib/localDeclarations/locals.kt | 6 +-- .../jsKlib/packageDeclarations/foo1.kt | 12 +++--- .../lookupTracker/jsKlib/simple/main.kt | 6 +-- .../lookupTracker/jvm/SAM/usages.kt | 10 ++--- .../jvm/classifierMembers/foo.kt | 14 +++---- .../jvm/classifierMembers/usages.kt | 30 +++++++-------- .../jvm/classifierMembers/usages.kt.new.2 | 38 +++++++++---------- .../jvm/conventions/comparison.kt | 8 ++-- .../jvm/conventions/delegateProperty.kt | 14 +++---- .../jvm/conventions/mathematicalLike.kt | 18 ++++----- .../lookupTracker/jvm/conventions/other.kt | 10 ++--- .../jvm/expressionType/genericType.kt | 4 +- .../jvm/expressionType/inferredType.kt | 10 ++--- .../jvm/expressionType/lambdaParameterType.kt | 6 +-- .../lookupTracker/jvm/java/usages.kt | 26 ++++++------- .../jvm/localDeclarations/locals.kt | 8 ++-- .../jvm/packageDeclarations/foo1.kt | 12 +++--- .../jvm/syntheticProperties/KotlinClass.kt | 2 +- .../jvm/syntheticProperties/usages.kt | 36 +++++++++--------- 47 files changed, 352 insertions(+), 351 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt index 395fda619cc..714c2f7a54b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractLookupTrackerTest.kt @@ -320,20 +320,21 @@ abstract class AbstractLookupTrackerTest : TestWithWorkingDir() { val end = column - 1 parts.add(lineContent.subSequence(start, end)) - val lookups = lookupsFromColumn.distinct().joinToString(separator = " ", prefix = "/*", postfix = "*/") { + val lookups = lookupsFromColumn.mapTo(sortedSetOf()) { val rest = lineContent.substring(end) val name = - when { - rest.startsWith(it.name) || // same name - rest.startsWith("$" + it.name) || // backing field - DECLARATION_STARTS_WITH.any { rest.startsWith(it) } // it's declaration - -> "" - else -> "(" + it.name + ")" - } + when { + rest.startsWith(it.name) || // same name + rest.startsWith("$" + it.name) || // backing field + DECLARATION_STARTS_WITH.any { rest.startsWith(it) } // it's declaration + -> "" + else -> "(" + it.name + ")" + } - it.scopeKind.toString()[0].toLowerCase().toString() + ":" + it.scopeFqName.let { if (it.isNotEmpty()) it else "" } + name - } + it.scopeKind.toString()[0].toLowerCase() + .toString() + ":" + it.scopeFqName.let { if (it.isNotEmpty()) it else "" } + name + }.joinToString(separator = " ", prefix = "/*", postfix = "*/") parts.add(lookups) diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt index c86fa5ded13..f92324e88e9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/constraints.kt @@ -2,6 +2,6 @@ package foo import bar.* -/*p:foo*/fun , C, D> test() - where C : /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Number, C : /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Comparable, D : B +/*p:foo*/fun , C, D> test() + where C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number, C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Comparable, D : B {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt index 71b8aaa57e3..e9130baea28 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/foo.kt @@ -6,10 +6,10 @@ import bar.* val a = /*p:kotlin(Int)*/1 var b = /*p:kotlin(String)*/"" - val c: /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String + val c: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String get() = /*c:foo.A p:kotlin(String)*/b - var d: /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String = /*p:kotlin(String)*/"ddd" + var d: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String = /*p:kotlin(String)*/"ddd" get() = /*p:kotlin(String)*/field set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v } @@ -18,16 +18,16 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz() + /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { val a = /*p:kotlin(Int)*/1 companion object CO { - fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} + fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} } } @@ -44,7 +44,7 @@ import bar.* } /*p:foo*/interface I { - var a: /*c:foo.I p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int + var a: /*c:foo.I p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int fun foo() class NI @@ -54,7 +54,7 @@ import bar.* override var a = /*p:kotlin(Int)*/1 override fun foo() {} val b = /*p:kotlin(Int)*/1 - fun bar(): /*c:foo.Obj p:foo*/I = /*p:kotlin(Nothing) p:foo(I)*/null as /*c:foo.Obj p:foo*/I + fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I } /*p:foo*/enum class E { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/X./*c:foo.E*/foo() + /*c:foo.E p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt index ae21c40ff0d..35af6681592 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt @@ -3,20 +3,20 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{ - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo c:foo.A(Companion)*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a + /*c:foo.A(Companion) p:foo*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion + /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O + /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 @@ -29,11 +29,11 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X + /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values() + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 index 36bbc26748b..ebacc22616e 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/classifierMembers/usages.kt.new.2 @@ -3,23 +3,23 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) { - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo c:foo.A(Companion)*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a + /*c:foo.A(Companion) p:foo*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion + /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O + /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/vara() + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/E./*c:foo.E*/foo - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/E./*c:foo.E*/bar() + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X + /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values() + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt index 291a49175d8..59eb2b987eb 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/comparison.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ +/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt index 51618a870d2..08ab50385d4 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/declarations.kt @@ -1,15 +1,15 @@ package foo.bar /*p:foo.bar*/class A { - operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:foo.bar(A)*/this - operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?) {} + operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this + operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {} operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this - operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:kotlin(Int)*/1 - operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/false + operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/1 + operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false operator fun invoke() {} - operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:kotlin(Int)*/0 + operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/0 operator fun component1() = /*p:foo.bar(A)*/this @@ -17,19 +17,19 @@ package foo.bar operator fun next() = /*p:foo.bar(A)*/this } -/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:foo.bar(A)*/this -/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {} /*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/true -/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/true +/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:kotlin(Int)*/0 +/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:kotlin(Int)*/0 /*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!! -/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/false +/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt index 47c1a4a9f94..66cd987ff61 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/delegateProperty.kt @@ -3,28 +3,28 @@ package foo.bar /*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty /*p:foo.bar*/class D1 { - operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 + operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 } -/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} /*p:foo.bar(D2)*/open class D2 { - operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} + operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} } -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:foo.bar(D2)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D2)*/this /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { - operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:foo.bar(D3)*/this + operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D3)*/this } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.js(provideDelegate) c:foo.bar.D1(getValue)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.js(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue)*/D1() +/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1() +/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) p:foo.bar(getValue)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() +/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2() +/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() +/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3() +/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt index ac8000e4b87..c3dda9f895f 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/mathematicalLike.kt @@ -1,12 +1,12 @@ package foo.bar -/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) { +/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) { var d = /*p:foo.bar(A)*/a /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++ /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- - /*c:foo.bar.A(dec) p:foo.bar(dec) p:foo.bar(A)*/--/*p:foo.bar(A)*/d + /*c:foo.bar.A(dec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.js(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.js(minusAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) p:kotlin.comparisons(times) p:kotlin.js(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) p:kotlin.comparisons(div) p:kotlin.js(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.js(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.js(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.js(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) p:foo.bar(div) p:foo.bar(divAssign) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.js(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt index 39217d0700e..0fb034380d4 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar -/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any, na: /*p:foo.bar*/A?) { - /*p:foo.bar(A) c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*p:foo.bar(A) c:foo.bar.A(get) p:kotlin(Int)*/a[2] +/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) { + /*c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2] - /*p:kotlin(Int) p:kotlin(Boolean)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a - /*p:kotlin(String) p:kotlin(Boolean)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a + /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a + /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a /*c:foo.bar.A(invoke)*/a() /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a; - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt index 7eb6d235268..dd0722893b2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/genericType.kt @@ -2,7 +2,7 @@ package foo // From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25 -/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Nothing) p:kotlin(Function1)*/null as (T) -> T +/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T /*p:foo*/fun compute(f: () -> T) { val result = f() @@ -12,4 +12,4 @@ package foo init { val a = /*c:foo.Bar c:foo.Bar(T)*/t } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt index c462d71231f..cc97bd76b8b 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/inferredType.kt @@ -6,14 +6,14 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B()) -/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/List) {} -/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/List) {} +/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List) {} +/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List) {} /*p:foo*/fun testInferredType() { - /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(A)*/getListOfA()) - /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) - /*p:foo*/useListOfB(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) + /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA()) + /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB()) + /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB()) } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt index f532b716c6d..4040103b8ae 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/expressionType/lambdaParameterType.kt @@ -2,10 +2,10 @@ package foo /*p:foo*/class C -/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Unit) {} -/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Unit) {} +/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {} +/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {} /*p:foo*/fun testLambdaParameterType() { - /*p:foo*/lambdaConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/it } - /*p:foo*/extensionConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/this } -} \ No newline at end of file + /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it } + /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this } +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt index 59486e09403..e268cb9be52 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/localDeclarations/locals.kt @@ -2,16 +2,16 @@ package local.declarations import bar.* -/*p:local.declarations*/fun f(p: /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) /*p:kotlin(Int)*/{ +/*p:local.declarations*/fun f(p: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Any) /*p:kotlin(Int)*/{ /*p:kotlin(Any) p:kotlin(String)*/p.toString() val a = /*p:kotlin(Int)*/1 val b = /*p:kotlin(Int)*/a fun localFun() = /*p:kotlin(Int)*/b - fun /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() + fun /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() abstract class LocalI { - abstract var a: /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int + abstract var a: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int abstract fun foo() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt index ebf701a42a5..c39a73ac084 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/packageDeclarations/foo1.kt @@ -4,14 +4,14 @@ import bar.* /*p:baz(C)*/import baz.C /*p:foo*/val a = /*p:bar p:foo*/A() -/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B() -/*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ - /*p:foo p:bar(A)*/a +/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{ + /*p:bar(A) p:foo*/a /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B() } -/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/MyClass() +/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ + /*c:foo.MyClass p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt index 93fa07432e1..68363c90532 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/js/simple/main.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array) { - val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array - val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String +/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array) { + val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array + val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt index c86fa5ded13..f92324e88e9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/constraints.kt @@ -2,6 +2,6 @@ package foo import bar.* -/*p:foo*/fun , C, D> test() - where C : /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Number, C : /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Comparable, D : B +/*p:foo*/fun , C, D> test() + where C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Number, C : /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Comparable, D : B {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt index c8a86b7ce73..8ffc37cfc1d 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/foo.kt @@ -6,10 +6,10 @@ import bar.* val a = /*p:kotlin(Int)*/1 var b = /*p:kotlin(String)*/"" - val c: /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String + val c: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String get() = /*c:foo.A p:kotlin(String)*/b - var d: /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String = /*p:kotlin(String)*/"ddd" + var d: /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String = /*p:kotlin(String)*/"ddd" get() = /*p:kotlin(String)*/field set(v) { /*p:kotlin(String)*/field = /*p:kotlin(String)*/v } @@ -18,16 +18,16 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A.Companion p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar*/baz() - /*c:foo.A c:foo.A.Companion p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz() + /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { val a = /*p:kotlin(Int)*/1 companion object CO { - fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} + fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} } } @@ -44,7 +44,7 @@ import bar.* } /*p:foo*/interface I { - var a: /*c:foo.I p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int + var a: /*c:foo.I p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int fun foo() class NI @@ -54,7 +54,7 @@ import bar.* override var a = /*p:kotlin(Int)*/1 override fun foo() {} val b = /*p:kotlin(Int)*/1 - fun bar(): /*c:foo.Obj p:foo*/I = /*p:kotlin(Nothing) p:foo(I)*/null as /*c:foo.Obj p:foo*/I + fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I } /*p:foo*/enum class E { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E c:kotlin.Enum p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js c:kotlin.Enum.Companion p:foo p:bar p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E c:kotlin.Enum c:kotlin.Enum.Companion p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a /*c:foo.E c:kotlin.Enum*/foo() - /*c:foo.E c:kotlin.Enum p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js c:kotlin.Enum.Companion p:foo p:bar*/X./*c:foo.E c:kotlin.Enum*/foo() + /*c:foo.E c:kotlin.Enum c:kotlin.Enum.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E c:kotlin.Enum*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt index eaf1734a271..21d55ee2cdf 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt @@ -3,20 +3,20 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{ - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo c:foo.A(Companion)*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a + /*c:foo.A(Companion) p:foo*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion + /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O + /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 @@ -29,11 +29,11 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/X - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo() - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X + /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo() + /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values() + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 index bb655f2171b..afa0f3ed148 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/classifierMembers/usages.kt.new.2 @@ -3,23 +3,23 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) { - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo c:foo.A(Companion)*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a + /*c:foo.A(Companion) p:foo*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion + /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O + /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar*/vara() + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/X - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo() - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/foo - /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/E./*c:foo.E*/bar() + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X + /*p:bar p:foo p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E c:kotlin.Enum*/foo() + /*p:bar p:foo p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values() + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo + /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt index 291a49175d8..59eb2b987eb 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/comparison.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ +/*p:foo.bar*/fun testComparisons(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) /*p:kotlin(Boolean)*/{ /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/== /*p:kotlin(Any)*/c /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(equals)*/!= /*p:kotlin(Any)*/c /*p:foo.bar(A) p:kotlin(Boolean)*/na /*c:foo.bar.A(equals)*/== /*p:foo.bar(A)*/a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt index 51618a870d2..08ab50385d4 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/declarations.kt @@ -1,15 +1,15 @@ package foo.bar /*p:foo.bar*/class A { - operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:foo.bar(A)*/this - operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?) {} + operator fun plus(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this + operator fun timesAssign(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {} operator fun inc(): /*c:foo.bar.A p:foo.bar*/A = /*p:foo.bar(A)*/this - operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:kotlin(Int)*/1 - operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/false + operator fun get(i: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/1 + operator fun contains(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int): /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false operator fun invoke() {} - operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:kotlin(Int)*/0 + operator fun compareTo(a: /*c:foo.bar.A p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:kotlin(Int)*/0 operator fun component1() = /*p:foo.bar(A)*/this @@ -17,19 +17,19 @@ package foo.bar operator fun next() = /*p:foo.bar(A)*/this } -/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) = /*p:foo.bar(A)*/this -/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.minus(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) = /*p:foo.bar(A)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/A.divAssign(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?) {} /*p:foo.bar*/operator fun /*p:foo.bar*/A.dec(): /*p:foo.bar*/A = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A.not() {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/true -/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.set(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/A.contains(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/true +/*p:foo.bar*/operator fun /*p:foo.bar*/A.invoke(i: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} -/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:kotlin(Int)*/0 +/*p:foo.bar*/operator fun /*p:foo.bar*/A.compareTo(a: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:kotlin(Int)*/0 /*p:foo.bar*/operator fun /*p:foo.bar*/A.component2() = /*p:foo.bar(A)*/this /*p:foo.bar*/operator fun /*p:foo.bar*/A?.iterator() = /*p:foo.bar(A)*/this!! -/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Boolean = /*p:kotlin(Boolean)*/false +/*p:foo.bar*/operator fun /*p:foo.bar*/A.hasNext(): /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Boolean = /*p:kotlin(Boolean)*/false diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt index 47c1a4a9f94..66cd987ff61 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/delegateProperty.kt @@ -3,28 +3,28 @@ package foo.bar /*p:kotlin.reflect(KProperty)*/import kotlin.reflect.KProperty /*p:foo.bar*/class D1 { - operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 + operator fun getValue(t: /*c:foo.bar.D1 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D1 p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 } -/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} +/*p:foo.bar*/operator fun /*p:foo.bar*/D1.setValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>, v: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} /*p:foo.bar(D2)*/open class D2 { - operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) {} + operator fun setValue(t: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*c:foo.bar.D2 p:kotlin.reflect*/KProperty<*>, v: /*c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) {} } -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 -/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:foo.bar(D2)*/this +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.getValue(t: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, p: /*p:kotlin.reflect*/KProperty<*>) = /*p:kotlin(Int)*/1 +/*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D2)*/this /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { - operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) = /*p:foo.bar(D3)*/this + operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any) = /*p:foo.bar(D3)*/this } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.js(provideDelegate) c:foo.bar.D1(getValue)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.js(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) p:foo.bar(setValue)*/D1() +/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1() +/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.js(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) p:foo.bar(getValue)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() +/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2() +/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() +/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3() +/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt index ac8000e4b87..c3dda9f895f 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/mathematicalLike.kt @@ -1,12 +1,12 @@ package foo.bar -/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int) { +/*p:foo.bar*/fun testOperators(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int) { var d = /*p:foo.bar(A)*/a /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++ /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) p:foo.bar(dec)*/-- - /*c:foo.bar.A(dec) p:foo.bar(dec) p:foo.bar(A)*/--/*p:foo.bar(A)*/d + /*c:foo.bar.A(dec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b @@ -17,8 +17,8 @@ package foo.bar /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.js(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.js(minusAssign) c:foo.bar.A(minus) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) p:kotlin.comparisons(times) p:kotlin.js(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) p:foo.bar(divAssign) c:foo.bar.A(div) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) p:kotlin.comparisons(div) p:kotlin.js(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.js(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.js(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.js(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) p:foo.bar(div) p:foo.bar(divAssign) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.js(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt index 39217d0700e..0fb034380d4 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar -/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any, na: /*p:foo.bar*/A?) { - /*p:foo.bar(A) c:foo.bar.A(set) p:foo.bar(set)*/a[1] = /*p:foo.bar(A) c:foo.bar.A(get) p:kotlin(Int)*/a[2] +/*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Int, c: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Any, na: /*p:foo.bar*/A?) { + /*c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2] - /*p:kotlin(Int) p:kotlin(Boolean)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a - /*p:kotlin(String) p:kotlin(Boolean)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a + /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a + /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a /*c:foo.bar.A(invoke)*/a() /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a; - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) p:foo.bar(iterator) c:foo.bar.A(hasNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt index 7eb6d235268..dd0722893b2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/genericType.kt @@ -2,7 +2,7 @@ package foo // From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25 -/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Nothing) p:kotlin(Function1)*/null as (T) -> T +/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T /*p:foo*/fun compute(f: () -> T) { val result = f() @@ -12,4 +12,4 @@ package foo init { val a = /*c:foo.Bar c:foo.Bar(T)*/t } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt index c462d71231f..cc97bd76b8b 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/inferredType.kt @@ -6,14 +6,14 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B()) -/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/List) {} -/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/List) {} +/*p:foo*/fun useListOfA(a: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List) {} +/*p:foo*/fun useListOfB(b: /*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/List) {} /*p:foo*/fun testInferredType() { - /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(A)*/getListOfA()) - /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) - /*p:foo*/useListOfB(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) + /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA()) + /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB()) + /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB()) } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt index f532b716c6d..4040103b8ae 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/expressionType/lambdaParameterType.kt @@ -2,10 +2,10 @@ package foo /*p:foo*/class C -/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Unit) {} -/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Unit) {} +/*p:foo*/fun lambdaConsumer(fn: (/*p:foo*/A)->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {} +/*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Unit) {} /*p:foo*/fun testLambdaParameterType() { - /*p:foo*/lambdaConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/it } - /*p:foo*/extensionConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/this } -} \ No newline at end of file + /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it } + /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this } +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt index 8acbdc11b74..59056dd2de2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/localDeclarations/locals.kt @@ -2,16 +2,16 @@ package local.declarations import bar.* -/*p:local.declarations*/fun f(p: /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Any) /*p:kotlin(Int)*/{ +/*p:local.declarations*/fun f(p: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Any) /*p:kotlin(Int)*/{ /*p:kotlin(Any) p:kotlin(String)*/p./*c:kotlin.Any*/toString() val a = /*p:kotlin(Int)*/1 val b = /*p:kotlin(Int)*/a fun localFun() = /*p:kotlin(Int)*/b - fun /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() + fun /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() abstract class LocalI { - abstract var a: /*p:local.declarations p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Int + abstract var a: /*p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:local.declarations*/Int abstract fun foo() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt index edf2129aab9..c39a73ac084 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/packageDeclarations/foo1.kt @@ -4,14 +4,14 @@ import bar.* /*p:baz(C)*/import baz.C /*p:foo*/val a = /*p:bar p:foo*/A() -/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/baz./*p:baz*/B = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:foo p:bar p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B() -/*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ - /*p:foo p:bar(A)*/a +/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{ + /*p:bar(A) p:foo*/a /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B() } -/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js p:bar*/MyClass() +/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ + /*c:foo.MyClass p:bar p:baz(B) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt index 93fa07432e1..68363c90532 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jsKlib/simple/main.kt @@ -1,6 +1,6 @@ package foo.bar -/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array) { - val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/Array - val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.js*/String +/*p:foo.bar*/fun main(args: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array) { + val f: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Array + val s: /*p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.js p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/String } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt index aeb480cf28e..c39722b7e04 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/SAM/usages.kt @@ -3,12 +3,12 @@ package foo /*p:bar(SAMInterface)*/import bar.SAMInterface /*p:foo*/fun foo(c: /*p:bar*/C) /*p:bar(SAMInterface)*/{ - /*p:bar(C)*/c./*c:bar.C c:bar.C(getFoo) c:bar.C(getFOO) p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/foo() + /*p:bar(C)*/c./*c:bar.C c:bar.C(getFOO) c:bar.C(getFoo) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/foo() /*p:bar(C)*/c./*c:bar.C c:bar.SAMInterface()*/foo /*p:kotlin(Function1) p:kotlin(String)*/{ } - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/C./*c:bar.C*/bar() - /*p:bar p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/C./*c:bar.C c:bar.SAMInterface()*/bar /*p:kotlin(Function1) p:kotlin(String)*/{} + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/bar() + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C c:bar.SAMInterface()*/bar /*p:kotlin(Function1) p:kotlin(String)*/{} - /*p:bar c:bar.SAMInterface() p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/SAMInterface() - /*p:bar c:bar.SAMInterface()*/SAMInterface /*p:kotlin(Function1) p:kotlin(String)*/{} + /*c:bar.SAMInterface() p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/SAMInterface() + /*c:bar.SAMInterface() p:bar*/SAMInterface /*p:kotlin(Function1) p:kotlin(String)*/{} } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt index ef998f02bc9..af279c0683b 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/foo.kt @@ -18,16 +18,16 @@ import bar.* /*c:foo.A*/foo() /*p:foo(A) p:kotlin(Int)*/this./*c:foo.A*/a /*p:foo(A)*/this./*c:foo.A*/foo() - /*c:foo.A c:foo.A(getBaz) c:foo.A(getBAZ) c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/baz() - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(Int)*/Companion./*c:foo.A.Companion*/a - /*c:foo.A c:foo.A.Companion p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(String)*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" + /*c:foo.A c:foo.A(getBAZ) c:foo.A(getBaz) c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz() + /*c:foo.A c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Companion./*c:foo.A.Companion*/a + /*c:foo.A c:foo.A.Companion p:bar p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" } class B { val a = /*p:kotlin(Int)*/1 companion object CO { - fun bar(a: /*c:foo.A.B.CO c:foo.A.B c:foo.A c:foo.A.Companion p:foo p:kotlin*/Int) {} + fun bar(a: /*c:foo.A c:foo.A.B c:foo.A.B.CO c:foo.A.Companion p:foo p:kotlin*/Int) {} } } @@ -54,7 +54,7 @@ import bar.* override var a = /*p:kotlin(Int)*/1 override fun foo() {} val b = /*p:kotlin(Int)*/1 - fun bar(): /*c:foo.Obj p:foo*/I = /*p:kotlin(Nothing) p:foo(I)*/null as /*c:foo.Obj p:foo*/I + fun bar(): /*c:foo.Obj p:foo*/I = /*p:foo(I) p:kotlin(Nothing)*/null as /*c:foo.Obj p:foo*/I } /*p:foo*/enum class E { @@ -64,8 +64,8 @@ import bar.* val a = /*p:kotlin(Int)*/1 fun foo() { /*c:foo.E p:kotlin(Int)*/a - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(Int)*/Y./*c:foo.E*/a + /*c:foo.E p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/Y./*c:foo.E*/a /*c:foo.E*/foo() - /*c:foo.E p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/X./*c:foo.E*/foo() + /*c:foo.E p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/X./*c:foo.E*/foo() } } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt index 4f7ff1bfa4b..73cde312c1f 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt @@ -3,20 +3,20 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) /*p:foo(E)*/{ - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo c:foo.A(Companion)*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a + /*c:foo.A(Companion) p:foo*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion + /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O + /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 @@ -29,11 +29,11 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X + /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values() + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2 b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2 index d10294b0001..449442ab630 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2 +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/classifierMembers/usages.kt.new.2 @@ -3,23 +3,23 @@ package foo import bar.* /*p:foo*/fun usages(i: /*p:foo*/I) { - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" - /*p:foo c:foo.A.Companion(invoke) p:foo(invoke)*/A()./*c:foo.A*/foo() - /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion c:foo.A.B.CO(invoke)*/B()./*c:foo.A.B*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(Int)*/A()./*c:foo.A*/a + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/b + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/c + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke) p:kotlin(String)*/A()./*c:foo.A*/d = /*p:kotlin(String)*/"new value" + /*c:foo.A.Companion(invoke) p:foo p:foo(invoke)*/A()./*c:foo.A*/foo() + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.B.CO(invoke) c:foo.A.Companion*/B()./*c:foo.A.B*/a /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B c:foo.A.B.CO*/bar(1) /*p:foo*/A./*c:foo.A*/B./*c:foo.A.B*/CO./*c:foo.A.B.CO*/bar(1) - /*p:foo c:foo.A(Companion)*/A - /*p:foo p:kotlin(Int)*/A./*c:foo.A.Companion c:foo.A*/a + /*c:foo.A(Companion) p:foo*/A + /*p:foo p:kotlin(Int)*/A./*c:foo.A c:foo.A.Companion*/a /*p:foo*/A./*c:foo.A c:foo.A.Companion*/baz() - /*p:foo c:foo.A(Companion)*/A./*c:foo.A.Companion c:foo.A*/Companion + /*c:foo.A(Companion) p:foo*/A./*c:foo.A c:foo.A.Companion*/Companion /*p:foo*/A./*c:foo.A*/Companion./*c:foo.A.Companion*/baz() - /*p:foo c:foo.A(O)*/A./*c:foo.A.Companion c:foo.A*/O + /*c:foo.A(O) p:foo*/A./*c:foo.A c:foo.A.Companion*/O /*p:foo p:kotlin(String)*/A./*c:foo.A*/O./*c:foo.A.O*/v = /*p:kotlin(String)*/"OK" - /*p:foo*/A./*c:foo.A.Companion c:foo.A c:foo.A.Companion(getVala) c:foo.A.Companion(getVALA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/vala - /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVara) c:foo.A.Companion(getVARA) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/vara() + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVALA) c:foo.A.Companion(getVala) p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vala + /*p:foo*/A./*c:foo.A c:foo.A.Companion c:foo.A.Companion(getVARA) c:foo.A.Companion(getVara) p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/vara() /*p:foo(I) p:kotlin(Int)*/i./*c:foo.I*/a = /*p:kotlin(Int)*/2 /*p:foo p:kotlin(Int)*/Obj./*c:foo.Obj*/a @@ -31,13 +31,13 @@ import bar.* val iii = /*p:foo p:foo(I)*/Obj./*c:foo.Obj*/bar() /*p:foo(I)*/iii./*c:foo.I*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:foo.E*/X - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(Int)*/E./*c:foo.E*/X./*c:foo.E*/a - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:foo.E*/Y./*c:foo.E*/foo() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(Array)*/E./*c:foo.E*/values() - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:foo.E*/foo - /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:foo.E*/bar() + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X + /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/X./*c:foo.E*/a + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/Y./*c:foo.E*/foo() + /*p:bar p:foo p:java.lang p:kotlin p:kotlin(Array) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/values() + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/valueOf(/*p:kotlin(String)*/"") + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/foo + /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:foo.E*/bar() } /*p:foo*/fun classifiers( diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt index 98747a87e47..480d03ce87e 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/comparison.kt @@ -11,8 +11,8 @@ package foo.bar /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/>= /*p:kotlin(Int)*/b /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo)*/<= /*p:kotlin(Int)*/b - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c - /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCompareTo) c:foo.bar.A(getCOMPARETo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/> /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/< /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/>= /*p:kotlin(Any)*/c + /*p:foo.bar(A) p:kotlin(Boolean)*/a /*c:foo.bar.A(compareTo) c:foo.bar.A(getCOMPARETo) c:foo.bar.A(getCompareTo) p:foo.bar(compareTo)*/<= /*p:kotlin(Any)*/c } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt index 8e149d83fac..cfec1fee433 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/delegateProperty.kt @@ -16,15 +16,15 @@ package foo.bar /*p:foo.bar*/operator fun /*p:foo.bar*/D2.provideDelegate(p: /*p:foo.bar p:kotlin*/Any?, k: /*p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D2)*/this /*p:foo.bar*/class D3 : /*p:foo.bar*/D2() { - operator fun provideDelegate(p: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin*/Any?, k: /*c:foo.bar.D3 c:foo.bar.D2 p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D3)*/this + operator fun provideDelegate(p: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin*/Any?, k: /*c:foo.bar.D2 c:foo.bar.D3 p:foo.bar p:kotlin*/Any) = /*p:foo.bar(D3)*/this } -/*p:foo.bar*/val x1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.jvm(provideDelegate) p:java.lang(provideDelegate) c:foo.bar.D1(getValue)*/D1() -/*p:foo.bar*/var y1 by /*p:foo.bar c:foo.bar.D1(provideDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getPROVIDEDelegate) p:foo.bar(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.jvm(provideDelegate) p:java.lang(provideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(setValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getSETValue) p:foo.bar(setValue)*/D1() +/*p:foo.bar*/val x1 by /*c:foo.bar.D1(getPROVIDEDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) p:foo.bar p:foo.bar(provideDelegate) p:java.lang(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1() +/*p:foo.bar*/var y1 by /*c:foo.bar.D1(getPROVIDEDelegate) c:foo.bar.D1(getProvideDelegate) c:foo.bar.D1(getSETValue) c:foo.bar.D1(getSetValue) c:foo.bar.D1(getValue) c:foo.bar.D1(provideDelegate) c:foo.bar.D1(setValue) p:foo.bar p:foo.bar(provideDelegate) p:foo.bar(setValue) p:java.lang(provideDelegate) p:kotlin(provideDelegate) p:kotlin.annotation(provideDelegate) p:kotlin.collections(provideDelegate) p:kotlin.comparisons(provideDelegate) p:kotlin.io(provideDelegate) p:kotlin.jvm(provideDelegate) p:kotlin.ranges(provideDelegate) p:kotlin.sequences(provideDelegate) p:kotlin.text(provideDelegate)*/D1() -/*p:foo.bar*/val x2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue)*/D2() -/*p:foo.bar*/var y2 by /*p:foo.bar c:foo.bar.D2(provideDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getPROVIDEDelegate) p:foo.bar(provideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getGETValue) p:foo.bar(getValue) c:foo.bar.D2(setValue)*/D2() +/*p:foo.bar*/val x2 by /*c:foo.bar.D2(getGETValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getPROVIDEDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2() +/*p:foo.bar*/var y2 by /*c:foo.bar.D2(getGETValue) c:foo.bar.D2(getGetValue) c:foo.bar.D2(getPROVIDEDelegate) c:foo.bar.D2(getProvideDelegate) c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) p:foo.bar p:foo.bar(getValue) p:foo.bar(provideDelegate)*/D2() -/*p:foo.bar*/val x3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue)*/D3() -/*p:foo.bar*/var y3 by /*p:foo.bar c:foo.bar.D3(provideDelegate) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getValue) c:foo.bar.D2(getValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getGETValue) p:foo.bar(getValue) c:foo.bar.D3(setValue) c:foo.bar.D2(setValue)*/D3() +/*p:foo.bar*/val x3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D3(getGETValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) p:foo.bar p:foo.bar(getValue)*/D3() +/*p:foo.bar*/var y3 by /*c:foo.bar.D2(getValue) c:foo.bar.D2(provideDelegate) c:foo.bar.D2(setValue) c:foo.bar.D3(getGETValue) c:foo.bar.D3(getGetValue) c:foo.bar.D3(getValue) c:foo.bar.D3(provideDelegate) c:foo.bar.D3(setValue) p:foo.bar p:foo.bar(getValue)*/D3() diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt index 29c0b2a3418..830e7bc7c40 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/mathematicalLike.kt @@ -5,20 +5,20 @@ package foo.bar /*p:foo.bar(A)*/d/*c:foo.bar.A(inc)*/++ /*c:foo.bar.A(inc) p:foo.bar(A)*/++/*p:foo.bar(A)*/d - /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC) p:foo.bar(dec)*/-- - /*c:foo.bar.A(dec) c:foo.bar.A(getDec) c:foo.bar.A(getDEC) p:foo.bar(dec) p:foo.bar(A)*/--/*p:foo.bar(A)*/d + /*p:foo.bar(A)*/d/*c:foo.bar.A(dec) c:foo.bar.A(getDEC) c:foo.bar.A(getDec) p:foo.bar(dec)*/-- + /*c:foo.bar.A(dec) c:foo.bar.A(getDEC) c:foo.bar.A(getDec) p:foo.bar(A) p:foo.bar(dec)*/--/*p:foo.bar(A)*/d /*p:foo.bar(A)*/a /*c:foo.bar.A(plus)*/+ /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/a /*c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b - /*c:foo.bar.A(not) c:foo.bar.A(getNot) c:foo.bar.A(getNOT) p:foo.bar(not)*/!/*p:foo.bar(A)*/a + /*p:foo.bar(A)*/a /*c:foo.bar.A(getMINUS) c:foo.bar.A(getMinus) c:foo.bar.A(minus) p:foo.bar(minus)*/- /*p:kotlin(Int)*/b + /*c:foo.bar.A(getNOT) c:foo.bar.A(getNot) c:foo.bar.A(not) p:foo.bar(not)*/!/*p:foo.bar(A)*/a // for val /*p:foo.bar(A)*/a /*c:foo.bar.A(timesAssign)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/a /*c:foo.bar.A(divAssign) c:foo.bar.A(getDIVAssign) c:foo.bar.A(getDivAssign) p:foo.bar(divAssign)*//= /*p:kotlin(Int)*/b // for var - /*p:foo.bar(A)*/d /*c:foo.bar.A(plusAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(getPLUSAssign) p:foo.bar(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign) p:kotlin.io(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.jvm(plusAssign) p:java.lang(plusAssign) c:foo.bar.A(plus)*/+= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(minusAssign) c:foo.bar.A(getMinusAssign) c:foo.bar.A(getMINUSAssign) p:foo.bar(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign) p:kotlin.io(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.jvm(minusAssign) p:java.lang(minusAssign) c:foo.bar.A(minus) c:foo.bar.A(getMinus) c:foo.bar.A(getMINUS) p:foo.bar(minus)*/-= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(timesAssign) c:foo.bar.A(times) c:foo.bar.A(getTimes) c:foo.bar.A(getTIMES) p:foo.bar(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times) p:kotlin.io(times) p:kotlin.comparisons(times) p:kotlin.jvm(times) p:java.lang(times)*/*= /*p:kotlin(Int)*/b - /*p:foo.bar(A)*/d /*c:foo.bar.A(divAssign) c:foo.bar.A(getDivAssign) c:foo.bar.A(getDIVAssign) p:foo.bar(divAssign) c:foo.bar.A(div) c:foo.bar.A(getDiv) c:foo.bar.A(getDIV) p:foo.bar(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div) p:kotlin.io(div) p:kotlin.comparisons(div) p:kotlin.jvm(div) p:java.lang(div)*//= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(getPLUSAssign) c:foo.bar.A(getPlusAssign) c:foo.bar.A(plus) c:foo.bar.A(plusAssign) p:foo.bar(plusAssign) p:java.lang(plusAssign) p:kotlin(plusAssign) p:kotlin.annotation(plusAssign) p:kotlin.collections(plusAssign) p:kotlin.comparisons(plusAssign) p:kotlin.io(plusAssign) p:kotlin.jvm(plusAssign) p:kotlin.ranges(plusAssign) p:kotlin.sequences(plusAssign) p:kotlin.text(plusAssign)*/+= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(getMINUS) c:foo.bar.A(getMINUSAssign) c:foo.bar.A(getMinus) c:foo.bar.A(getMinusAssign) c:foo.bar.A(minus) c:foo.bar.A(minusAssign) p:foo.bar(minus) p:foo.bar(minusAssign) p:java.lang(minusAssign) p:kotlin(minusAssign) p:kotlin.annotation(minusAssign) p:kotlin.collections(minusAssign) p:kotlin.comparisons(minusAssign) p:kotlin.io(minusAssign) p:kotlin.jvm(minusAssign) p:kotlin.ranges(minusAssign) p:kotlin.sequences(minusAssign) p:kotlin.text(minusAssign)*/-= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(getTIMES) c:foo.bar.A(getTimes) c:foo.bar.A(times) c:foo.bar.A(timesAssign) p:foo.bar(times) p:java.lang(times) p:kotlin(times) p:kotlin.annotation(times) p:kotlin.collections(times) p:kotlin.comparisons(times) p:kotlin.io(times) p:kotlin.jvm(times) p:kotlin.ranges(times) p:kotlin.sequences(times) p:kotlin.text(times)*/*= /*p:kotlin(Int)*/b + /*p:foo.bar(A)*/d /*c:foo.bar.A(div) c:foo.bar.A(divAssign) c:foo.bar.A(getDIV) c:foo.bar.A(getDIVAssign) c:foo.bar.A(getDiv) c:foo.bar.A(getDivAssign) p:foo.bar(div) p:foo.bar(divAssign) p:java.lang(div) p:kotlin(div) p:kotlin.annotation(div) p:kotlin.collections(div) p:kotlin.comparisons(div) p:kotlin.io(div) p:kotlin.jvm(div) p:kotlin.ranges(div) p:kotlin.sequences(div) p:kotlin.text(div)*//= /*p:kotlin(Int)*/b } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt index d6c85490321..f087f7f6744 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/conventions/other.kt @@ -1,16 +1,16 @@ package foo.bar /*p:foo.bar*/fun testOther(a: /*p:foo.bar*/A, b: /*p:foo.bar p:kotlin*/Int, c: /*p:foo.bar p:kotlin*/Any, na: /*p:foo.bar*/A?) { - /*p:foo.bar(A) c:foo.bar.A(set) c:foo.bar.A(getSet) c:foo.bar.A(getSET) p:foo.bar(set)*/a[1] = /*p:foo.bar(A) c:foo.bar.A(get) p:kotlin(Int)*/a[2] + /*c:foo.bar.A(getSET) c:foo.bar.A(getSet) c:foo.bar.A(set) p:foo.bar(A) p:foo.bar(set)*/a[1] = /*c:foo.bar.A(get) p:foo.bar(A) p:kotlin(Int)*/a[2] - /*p:kotlin(Int) p:kotlin(Boolean)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a - /*p:kotlin(String) p:kotlin(Boolean)*/"s" /*c:foo.bar.A(contains) c:foo.bar.A(getContains) c:foo.bar.A(getCONTAINS) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a + /*p:kotlin(Boolean) p:kotlin(Int)*/b /*c:foo.bar.A(contains)*/in /*p:foo.bar(A)*/a + /*p:kotlin(Boolean) p:kotlin(String)*/"s" /*c:foo.bar.A(contains) c:foo.bar.A(getCONTAINS) c:foo.bar.A(getContains) p:foo.bar(contains)*/!in /*p:foo.bar(A)*/a /*c:foo.bar.A(invoke)*/a() /*c:foo.bar.A(invoke) p:foo.bar p:foo.bar(invoke)*/a(1) val (/*c:foo.bar.A(component1)*/h, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/t) = /*p:foo.bar(A)*/a; - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) c:foo.bar.A(hasNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getHASNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/a); - for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*p:foo.bar(A) c:foo.bar.A(iterator) c:foo.bar.A(getIterator) c:foo.bar.A(getITERATOR) p:foo.bar(iterator) c:foo.bar.A(hasNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getHASNext) p:foo.bar(hasNext) c:foo.bar.A(next)*/na); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(getHASNext) c:foo.bar.A(getHasNext) c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext)*/a); + for ((/*c:foo.bar.A(component1)*/f, /*c:foo.bar.A(component2) c:foo.bar.A(getComponent2) p:foo.bar(component2)*/s) in /*c:foo.bar.A(getHASNext) c:foo.bar.A(getHasNext) c:foo.bar.A(getITERATOR) c:foo.bar.A(getIterator) c:foo.bar.A(hasNext) c:foo.bar.A(iterator) c:foo.bar.A(next) p:foo.bar(A) p:foo.bar(hasNext) p:foo.bar(iterator)*/na); } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt index 7eb6d235268..dd0722893b2 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/genericType.kt @@ -2,7 +2,7 @@ package foo // From KT-10772 Problem with daemon on Idea 15.0.3 & 1-dev-25 -/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Nothing) p:kotlin(Function1)*/null as (T) -> T +/*p:foo*/fun identity(): (T) -> T = /*p:kotlin(Function1) p:kotlin(Nothing)*/null as (T) -> T /*p:foo*/fun compute(f: () -> T) { val result = f() @@ -12,4 +12,4 @@ package foo init { val a = /*c:foo.Bar c:foo.Bar(T)*/t } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt index 859fb943514..7bc5b359e03 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/inferredType.kt @@ -6,14 +6,14 @@ package foo /*p:foo*/fun getA() = /*p:foo*/A() /*p:foo*/fun getB() = /*p:foo*/B() -/*p:foo*/fun getListOfA() = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:foo p:kotlin.collections(List) p:foo(A)*/listOf(/*p:foo*/A()) -/*p:foo*/fun getListOfB() = /*p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:foo p:kotlin.collections(List) p:foo(B)*/listOf(/*p:foo*/B()) +/*p:foo*/fun getListOfA() = /*p:foo p:foo(A) p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/A()) +/*p:foo*/fun getListOfB() = /*p:foo p:foo(B) p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.collections(List) p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/listOf(/*p:foo*/B()) /*p:foo*/fun useListOfA(a: /*p:foo p:kotlin.collections*/List) {} /*p:foo*/fun useListOfB(b: /*p:foo p:kotlin.collections*/List) {} /*p:foo*/fun testInferredType() { - /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(A)*/getListOfA()) - /*p:foo*/useListOfA(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) - /*p:foo*/useListOfB(/*p:foo p:kotlin.collections(List) p:foo(B)*/getListOfB()) + /*p:foo*/useListOfA(/*p:foo p:foo(A) p:kotlin.collections(List)*/getListOfA()) + /*p:foo*/useListOfA(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB()) + /*p:foo*/useListOfB(/*p:foo p:foo(B) p:kotlin.collections(List)*/getListOfB()) } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt index e55acec918c..0aa16b49a29 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/expressionType/lambdaParameterType.kt @@ -6,6 +6,6 @@ package foo /*p:foo*/fun extensionConsumer(fn: /*p:foo*/A.()->/*p:foo p:kotlin*/Unit) {} /*p:foo*/fun testLambdaParameterType() { - /*p:foo*/lambdaConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/it } - /*p:foo*/extensionConsumer /*p:kotlin(Function1) p:foo(A)*/{ /*p:foo(A)*/this } -} \ No newline at end of file + /*p:foo*/lambdaConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/it } + /*p:foo*/extensionConsumer /*p:foo(A) p:kotlin(Function1)*/{ /*p:foo(A)*/this } +} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt index 4cede651855..27dcd9709c7 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/java/usages.kt @@ -9,29 +9,29 @@ import baz.* /*p:bar(C) p:kotlin(Int)*/c./*c:bar.C*/field /*p:bar(C) p:kotlin(Int)*/c./*c:bar.C*/field = /*p:kotlin(Int)*/2 /*p:bar(C)*/c./*c:bar.C*/func() - /*p:bar(C) c:bar.C(B)*/c./*c:bar.C*/B() + /*c:bar.C(B) p:bar(C)*/c./*c:bar.C*/B() - /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(String)*/C./*c:bar.C*/sfield - /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(String)*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" - /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/C./*c:bar.C*/sfunc() - /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang c:bar.C(S)*/C./*c:bar.C*/S() + /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfield + /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfield = /*p:kotlin(String)*/"new" + /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/sfunc() + /*c:bar.C(S) p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/S() // inherited from I /*p:bar(C)*/c./*c:bar.C*/ifunc() - /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(String)*/C./*c:bar.C*/isfield + /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/isfield // expected error: Unresolved reference: IS - /*p:bar p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/C./*c:bar.C*/IS() + /*p:bar p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/C./*c:bar.C*/IS() val i: /*p:foo*/I = /*p:bar(C)*/c /*p:foo(I)*/i./*c:foo.I*/ifunc() - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(String)*/I./*c:foo.I*/isfield - /*p:foo p:baz p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang c:foo.I(IS)*/I./*c:foo.I*/IS() + /*p:baz p:foo p:java.lang p:kotlin p:kotlin(String) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/I./*c:foo.I*/isfield + /*c:foo.I(IS) p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/I./*c:foo.I*/IS() - /*p:baz p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:baz.E*/F - /*p:baz p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:kotlin(Int)*/E./*c:baz.E*/F./*c:baz.E*/field - /*p:baz p:foo p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/E./*c:baz.E*/S./*c:baz.E*/func() + /*p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/F + /*p:baz p:foo p:java.lang p:kotlin p:kotlin(Int) p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/F./*c:baz.E*/field + /*p:baz p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/E./*c:baz.E*/S./*c:baz.E*/func() } /*p:foo*/fun classifiers( @@ -41,5 +41,5 @@ import baz.* cis: /*p:bar*/C./*c:bar.C*/IS, i: /*p:foo*/I, iis: /*p:foo*/I./*c:foo.I*/IS, - e: /*p:foo p:baz*/E + e: /*p:baz p:foo*/E ) {} diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt index fa10ec53086..e736a16e41e 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/localDeclarations/locals.kt @@ -2,16 +2,16 @@ package local.declarations import bar.* -/*p:local.declarations*/fun f(p: /*p:local.declarations p:kotlin*/Any) /*p:kotlin(Int)*/{ +/*p:local.declarations*/fun f(p: /*p:kotlin p:local.declarations*/Any) /*p:kotlin(Int)*/{ /*p:kotlin(Any) p:kotlin(String)*/p.toString() val a = /*p:kotlin(Int)*/1 val b = /*p:kotlin(Int)*/a fun localFun() = /*p:kotlin(Int)*/b - fun /*p:local.declarations p:kotlin*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() + fun /*p:kotlin p:local.declarations*/Int.localExtFun() = /*p:kotlin(Int)*/localFun() abstract class LocalI { - abstract var a: /*p:local.declarations p:kotlin*/Int + abstract var a: /*p:kotlin p:local.declarations*/Int abstract fun foo() } @@ -31,7 +31,7 @@ import bar.* } /*p:kotlin(Int)*/localFun() - /*p:kotlin(Int)*/1./*c:kotlin.Int(getLocalExtFun) c:kotlin.Int(getLOCALExtFun)*/localExtFun() + /*p:kotlin(Int)*/1./*c:kotlin.Int(getLOCALExtFun) c:kotlin.Int(getLocalExtFun)*/localExtFun() val c = LocalC() /*p:kotlin(Int)*/c.a diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt index d9d2ba12161..ac6c55f0a97 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/packageDeclarations/foo1.kt @@ -4,14 +4,14 @@ import bar.* /*p:baz(C)*/import baz.C /*p:foo*/val a = /*p:bar p:foo*/A() -/*p:foo*/var b: /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/baz./*p:baz*/B = /*p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:baz(B)*/baz./*p:baz*/B() +/*p:foo*/var b: /*p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B = /*p:bar p:baz(B) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/baz./*p:baz*/B() -/*p:foo*/fun function(p: /*p:foo p:bar*/B): /*p:foo p:bar*/B /*p:kotlin(Nothing)*/{ - /*p:foo p:bar(A)*/a +/*p:foo*/fun function(p: /*p:bar p:foo*/B): /*p:bar p:foo*/B /*p:kotlin(Nothing)*/{ + /*p:bar(A) p:foo*/a /*p:kotlin(Nothing)*/return /*p:bar p:foo*/B() } -/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:kotlin*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ - /*c:foo.MyClass c:foo.MyClass(getB) p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang p:baz(B)*/b - /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:foo p:bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/MyClass() +/*p:foo*/fun /*p:foo*/MyClass.extFunc(p: /**p:foo p:bar*//*p:foo p:kotlin*/Array, e: /*p:foo*/MyEnum, c: /**???*//*p:baz*/C): /*p:foo*/MyInterface /*p:kotlin(Nothing)*/{ + /*c:foo.MyClass c:foo.MyClass(getB) p:bar p:baz(B) p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/b + /*p:kotlin(Nothing)*/return /*c:foo.MyClass p:bar p:foo p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/MyClass() } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt index ac2ea2093d3..dc184a951f9 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/KotlinClass.kt @@ -4,5 +4,5 @@ package foo /*p:foo*/class KotlinClass : /*p:*/JavaClass() { override fun getFoo() = /*p:kotlin(Int)*/2 - fun setFoo(i: /*c:foo.KotlinClass c:JavaClass p:foo p:kotlin*/Int) {} + fun setFoo(i: /*c:JavaClass c:foo.KotlinClass p:foo p:kotlin*/Int) {} } diff --git a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt index d7fa1bf33b3..89e840a6800 100644 --- a/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt +++ b/jps/jps-plugin/testData/incremental/lookupTracker/jvm/syntheticProperties/usages.kt @@ -8,23 +8,23 @@ package foo.bar val k = /*p:foo*/KotlinClass() /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass*/getFoo() - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSetFoo) c:JavaClass(getSETFoo) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/setFoo(2) - /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 - /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFoo) c:JavaClass(getFOO) c:JavaClass(setFoo)*/foo - /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar - /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBar) c:JavaClass(getBAR) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/bazBaz - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBazBaz) c:JavaClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/bazBaz = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getSETFoo) c:JavaClass(getSetFoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/setFoo(2) + /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFOO) c:JavaClass(getFoo) c:JavaClass(setFoo)*/foo = /*p:kotlin(Int)*/2 + /*p:(JavaClass) p:kotlin(Int)*/j./*c:JavaClass c:JavaClass(getFOO) c:JavaClass(getFoo) c:JavaClass(setFoo)*/foo + /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBAR) c:JavaClass(getBar) c:JavaClass(setBar)*/bar + /*p:(JavaClass) p:kotlin(String)*/j./*c:JavaClass c:JavaClass(getBAR) c:JavaClass(getBar) c:JavaClass(setBar)*/bar = /*p:kotlin(String)*/"" + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBAZBaz) c:JavaClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBAZBaz) c:JavaClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz = /*p:kotlin(String)*/"" /*p:(JavaClass)*/j./*c:JavaClass*/setBoo(2) - /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBoo) c:JavaClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang*/boo = /*p:kotlin(Int)*/2 - /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:JavaClass*/getFoo() // getFoo may be an inner class in JavaClass - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setFoo(2) - /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 - /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFoo) c:foo.KotlinClass(getFOO) c:foo.KotlinClass(setFoo)*/foo - /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar - /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBar) c:foo.KotlinClass(getBAR) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang c:JavaClass*/bazBaz - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBazBaz) c:foo.KotlinClass(getBAZBaz) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang c:JavaClass*/bazBaz = /*p:kotlin(String)*/"" - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:JavaClass*/setBoo(2) - /*p:foo(KotlinClass)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBoo) c:foo.KotlinClass(getBOO) p:foo.bar p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.ranges p:kotlin.sequences p:kotlin.text p:kotlin.io p:kotlin.comparisons p:kotlin.jvm p:java.lang c:JavaClass*/boo = /*p:kotlin(Int)*/2 + /*p:(JavaClass)*/j./*c:JavaClass c:JavaClass(getBOO) c:JavaClass(getBoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/boo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:JavaClass c:foo.KotlinClass*/getFoo() // getFoo may be an inner class in JavaClass + /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass*/setFoo(2) + /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFOO) c:foo.KotlinClass(getFoo) c:foo.KotlinClass(setFoo)*/foo = /*p:kotlin(Int)*/2 + /*p:foo(KotlinClass) p:kotlin(Int)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getFOO) c:foo.KotlinClass(getFoo) c:foo.KotlinClass(setFoo)*/foo + /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBAR) c:foo.KotlinClass(getBar) c:foo.KotlinClass(setBar)*/bar + /*p:foo(KotlinClass) p:kotlin(String)*/k./*c:foo.KotlinClass c:foo.KotlinClass(getBAR) c:foo.KotlinClass(getBar) c:foo.KotlinClass(setBar)*/bar = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBAZBaz) c:foo.KotlinClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz + /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBAZBaz) c:foo.KotlinClass(getBazBaz) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/bazBaz = /*p:kotlin(String)*/"" + /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass*/setBoo(2) + /*p:foo(KotlinClass)*/k./*c:JavaClass c:foo.KotlinClass c:foo.KotlinClass(getBOO) c:foo.KotlinClass(getBoo) p:foo.bar p:java.lang p:kotlin p:kotlin.annotation p:kotlin.collections p:kotlin.comparisons p:kotlin.io p:kotlin.jvm p:kotlin.ranges p:kotlin.sequences p:kotlin.text*/boo = /*p:kotlin(Int)*/2 } From 62a9ad72187d99486aab5b444abeff0dc5ab12e1 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Wed, 17 Jun 2020 18:13:09 +0300 Subject: [PATCH 1514/1557] Check for native-shared source-sets properly during facet import Otherwise they are detected as common source-sets, thus getting K2MetadataCompilerArguments (instead of FakeK2NativeCompilerArguments), and the 'applyCompilerArgumentsToFacets' will fail due to check on javaClass equality ^KT-39657 Fixed Original commit: 5b48845dfa8501a88eb3daa130aee347362b8047 --- .../kotlin/config/facetSerialization.kt | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index 22624066174..7ef201a8c88 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -18,8 +18,10 @@ import org.jetbrains.kotlin.platform.* import org.jetbrains.kotlin.platform.impl.FakeK2NativeCompilerArguments import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind import org.jetbrains.kotlin.platform.js.JsPlatform +import org.jetbrains.kotlin.platform.js.isJs import org.jetbrains.kotlin.platform.jvm.JdkPlatform import org.jetbrains.kotlin.platform.jvm.JvmPlatform +import org.jetbrains.kotlin.platform.jvm.isJvm import org.jetbrains.kotlin.platform.konan.* import java.lang.reflect.Modifier import kotlin.reflect.KClass @@ -32,16 +34,16 @@ private fun Element.getOptionValue(name: String) = getOption(name)?.getAttribute private fun Element.getOptionBody(name: String) = getOption(name)?.children?.firstOrNull() fun TargetPlatform.createArguments(init: (CommonCompilerArguments).() -> Unit = {}): CommonCompilerArguments { - return when (val singlePlatform = singleOrNull()) { - null -> K2MetadataCompilerArguments().apply { init() } - is JvmPlatform -> K2JVMCompilerArguments().apply { + return when { + isCommon() -> K2MetadataCompilerArguments().apply { init() } + isJvm() -> K2JVMCompilerArguments().apply { init() // TODO(dsavvinov): review this - jvmTarget = (singlePlatform as? JdkPlatform)?.targetVersion?.description ?: JvmTarget.DEFAULT.description + jvmTarget = (single() as? JdkPlatform)?.targetVersion?.description ?: JvmTarget.DEFAULT.description } - is JsPlatform -> K2JSCompilerArguments().apply { init() } - is NativePlatform -> FakeK2NativeCompilerArguments().apply { init() } - else -> error("Unknown platform $singlePlatform") + isJs() -> K2JSCompilerArguments().apply { init() } + isNative() -> FakeK2NativeCompilerArguments().apply { init() } + else -> error("Unknown platform $this") } } From b11a0d3fc602750904f3df470ce10850e95a9b3e Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Fri, 19 Jun 2020 14:47:21 +0300 Subject: [PATCH 1515/1557] [KLIB IC] Add test about incremental kotlin-js-stdlib-klib recompliation Original commit: cc818025dfb8455e29113740bd8040664e2040fe --- .../build/IncrementalJvmJpsTestGenerated.java | 18 ++++++++++++++++++ .../interfaceAnyMethods/B.kt | 2 ++ .../interfaceAnyMethods/B.kt.touch | 0 .../interfaceAnyMethods/D.kt | 4 ++++ .../interfaceAnyMethods/build.log | 13 +++++++++++++ .../interfaceAnyMethods/use.kt | 2 ++ .../interfaceAnyMethods/use.kt.touch | 0 7 files changed, 39 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt create mode 100644 jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index 8f6dc896138..1970a40fd73 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -3015,6 +3015,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged/"); } + @TestMetadata("interfaceAnyMethods") + public void testInterfaceAnyMethods() throws Exception { + runTest("jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/"); + } + @TestMetadata("lambdaParameterAffected") public void testLambdaParameterAffected() throws Exception { runTest("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected/"); @@ -3386,6 +3391,19 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } } + @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InterfaceAnyMethods extends AbstractIncrementalJvmJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInInterfaceAnyMethods() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods"), Pattern.compile("^([^\\.]+)$"), null, true); + } + } + @TestMetadata("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt new file mode 100644 index 00000000000..f002bdf5252 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt @@ -0,0 +1,2 @@ + +interface B \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/B.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt new file mode 100644 index 00000000000..e984e7e1d44 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/D.kt @@ -0,0 +1,4 @@ + +class D : B { + override fun toString(): String = "D" +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log new file mode 100644 index 00000000000..ba50888ce57 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log @@ -0,0 +1,13 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/B.class + out/production/module/test/UseKt.class +End of files +Compiling files: + src/B.kt + src/use.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt new file mode 100644 index 00000000000..589df1ee064 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt @@ -0,0 +1,2 @@ + +fun use(): String = D().toString() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/use.kt.touch new file mode 100644 index 00000000000..e69de29bb2d From e9abd4dbf7190b31f96c3fa5031284d4abf4b964 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 17 Jun 2020 15:30:18 +0300 Subject: [PATCH 1516/1557] JVM: Generate object and companion object INSTANCE fields as @NotNull Original commit: e9231b56247dc8c30cf10c927bc1470b87c9ede3 --- .../classHierarchyAffected/interfaceAnyMethods/build.log | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log index ba50888ce57..b8c9f9cc3d8 100644 --- a/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log +++ b/jps/jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods/build.log @@ -1,9 +1,9 @@ ================ Step #1 ================= Cleaning output files: + out/production/module/B.class out/production/module/META-INF/module.kotlin_module - out/production/module/test/B.class - out/production/module/test/UseKt.class + out/production/module/UseKt.class End of files Compiling files: src/B.kt From 50725dcde264eb476c01e12cfbc5a8a840ea1152 Mon Sep 17 00:00:00 2001 From: Denis Zharkov Date: Tue, 30 Jun 2020 18:17:17 +0300 Subject: [PATCH 1517/1557] Fix incremental compilation for calls to inner classes from supertypes The problem became actual after bba1c88c8e634b707bb39522129d226add3fa90d Original commit: 3ce980fd88a5ce93022f838ae71d209a0c3d08b4 --- .../jps/build/IncrementalJvmJpsTestGenerated.java | 5 +++++ .../pureKotlin/innerClassesFromSupertypes/a.kt | 7 +++++++ .../pureKotlin/innerClassesFromSupertypes/b.kt | 6 ++++++ .../pureKotlin/innerClassesFromSupertypes/b.kt.touch | 0 .../pureKotlin/innerClassesFromSupertypes/build.log | 11 +++++++++++ .../pureKotlin/innerClassesFromSupertypes/usage.kt | 5 +++++ 6 files changed, 34 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index 1970a40fd73..ce4a23d642c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -979,6 +979,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps-plugin/testData/incremental/pureKotlin/inlineUsedWhereDeclared/"); } + @TestMetadata("innerClassesFromSupertypes") + public void testInnerClassesFromSupertypes() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/"); + } + @TestMetadata("internalClassChanged") public void testInternalClassChanged() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/internalClassChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt new file mode 100644 index 00000000000..32726120030 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/a.kt @@ -0,0 +1,7 @@ +package test + +abstract class A { + inner class Inner(val x: String) +} +abstract class B : A() + diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt new file mode 100644 index 00000000000..77288668a6a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt @@ -0,0 +1,6 @@ +// TODO add var +package test + +class C : B() { + val i = Inner("") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/b.kt.touch new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log new file mode 100644 index 00000000000..0af690511c3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/build.log @@ -0,0 +1,11 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/C.class +End of files +Compiling files: + src/b.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt new file mode 100644 index 00000000000..7549d739908 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/innerClassesFromSupertypes/usage.kt @@ -0,0 +1,5 @@ +package test + +fun main() { + C().i.x +} From 0344ff9da7d6a41a3a792e6d3429285ee6e00cb1 Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Wed, 24 Jun 2020 15:05:01 +0300 Subject: [PATCH 1518/1557] Refactoring: mark const strings with const keyword Original commit: 4e65b2fb9ed0b1fc268d41e5b7c3e68cecdb13fa --- .../config/moduleSourceRootPropertiesSerializers.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/moduleSourceRootPropertiesSerializers.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/moduleSourceRootPropertiesSerializers.kt index 9ae08088253..f9b1c3d4b66 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/moduleSourceRootPropertiesSerializers.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/moduleSourceRootPropertiesSerializers.kt @@ -16,10 +16,10 @@ import org.jetbrains.jps.model.serialization.module.JpsModuleSourceRootPropertie private const val IS_GENERATED_ATTRIBUTE = "generated" private const val RELATIVE_OUTPUT_PATH_ATTRIBUTE = "relativeOutputPath" -val KOTLIN_SOURCE_ROOT_TYPE_ID = "kotlin-source" -val KOTLIN_TEST_ROOT_TYPE_ID = "kotlin-test" -val KOTLIN_RESOURCE_ROOT_TYPE_ID = "kotlin-resource" -val KOTLIN_TEST_RESOURCE_ROOT_TYPE_ID = "kotlin-test-resource" +const val KOTLIN_SOURCE_ROOT_TYPE_ID = "kotlin-source" +const val KOTLIN_TEST_ROOT_TYPE_ID = "kotlin-test" +const val KOTLIN_RESOURCE_ROOT_TYPE_ID = "kotlin-resource" +const val KOTLIN_TEST_RESOURCE_ROOT_TYPE_ID = "kotlin-test-resource" // Based on org.jetbrains.jps.model.serialization.java.JpsJavaModelSerializerExtension.JavaSourceRootPropertiesSerializer class sealed class KotlinSourceRootPropertiesSerializer( From c818141d159af97100a6bcd078dce765a8c16f7a Mon Sep 17 00:00:00 2001 From: Nikita Bobko Date: Wed, 24 Jun 2020 15:08:18 +0300 Subject: [PATCH 1519/1557] 202: Fix `KotlinJpsBuildTest` tests Test failure was caused by "replace custom source root types to a special 'unknown' type and back on plugin unload/load (IDEA-235292)" in intellij. We override `getModuleSourceRootPropertiesSerializers` in `KotlinModelSerializerService` by inheriting from `KotlinCommonJpsModelSerializerExtension` Original commit: 6985c5fd2a0b1f099607b37392233c88beb60562 --- .../org/jetbrains/kotlin/jps/model/Serializer.kt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt index bf198262e46..01f47614d54 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/model/Serializer.kt @@ -10,17 +10,16 @@ import org.jdom.Element import org.jetbrains.jps.model.JpsElement import org.jetbrains.jps.model.JpsProject import org.jetbrains.jps.model.module.JpsModule -import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer -import org.jetbrains.kotlin.cli.common.arguments.* -import org.jetbrains.kotlin.config.CompilerSettings -import org.jetbrains.kotlin.config.SettingConstants -import org.jetbrains.kotlin.config.deserializeFacetSettings -import org.jetbrains.kotlin.config.serializeFacetSettings +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JSCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.setApiVersionToLanguageVersionIfNeeded +import org.jetbrains.kotlin.config.* import java.util.* -class KotlinModelSerializerService : JpsModelSerializerExtension() { +class KotlinModelSerializerService : KotlinCommonJpsModelSerializerExtension() { override fun getProjectExtensionSerializers() = listOf( KotlinCommonCompilerArgumentsSerializer(), Kotlin2JvmCompilerArgumentsSerializer(), From b154f74b9901bf49684af1230dd523fddbfc941a Mon Sep 17 00:00:00 2001 From: Georgy Bronnikov Date: Mon, 29 Jun 2020 14:14:27 +0300 Subject: [PATCH 1520/1557] JVM_IR: avoid descriptors when tracking inline properties Preparing to use wrapped properties in InlineCodegen. Original commit: 8e24256f95c71417c2a9b536c3cc8f5b5c12985f --- .../build/IncrementalJvmJpsTestGenerated.java | 18 +++++++++++++++ .../build.log | 22 +++++++++++++++++++ .../inlineFunctionWithJvmNameInClass/dummy.kt | 3 +++ .../inline.kt | 8 +++++++ .../inline.kt.new.1 | 8 +++++++ .../inlineFunctionWithJvmNameInClass/usage.kt | 3 +++ 6 files changed, 62 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index ce4a23d642c..8c4310c99cf 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -2139,6 +2139,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded/"); } + @TestMetadata("inlineFunctionWithJvmNameInClass") + public void testInlineFunctionWithJvmNameInClass() throws Exception { + runTest("jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/"); + } + @TestMetadata("inlineTopLevelFunctionWithJvmName") public void testInlineTopLevelFunctionWithJvmName() throws Exception { runTest("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName/"); @@ -2332,6 +2337,19 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } } + @TestMetadata("jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InlineFunctionWithJvmNameInClass extends AbstractIncrementalJvmJpsTest { + private void runTest(String testDataFilePath) throws Exception { + KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + } + + public void testAllFilesPresentInInlineFunctionWithJvmNameInClass() throws Exception { + KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass"), Pattern.compile("^([^\\.]+)$"), null, true); + } + } + @TestMetadata("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log new file mode 100644 index 00000000000..bc7a894621c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/A.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt new file mode 100644 index 00000000000..789dc274f72 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/dummy.kt @@ -0,0 +1,3 @@ +package test + +fun dummy() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt new file mode 100644 index 00000000000..5907d8b0e38 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt @@ -0,0 +1,8 @@ +package inline + +class A { + var z = 0 + + @JvmName("fff") + inline fun f(): Int = 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1 new file mode 100644 index 00000000000..4e545bd9b8d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/inline.kt.new.1 @@ -0,0 +1,8 @@ +package inline + +class A { + var z = 0 + + @JvmName("fff") + inline fun f(): Int = 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt new file mode 100644 index 00000000000..8a4446e2094 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass/usage.kt @@ -0,0 +1,3 @@ +package usage + +fun use() = inline.A().f() \ No newline at end of file From c62a04d277fd5d234a0d1963209f5cb65192c8c6 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 31 Aug 2020 16:44:42 +0300 Subject: [PATCH 1521/1557] Move BuiltinSpecialProperties and JvmAbi to :core:compiler.common.jvm Original commit: 64ec3fc42b8a53805ac55c33bfcf85205ecfd288 --- .../src/org/jetbrains/kotlin/config/facetSerialization.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index 7ef201a8c88..ecdd0128898 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -17,10 +17,8 @@ import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.platform.* import org.jetbrains.kotlin.platform.impl.FakeK2NativeCompilerArguments import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind -import org.jetbrains.kotlin.platform.js.JsPlatform import org.jetbrains.kotlin.platform.js.isJs import org.jetbrains.kotlin.platform.jvm.JdkPlatform -import org.jetbrains.kotlin.platform.jvm.JvmPlatform import org.jetbrains.kotlin.platform.jvm.isJvm import org.jetbrains.kotlin.platform.konan.* import java.lang.reflect.Modifier From 3f401214cd0ba9f8169c88a57e757b2425889f77 Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Mon, 21 Sep 2020 21:46:31 +0300 Subject: [PATCH 1522/1557] HMPP: Avoid NPE during Kotlin facet serialization ^KT-42029 Original commit: f0cbd6b1a540bcd14fe94a83c8e473fdad25d4bd --- .../src/org/jetbrains/kotlin/config/facetSerialization.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index ecdd0128898..f1d770d423c 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -111,7 +111,7 @@ fun Element.getFacetPlatformByConfigurationElement(): TargetPlatform { if (targetPlatform != null) return targetPlatform // failed to read list of all platforms. Fallback to legacy algorithm - val platformName = getAttributeValue("platform") as String + val platformName = getAttributeValue("platform") ?: return DefaultIdeTargetPlatformKindProvider.defaultPlatform return CommonPlatforms.allSimplePlatforms.firstOrNull { // first, look for exact match through all simple platforms From 6bf31a7ac95c008154a9ef3637936f8a1d004b5f Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 31 Aug 2020 20:15:39 +0300 Subject: [PATCH 1523/1557] as42: Apply 201 <-> AS41 diff Original commit: 2df030f583a8666855732a7efedc4fb49834b86c --- .../jetbrains/kotlin/jps/build/ideaPlatform.kt.as42 | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as42 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as42 b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as42 new file mode 100644 index 00000000000..6546b2059d2 --- /dev/null +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as42 @@ -0,0 +1,13 @@ +/* + * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.jps.build + +import org.jetbrains.jps.incremental.CompileContext +import org.jetbrains.jps.incremental.messages.CompilerMessage + +fun jpsReportInternalBuilderError(context: CompileContext, error: Throwable) { + KotlinBuilder.LOG.info(error) +} \ No newline at end of file From 514a792e75e71d2c0cdc21b8203573e7f8eb7cac Mon Sep 17 00:00:00 2001 From: "nataliya.valtman" Date: Fri, 2 Oct 2020 13:43:20 +0300 Subject: [PATCH 1524/1557] KT-34862 use relative path for incremental build cache Original commit: e1a380ec95b3ad1d92f18254b30bbcdc3edf1f21 --- .../src/org/jetbrains/kotlin/jps/incremental/local.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt index 2d5b915f069..6f51a4e29b3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/local.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.jps.incremental import java.io.File -private val NORMAL_VERSION = 13 +private val NORMAL_VERSION = 14 private val NORMAL_VERSION_FILE_NAME = "format-version.txt" fun localCacheVersionManager(dataRoot: File, isCachesEnabled: Boolean) = From 132538e017f37db1d744df6393e942dbd5318bc9 Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Mon, 2 Mar 2020 14:26:49 +0300 Subject: [PATCH 1525/1557] Add IC metrics reporting Original commit: 36387d97ad14d39a6303499f3eb93bc221756686 --- .../src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 887425b0058..d0b97301a60 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -42,7 +42,7 @@ import org.jetbrains.kotlin.daemon.common.isDaemonEnabled import org.jetbrains.kotlin.incremental.* import org.jetbrains.kotlin.incremental.components.ExpectActualTracker import org.jetbrains.kotlin.incremental.components.LookupTracker -import org.jetbrains.kotlin.incremental.ICReporterBase +import org.jetbrains.kotlin.build.report.ICReporterBase import org.jetbrains.kotlin.jps.incremental.JpsIncrementalCache import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageManager import org.jetbrains.kotlin.jps.model.kotlinKind From ac5da460047b1b17f765135e7e3805d3ac1db9b1 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Fri, 6 Nov 2020 02:53:05 +0300 Subject: [PATCH 1526/1557] Cleanup 193 compatibility fixes Original commit: 3feff16a774b7a7e91b27db9f2e1245e349f8b7f --- jps/jps-plugin/build.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jps/jps-plugin/build.gradle.kts b/jps/jps-plugin/build.gradle.kts index 2bb19dede65..de19db01850 100644 --- a/jps/jps-plugin/build.gradle.kts +++ b/jps/jps-plugin/build.gradle.kts @@ -44,9 +44,7 @@ dependencies { testRuntime(project(it)) } - Platform[192].orHigher { - testRuntimeOnly(intellijPluginDep("java")) - } + testRuntimeOnly(intellijPluginDep("java")) testRuntimeOnly(toolsJar()) testRuntime(project(":kotlin-reflect")) From 2746242fbcdc910da968f34e539d518f29840bb4 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Sat, 14 Nov 2020 09:50:43 +0300 Subject: [PATCH 1527/1557] Use NIO Files for creating temp files: build tools Original commit: c9bbdf6575a37d46ac5994e709c3458be8352319 --- .../jps/targets/KotlinJvmModuleBuildTarget.kt | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt index f8faf7a0149..2464d4f46f3 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/targets/KotlinJvmModuleBuildTarget.kt @@ -46,6 +46,9 @@ import org.jetbrains.kotlin.utils.keysToMap import org.jetbrains.org.objectweb.asm.ClassReader import java.io.File import java.io.IOException +import java.nio.file.Files +import java.nio.file.Path +import java.nio.file.Paths private const val JVM_BUILD_META_INFO_FILE_NAME = "jvm-build-meta-info.txt" @@ -242,14 +245,18 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB append("-test") } } - val dir = System.getProperty("kotlin.jps.dir.for.module.files")?.let { File(it) }?.takeIf { it.isDirectory } + + fun createTempFile(dir: Path?, prefix: String?, suffix: String?): Path = + if (dir != null) Files.createTempFile(dir, prefix, suffix) else Files.createTempFile(prefix, suffix) + + val dir = System.getProperty("kotlin.jps.dir.for.module.files")?.let { Paths.get(it) }?.takeIf { Files.isDirectory(it) } return try { - File.createTempFile("kjps", readableSuffix + ".script.xml", dir) + createTempFile(dir, "kjps", readableSuffix + ".script.xml") } catch (e: IOException) { // sometimes files cannot be created, because file name is too long (Windows, Mac OS) // see https://bugs.openjdk.java.net/browse/JDK-8148023 try { - File.createTempFile("kjps", ".script.xml", dir) + createTempFile(dir, "kjps", ".script.xml") } catch (e: IOException) { val message = buildString { append("Could not create module file when building chunk $chunk") @@ -259,7 +266,7 @@ class KotlinJvmModuleBuildTarget(kotlinContext: KotlinCompileContext, jpsModuleB } throw RuntimeException(message, e) } - } + }.toFile() } private fun findClassPathRoots(): Collection { From f9b0bd47921ea2ae1807a8b475423c97ec390419 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 16 Nov 2020 08:30:04 +0300 Subject: [PATCH 1528/1557] Use new kotlin.io.path API in tests Original commit: b2b2629e7946bbb91a040ed4da643769e4ce034e --- .../jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt index e20a4493e95..7eda8ebed38 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/RelocatableJpsCachesTest.kt @@ -15,16 +15,19 @@ import org.jetbrains.kotlin.incremental.testingUtils.assertEqualDirectories import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture import org.jetbrains.kotlin.jps.incremental.KotlinDataContainerTarget import java.io.File +import kotlin.io.path.ExperimentalPathApi +import kotlin.io.path.createTempDirectory import kotlin.reflect.KFunction1 class RelocatableJpsCachesTest : BaseKotlinJpsBuildTestCase() { private val enableICFixture = EnableICFixture() private lateinit var workingDir: File + @OptIn(ExperimentalPathApi::class) override fun setUp() { super.setUp() enableICFixture.setUp() - workingDir = createTempDir("RelocatableJpsCachesTest", getTestName(false)) + workingDir = createTempDirectory("RelocatableJpsCachesTest-" + getTestName(false)).toFile() } override fun tearDown() { From 5cf686b1a56552305007bb5c67ba55b5a7c82b9d Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Sat, 28 Nov 2020 14:25:19 +0300 Subject: [PATCH 1529/1557] Switch to 202 platform Original commit: eeb9b3214c27d189bf4534c6d651a788c829e8ff --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 1 - ...rementalJpsTest.kt.202 => AbstractIncrementalJpsTest.kt.201} | 1 + .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- .../{KotlinJpsBuildTest.kt.202 => KotlinJpsBuildTest.kt.201} | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/{AbstractIncrementalJpsTest.kt.202 => AbstractIncrementalJpsTest.kt.201} (99%) rename jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/{KotlinJpsBuildTest.kt.202 => KotlinJpsBuildTest.kt.201} (99%) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 7da9b6c9102..ae59ed0dab8 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -172,7 +172,6 @@ abstract class AbstractIncrementalJpsTest( BuilderRegistry.getInstance(), myBuildParams, CanceledStatus.NULL, - mockConstantSearch, true ) val buildResult = BuildResult() diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.202 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 similarity index 99% rename from jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.202 rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 index ae59ed0dab8..7da9b6c9102 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.202 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 @@ -172,6 +172,7 @@ abstract class AbstractIncrementalJpsTest( BuilderRegistry.getInstance(), myBuildParams, CanceledStatus.NULL, + mockConstantSearch, true ) val buildResult = BuildResult() diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index e78ecb115c4..3e158535610 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -1009,7 +1009,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { descriptor.setupProject() try { - val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), this.myBuildParams, canceledStatus, null, true) + val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), this.myBuildParams, canceledStatus, true) builder.addMessageHandler(buildResult) builder.build(scopeBuilder.build(), false) } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 similarity index 99% rename from jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 rename to jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 index 3e158535610..e78ecb115c4 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.202 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 @@ -1009,7 +1009,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { descriptor.setupProject() try { - val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), this.myBuildParams, canceledStatus, true) + val builder = IncProjectBuilder(descriptor, BuilderRegistry.getInstance(), this.myBuildParams, canceledStatus, null, true) builder.addMessageHandler(buildResult) builder.build(scopeBuilder.build(), false) } From 6dfc26f4ab6efdf03e0882c35895097f5655edb2 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 20 Nov 2020 11:16:20 +0300 Subject: [PATCH 1530/1557] Build: remove useless .as40 files Original commit: 986ab9cb54834dba400e7de9530a6a6517f5279b --- .../jetbrains/kotlin/jps/build/ideaPlatform.kt.as40 | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as40 diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as40 b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as40 deleted file mode 100644 index 6546b2059d2..00000000000 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/ideaPlatform.kt.as40 +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors. - * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. - */ - -package org.jetbrains.kotlin.jps.build - -import org.jetbrains.jps.incremental.CompileContext -import org.jetbrains.jps.incremental.messages.CompilerMessage - -fun jpsReportInternalBuilderError(context: CompileContext, error: Throwable) { - KotlinBuilder.LOG.info(error) -} \ No newline at end of file From 44c925f17a563a282bf6c63681f145ce3062e4df Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 1 Dec 2020 16:08:08 +0300 Subject: [PATCH 1531/1557] Fix Daemon compiler tests on Windows In 202 platform tearDown tries to remove temporary directory, but this fails on Windows, because while Daemon is active directory can't be deleted. Original commit: 2ffedd273112830d8863d4d60c125b8aa45bc539 --- .../build/KotlinJpsBuildTestIncremental.kt | 25 +++----------- .../jps/build/SimpleKotlinJpsBuildTest.kt | 16 ++++----- .../kotlin/jps/build/testingUtils.kt | 34 +++++++++++++++++++ .../compilerRunner/JpsKotlinCompilerRunner.kt | 10 ++++++ 4 files changed, 55 insertions(+), 30 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt index dba6e9a38d1..7ce1a6b3bd8 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestIncremental.kt @@ -16,23 +16,16 @@ package org.jetbrains.kotlin.jps.build -import com.intellij.openapi.util.io.FileUtil -import org.jetbrains.jps.builders.CompileScopeTestBuilder -import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.jps.builders.JpsBuildTestCase -import org.jetbrains.jps.builders.logging.BuildLoggingManager +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner import org.jetbrains.kotlin.config.LanguageVersion -import kotlin.reflect.KMutableProperty1 -import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS -import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_ENABLED_PROPERTY import org.jetbrains.kotlin.daemon.common.isDaemonEnabled -import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments import org.jetbrains.kotlin.jps.model.kotlinCompilerArguments -import org.junit.Assert import java.io.File +import kotlin.reflect.KMutableProperty1 class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() { private val enableICFixture = EnableICFixture() @@ -77,19 +70,11 @@ class KotlinJpsBuildTestIncremental : KotlinJpsBuildTest() { assertCompiled(KotlinBuilder.KOTLIN_BUILDER_NAME, "src/main.kt", "src/Foo.kt") } - val daemonHome = FileUtil.createTempDirectory("daemon-home", "testJpsDaemonIC") - try { - withSystemProperty(COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS, daemonHome.absolutePath) { - withSystemProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "true") { - withSystemProperty(JpsKotlinCompilerRunner.FAIL_ON_FALLBACK_PROPERTY, "true") { - testImpl() - } - } + withDaemon { + withSystemProperty(JpsKotlinCompilerRunner.FAIL_ON_FALLBACK_PROPERTY, "true") { + testImpl() } } - finally { - daemonHome.deleteRecursively() - } } fun testManyFiles() { diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 8c915775fa6..7e98717ba8b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -16,11 +16,11 @@ package org.jetbrains.kotlin.jps.build -import com.intellij.openapi.util.io.FileUtil import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner -import org.jetbrains.kotlin.daemon.common.* +import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY +import org.jetbrains.kotlin.daemon.common.OSKind import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File @@ -68,14 +68,10 @@ class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { // TODO: add JS tests fun testDaemon() { - val daemonHome = FileUtil.createTempDirectory("daemon-home", "testJpsDaemonIC") - - withSystemProperty(COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS, daemonHome.absolutePath) { - withSystemProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "true") { - withSystemProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "true") { - withSystemProperty(JpsKotlinCompilerRunner.FAIL_ON_FALLBACK_PROPERTY, "true") { - testLoadingKotlinFromDifferentModules() - } + withDaemon { + withSystemProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "true") { + withSystemProperty(JpsKotlinCompilerRunner.FAIL_ON_FALLBACK_PROPERTY, "true") { + testLoadingKotlinFromDifferentModules() } } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt index a5b77e06594..6b2feb62b5d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt @@ -16,6 +16,11 @@ package org.jetbrains.kotlin.jps.build +import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner +import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS +import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_ENABLED_PROPERTY + inline fun withSystemProperty(property: String, newValue: String?, fn: ()->Unit) { val backup = System.getProperty(property) setOrClearSysProperty(property, newValue) @@ -37,4 +42,33 @@ inline fun setOrClearSysProperty(property: String, newValue: String?) { else { System.clearProperty(property) } +} + +fun withDaemon(fn: () -> Unit) { + val daemonHome = FileUtil.createTempDirectory("daemon-home", "testJpsDaemonIC") + + withSystemProperty(COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS, daemonHome.absolutePath) { + withSystemProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "true") { + try { + fn() + } finally { + JpsKotlinCompilerRunner.shutdownDaemon() + + // Try to force directory deletion to prevent test failure later in tearDown(). + // Working Daemon can prevent folder deletion on Windows, because Daemon shutdown + // is asynchronous. + var attempts = 0 + daemonHome.deleteRecursively() + while (daemonHome.exists() && attempts < 100) { + daemonHome.deleteRecursively() + attempts++ + Thread.sleep(50) + } + + if (daemonHome.exists()) { + error("Couldn't delete Daemon home directory") + } + } + } + } } \ No newline at end of file diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index 5088cfe0fc3..e2d6d835f94 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -54,6 +54,16 @@ class JpsKotlinCompilerRunner { private var _jpsCompileServiceSession: CompileServiceSession? = null @TestOnly + fun shutdownDaemon() { + _jpsCompileServiceSession?.let { + try { + it.compileService.shutdown() + } catch (_: Throwable) { + } + } + _jpsCompileServiceSession = null + } + fun releaseCompileServiceSession() { _jpsCompileServiceSession?.let { try { From b7607688facd7b0aeb4d36e01b513e8f2944af59 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 3 Dec 2020 19:42:56 +0300 Subject: [PATCH 1532/1557] Minor: use unique temp directories in jps-build tests Original commit: 2d8bdcbc9b98e1af6f9a06857f406c687f212fd7 --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 +- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 | 2 +- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index ae59ed0dab8..e5144af90b6 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -300,7 +300,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun doTest(testDataPath: String) { testDataDir = File(testDataPath) - workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) + workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "aijt-jps-build", null) val buildLogFile = buildLogFinder.findBuildLog(testDataDir) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 index 7da9b6c9102..53c501a11f0 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 @@ -301,7 +301,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun doTest(testDataPath: String) { testDataDir = File(testDataPath) - workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "jps-build", null) + workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "aijt-jps-build", null) val buildLogFile = buildLogFinder.findBuildLog(testDataDir) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt index 05e2fa1ec51..eae51a0d386 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTestBase.kt @@ -33,7 +33,7 @@ abstract class KotlinJpsBuildTestBase : AbstractKotlinJpsBuildTestCase() { protected open fun copyTestDataToTmpDir(testDataDir: File): File { assert(testDataDir.exists()) { "Cannot find source folder " + testDataDir.absolutePath } - val tmpDir = FileUtil.createTempDirectory("jps-build", null) + val tmpDir = FileUtil.createTempDirectory("kjbtb-jps-build", null) FileUtil.copyDir(testDataDir, tmpDir) return tmpDir } From 0b5725e656143aadc5ba1fed71d27b126a375f52 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 4 Dec 2020 13:57:16 +0300 Subject: [PATCH 1533/1557] Revert "Keep application environment alive between JPS tests" This reverts commit 1f549f32 The revert fixes the flaky behaviour on Windows in jps-plugin tests. java.lang.RuntimeException: java.nio.file.FileSystemException: tempdir_path\jps-build\jslib-example.jar: The process cannot access the file because it is being used by another process. Can be reproduced when running KotlinJpsBuildTest after IncrementalJsJpsTestGenerated. 1. IncrementalJsJpsTestGenerated sets KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY 2. KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY disables environment clean-up. 3. No disposeApplicationEnvironment() call also means no ZipHandler.clearFileAccessorCache() 4. There's jslib-example.jar opening in JsConfig.checkLibFilesAndReportErrors() 5. File handler is not closed and tests fails in tearDown() Affected tests: KotlinJpsBuildTest.testKotlinJavaScriptProjectWithLibraryCustomOutputDir KotlinJpsBuildTest.testKotlinJavaScriptProjectWithLibraryAndErrors KotlinJpsBuildTest.testKotlinJavaScriptProjectWithLibrary KotlinJpsBuildTest.testKotlinJavaScriptProjectWithLibraryNoCopy KotlinJpsBuildTest.testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithLibraryCustomOutputDir KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithLibraryAndErrors KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithLibrary KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithLibraryNoCopy KotlinJpsBuildTestIncremental.testKotlinJavaScriptProjectWithTwoModulesAndWithLibrary Original commit: 2bf22caeb7c687cd6b54b05b11e5c0f1a3caa07c --- .../jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt | 2 -- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 | 2 -- 2 files changed, 4 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index e5144af90b6..d3b89fa9b2f 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -43,7 +43,6 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil -import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.incremental.LookupSymbol @@ -128,7 +127,6 @@ abstract class AbstractIncrementalJpsTest( enableICFixture.setUp() lookupsDuringTest = hashSetOf() - System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") if (DEBUG_LOGGING_ENABLED) { enableDebugLogging() diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 index 53c501a11f0..1d20b2e2a4d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 @@ -43,7 +43,6 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil -import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments import org.jetbrains.kotlin.incremental.LookupSymbol @@ -128,7 +127,6 @@ abstract class AbstractIncrementalJpsTest( enableICFixture.setUp() lookupsDuringTest = hashSetOf() - System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") if (DEBUG_LOGGING_ENABLED) { enableDebugLogging() From f087ba747a1ac93358549979b684c9954baf672c Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 23 Nov 2020 12:38:55 +0300 Subject: [PATCH 1534/1557] [IC] Add ability to pass additional compiler args to IC tests Additional arguments should be declared in `args.txt` file in test directory in common CLI arguments format Original commit: 3246e6b9ac2a44c6af1578f84d0ab64c209034ec --- .../jps/build/AbstractIncrementalJpsTest.kt | 30 +++++++++++++++++-- .../build/AbstractIncrementalJpsTest.kt.201 | 25 +++++++++++++++- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index d3b89fa9b2f..9d1c9816369 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -15,7 +15,6 @@ */ package org.jetbrains.kotlin.jps.build - import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.io.FileUtil @@ -43,15 +42,22 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil +import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.testingUtils.* import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxtBuilder import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture -import org.jetbrains.kotlin.jps.incremental.* +import org.jetbrains.kotlin.jps.incremental.CacheAttributesDiff +import org.jetbrains.kotlin.jps.incremental.CacheVersionManager +import org.jetbrains.kotlin.jps.incremental.CompositeLookupsCacheAttributesManager +import org.jetbrains.kotlin.jps.incremental.getKotlinCache import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension +import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments import org.jetbrains.kotlin.jps.model.kotlinFacet import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget import org.jetbrains.kotlin.platform.idePlatformKind @@ -77,11 +83,23 @@ abstract class AbstractIncrementalJpsTest( private val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) private val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" + + private const val ARGUMENTS_FILE_NAME = "args.txt" + + private fun parseAdditionalArgs(testDir: File): List { + return File(testDir, ARGUMENTS_FILE_NAME) + .takeIf { it.exists() } + ?.readText() + ?.split(" ", "\n") + ?.filter { it.isNotBlank() } + ?: emptyList() + } } protected lateinit var testDataDir: File protected lateinit var workDir: File protected lateinit var projectDescriptor: ProjectDescriptor + protected lateinit var additionalCommandLineArguments: List // is used to compare lookup dumps in a human readable way (lookup symbols are hashed in an actual lookup storage) protected lateinit var lookupsDuringTest: MutableSet private var isJvmICEnabledBackup: Boolean = false @@ -175,6 +193,9 @@ abstract class AbstractIncrementalJpsTest( val buildResult = BuildResult() builder.addMessageHandler(buildResult) val finalScope = scope.build() + projectDescriptor.project.kotlinCommonCompilerArguments = projectDescriptor.project.kotlinCommonCompilerArguments.apply { + updateCommandLineArguments(this) + } builder.build(finalScope, false) @@ -231,6 +252,10 @@ abstract class AbstractIncrementalJpsTest( return build(null, CompileScopeTestBuilder.rebuild().allModules()) } + private fun updateCommandLineArguments(arguments: CommonCompilerArguments) { + parseCommandLineArguments(additionalCommandLineArguments, arguments) + } + private fun rebuildAndCheckOutput(makeOverallResult: MakeResult) { val outDir = File(getAbsolutePath("out")) val outAfterMake = File(getAbsolutePath("out-after-make")) @@ -299,6 +324,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun doTest(testDataPath: String) { testDataDir = File(testDataPath) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "aijt-jps-build", null) + additionalCommandLineArguments = parseAdditionalArgs(File(testDataPath)) val buildLogFile = buildLogFinder.findBuildLog(testDataDir) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 index 1d20b2e2a4d..94af68daeef 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 @@ -15,7 +15,6 @@ */ package org.jetbrains.kotlin.jps.build - import com.intellij.openapi.Disposable import com.intellij.openapi.util.Disposer import com.intellij.openapi.util.io.FileUtil @@ -43,8 +42,11 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil +import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments +import org.jetbrains.kotlin.cli.common.arguments.parseCommandLineArguments import org.jetbrains.kotlin.incremental.LookupSymbol import org.jetbrains.kotlin.incremental.testingUtils.* import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxt @@ -52,6 +54,7 @@ import org.jetbrains.kotlin.jps.build.dependeciestxt.ModulesTxtBuilder import org.jetbrains.kotlin.jps.build.fixtures.EnableICFixture import org.jetbrains.kotlin.jps.incremental.* import org.jetbrains.kotlin.jps.model.JpsKotlinFacetModuleExtension +import org.jetbrains.kotlin.jps.model.kotlinCommonCompilerArguments import org.jetbrains.kotlin.jps.model.kotlinFacet import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget import org.jetbrains.kotlin.platform.idePlatformKind @@ -77,11 +80,23 @@ abstract class AbstractIncrementalJpsTest( private val TEMP_DIRECTORY_TO_USE = File(FileUtilRt.getTempDirectory()) private val DEBUG_LOGGING_ENABLED = System.getProperty("debug.logging.enabled") == "true" + + private const val ARGUMENTS_FILE_NAME = "args.txt" + + private fun parseAdditionalArgs(testDir: File): List { + return File(testDir, ARGUMENTS_FILE_NAME) + .takeIf { it.exists() } + ?.readText() + ?.split(" ", "\n") + ?.filter { it.isNotBlank() } + ?: emptyList() + } } protected lateinit var testDataDir: File protected lateinit var workDir: File protected lateinit var projectDescriptor: ProjectDescriptor + protected lateinit var additionalCommandLineArguments: List // is used to compare lookup dumps in a human readable way (lookup symbols are hashed in an actual lookup storage) protected lateinit var lookupsDuringTest: MutableSet private var isJvmICEnabledBackup: Boolean = false @@ -176,6 +191,9 @@ abstract class AbstractIncrementalJpsTest( val buildResult = BuildResult() builder.addMessageHandler(buildResult) val finalScope = scope.build() + projectDescriptor.project.kotlinCommonCompilerArguments = projectDescriptor.project.kotlinCommonCompilerArguments.apply { + updateCommandLineArguments(this) + } builder.build(finalScope, false) @@ -232,6 +250,10 @@ abstract class AbstractIncrementalJpsTest( return build(null, CompileScopeTestBuilder.rebuild().allModules()) } + private fun updateCommandLineArguments(arguments: CommonCompilerArguments) { + parseCommandLineArguments(additionalCommandLineArguments, arguments) + } + private fun rebuildAndCheckOutput(makeOverallResult: MakeResult) { val outDir = File(getAbsolutePath("out")) val outAfterMake = File(getAbsolutePath("out-after-make")) @@ -300,6 +322,7 @@ abstract class AbstractIncrementalJpsTest( protected open fun doTest(testDataPath: String) { testDataDir = File(testDataPath) workDir = FileUtilRt.createTempDirectory(TEMP_DIRECTORY_TO_USE, "aijt-jps-build", null) + additionalCommandLineArguments = parseAdditionalArgs(File(testDataPath)) val buildLogFile = buildLogFinder.findBuildLog(testDataDir) Disposer.register(testRootDisposable, Disposable { FileUtilRt.delete(workDir) }) From c1a9eb9d217e0004027209357e7b53874254c29b Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Wed, 9 Dec 2020 17:33:09 +0300 Subject: [PATCH 1535/1557] IC of sealed classes Supported case then children of sealed classes could be declared anywhere in a module. If list of classes implementing sealing class changes the sealed class and all its inheritors should be recompiled (now sealed class should be compiled together with children in order to calculate all possible inheritors at compile time) and and invalidated (as they could have when operators). Original commit: 36f99156fd140f1ef58c7763f88b5bca18926b15 --- .../AbstractProtoComparisonTest.kt | 2 ++ .../kotlin/jps/build/KotlinBuilder.kt | 25 +++++++++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt index 4065354f67c..da16372d4c1 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/AbstractProtoComparisonTest.kt @@ -90,6 +90,8 @@ abstract class AbstractProtoComparisonTest : TestWithWorkingDir() { when (it) { is ChangeInfo.SignatureChanged -> "CLASS_SIGNATURE" is ChangeInfo.MembersChanged -> "MEMBERS\n ${it.names.sorted()}" + is ChangeInfo.ParentsChanged -> "PARENTS\n ${it.parentsChanged.map { it.asString()}.sorted()}" + } }.sorted() diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index d0b97301a60..04afe480d2c 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -250,7 +250,7 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { removedClasses.forEach { changesCollector.collectSignature(FqName(it), areSubclassesAffected = true) } val affectedByRemovedClasses = changesCollector.getDirtyFiles(incrementalCaches.values, kotlinContext.lookupStorageManager) - fsOperations.markFilesForCurrentRound(affectedByRemovedClasses) + fsOperations.markFilesForCurrentRound(affectedByRemovedClasses.dirtyFiles + affectedByRemovedClasses.forceRecompileTogether) } override fun chunkBuildFinished(context: CompileContext, chunk: ModuleChunk) { @@ -695,21 +695,36 @@ private fun ChangesCollector.processChangesUsingLookups( reporter.reportVerbose { "Start processing changes" } val dirtyFiles = getDirtyFiles(allCaches, lookupStorageManager) - fsOperations.markInChunkOrDependents(dirtyFiles.asIterable(), excludeFiles = compiledFiles) + // if list of inheritors of sealed class has changed it should be recompiled with all the inheritors + // Here we have a small optimization. Do not recompile the bunch if ALL these files were recompiled during the previous round. + val excludeFiles = if (compiledFiles.containsAll(dirtyFiles.forceRecompileTogether)) + compiledFiles + else + compiledFiles.minus(dirtyFiles.forceRecompileTogether) + fsOperations.markInChunkOrDependents( + (dirtyFiles.dirtyFiles + dirtyFiles.forceRecompileTogether).asIterable(), + excludeFiles = excludeFiles + ) reporter.reportVerbose { "End of processing changes" } } +data class FilesToRecompile(val dirtyFiles: Set, val forceRecompileTogether: Set) + private fun ChangesCollector.getDirtyFiles( caches: Iterable, lookupStorageManager: JpsLookupStorageManager -): Set { +): FilesToRecompile { val reporter = JpsICReporter() - val (dirtyLookupSymbols, dirtyClassFqNames) = getDirtyData(caches, reporter) + val (dirtyLookupSymbols, dirtyClassFqNames, forceRecompile) = getDirtyData(caches, reporter) val dirtyFilesFromLookups = lookupStorageManager.withLookupStorage { mapLookupSymbolsToFiles(it, dirtyLookupSymbols, reporter) } - return dirtyFilesFromLookups + mapClassesFqNamesToFiles(caches, dirtyClassFqNames, reporter) + return FilesToRecompile( + dirtyFilesFromLookups + mapClassesFqNamesToFiles(caches, dirtyClassFqNames, reporter), + mapClassesFqNamesToFiles(caches, forceRecompile, reporter) + ) + } private fun getLookupTracker(project: JpsProject, representativeTarget: KotlinModuleBuildTarget<*>): LookupTracker { From 780696565d98bf3ac79a640fd4cf43b74c52b940 Mon Sep 17 00:00:00 2001 From: Andrey Uskov Date: Wed, 9 Dec 2020 17:33:51 +0300 Subject: [PATCH 1536/1557] Add tests for incremental compilation of sealed interfaces Original commit: 2e607335dbdbe18f9513bd7721f690212c799079 --- .../build/IncrementalJvmJpsTestGenerated.java | 25 ++++++++++++ .../classFlagsChanged/result-js.out | 12 ++++-- .../classFlagsChanged/result.out | 12 ++++-- .../classWithSuperTypeListChanged/result.out | 3 +- .../nestedClassSignatureChanged/result.out | 3 +- .../sealedClassImplAdded/result.out | 3 +- .../sealedClassImplRemoved/result.out | 3 +- .../sealedClassNestedImplAdded/result.out | 3 +- .../sealedClassNestedImplAddedDeep/result.out | 3 +- .../sealedClassNestedImplRemoved/result.out | 3 +- .../expected-kotlin-caches.txt | 3 ++ .../class/expected-kotlin-caches.txt | 1 + .../expected-kotlin-caches.txt | 1 + .../sealedClassesAddImplements/A.kt | 3 ++ .../sealedClassesAddImplements/B.kt | 3 ++ .../sealedClassesAddImplements/B.kt.new | 3 ++ .../sealedClassesAddImplements/Base.kt | 3 ++ .../sealedClassesAddImplements/args.txt | 1 + .../sealedClassesAddImplements/build.log | 28 +++++++++++++ .../sealedClassesAddImplements.jsklib.mute | 1 + .../sealedClassesAddImplements/С.kt | 3 ++ .../pureKotlin/sealedClassesAddInheritor/A.kt | 3 ++ .../pureKotlin/sealedClassesAddInheritor/B.kt | 3 ++ .../sealedClassesAddInheritor/Base.kt | 3 ++ .../sealedClassesAddInheritor/C.kt.new | 3 ++ .../sealedClassesAddInheritor/args.txt | 1 + .../sealedClassesAddInheritor/build.log | 27 +++++++++++++ .../sealedClassesAddInheritor.jsklib.mute | 1 + .../sealedClassesRemoveImplements/A.kt | 3 ++ .../sealedClassesRemoveImplements/B.kt | 3 ++ .../sealedClassesRemoveImplements/B.kt.new | 4 ++ .../sealedClassesRemoveImplements/Base.kt | 3 ++ .../BaseUsage.kt | 5 +++ .../sealedClassesRemoveImplements/args.txt | 1 + .../sealedClassesRemoveImplements/build.log | 39 +++++++++++++++++++ .../sealedClassesRemoveImplements.jsklib.mute | 1 + .../sealedClassesRemoveInheritor/A.kt | 3 ++ .../sealedClassesRemoveInheritor/B.kt | 3 ++ .../sealedClassesRemoveInheritor/B.kt.delete | 0 .../sealedClassesRemoveInheritor/Base.kt | 3 ++ .../sealedClassesRemoveInheritor/BaseUsage.kt | 5 +++ .../sealedClassesRemoveInheritor/args.txt | 1 + .../sealedClassesRemoveInheritor/build.log | 35 +++++++++++++++++ .../sealedClassesRemoveInheritor.jsklib.mute | 1 + .../pureKotlin/sealedClassesUseSwitch/A.kt | 3 ++ .../pureKotlin/sealedClassesUseSwitch/B.kt | 3 ++ .../pureKotlin/sealedClassesUseSwitch/Base.kt | 3 ++ .../sealedClassesUseSwitch/C.kt.new | 3 ++ .../pureKotlin/sealedClassesUseSwitch/D.kt | 5 +++ .../pureKotlin/sealedClassesUseSwitch/E.kt | 4 ++ .../sealedClassesUseSwitch/args.txt | 1 + .../sealedClassesUseSwitch/build.log | 38 ++++++++++++++++++ .../sealedClassesUseSwitch.jsklib.mute | 1 + 53 files changed, 317 insertions(+), 15 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index 8c4310c99cf..d0ce519c09c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -1239,6 +1239,31 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps-plugin/testData/incremental/pureKotlin/returnTypeChanged/"); } + @TestMetadata("sealedClassesAddImplements") + public void testSealedClassesAddImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/"); + } + + @TestMetadata("sealedClassesAddInheritor") + public void testSealedClassesAddInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/"); + } + + @TestMetadata("sealedClassesRemoveImplements") + public void testSealedClassesRemoveImplements() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/"); + } + + @TestMetadata("sealedClassesRemoveInheritor") + public void testSealedClassesRemoveInheritor() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/"); + } + + @TestMetadata("sealedClassesUseSwitch") + public void testSealedClassesUseSwitch() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/"); + } + @TestMetadata("secondaryConstructorInlined") public void testSecondaryConstructorInlined() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/secondaryConstructorInlined/"); diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out index 6fcbece9a43..95f7d8309bc 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result-js.out @@ -3,9 +3,11 @@ CHANGES in test/AbstractFlagAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/AbstractFlagRemoved: FLAGS CHANGES in test/AbstractFlagRemoved: CLASS_SIGNATURE PROTO DIFFERENCE in test/AnnotationFlagAdded: FLAGS, SUPERTYPE_LIST -CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE, PARENTS + [kotlin.Annotation, kotlin.Any] PROTO DIFFERENCE in test/AnnotationFlagRemoved: FLAGS, SUPERTYPE_LIST -CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE, PARENTS + [kotlin.Annotation, kotlin.Any] PROTO DIFFERENCE in test/DataFlagAdded: FLAGS, FUNCTION_LIST CHANGES in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] @@ -13,9 +15,11 @@ PROTO DIFFERENCE in test/DataFlagRemoved: FLAGS, FUNCTION_LIST CHANGES in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] PROTO DIFFERENCE in test/EnumFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE +CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Enum] PROTO DIFFERENCE in test/EnumFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE +CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Enum] PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagAdded: FLAGS CHANGES in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagRemoved: FLAGS diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out index 9dbebfba115..f00772bb93a 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged/result.out @@ -3,9 +3,11 @@ CHANGES in test/AbstractFlagAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/AbstractFlagRemoved: FLAGS CHANGES in test/AbstractFlagRemoved: CLASS_SIGNATURE PROTO DIFFERENCE in test/AnnotationFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagAdded: CLASS_SIGNATURE, PARENTS + [kotlin.Annotation, kotlin.Any] PROTO DIFFERENCE in test/AnnotationFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE +CHANGES in test/AnnotationFlagRemoved: CLASS_SIGNATURE, PARENTS + [kotlin.Annotation, kotlin.Any] PROTO DIFFERENCE in test/DataFlagAdded: FLAGS, FUNCTION_LIST CHANGES in test/DataFlagAdded: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] @@ -13,9 +15,11 @@ PROTO DIFFERENCE in test/DataFlagRemoved: FLAGS, FUNCTION_LIST CHANGES in test/DataFlagRemoved: CLASS_SIGNATURE, MEMBERS [component1, copy, equals, hashCode, toString] PROTO DIFFERENCE in test/EnumFlagAdded: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE +CHANGES in test/EnumFlagAdded: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Enum] PROTO DIFFERENCE in test/EnumFlagRemoved: CONSTRUCTOR_LIST, FLAGS, SUPERTYPE_LIST -CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE +CHANGES in test/EnumFlagRemoved: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Enum] PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagAdded: CONSTRUCTOR_LIST, FLAGS CHANGES in test/InnerClassHolder.InnerFlagAdded: CLASS_SIGNATURE PROTO DIFFERENCE in test/InnerClassHolder.InnerFlagRemoved: CONSTRUCTOR_LIST, FLAGS diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out index e57a591aafe..b1c4bef6ae7 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged/result.out @@ -1,2 +1,3 @@ PROTO DIFFERENCE in test/ClassWithSuperTypeListChanged: SUPERTYPE_LIST -CHANGES in test/ClassWithSuperTypeListChanged: CLASS_SIGNATURE +CHANGES in test/ClassWithSuperTypeListChanged: CLASS_SIGNATURE, PARENTS + [kotlin.Any, kotlin.Throwable] diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out index 51e6416c9e4..d6e8eed1c39 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged/result.out @@ -1,2 +1,3 @@ PROTO DIFFERENCE in test/Base.Nested1.Nested2: SUPERTYPE_LIST -CHANGES in test/Base.Nested1.Nested2: CLASS_SIGNATURE +CHANGES in test/Base.Nested1.Nested2: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base] diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out index 027ee98b281..9c70f14d0aa 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded/result.out @@ -4,4 +4,5 @@ CHANGES in test/Base1: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base2: CLASS_SIGNATURE PROTO DIFFERENCE in test/Impl22: SUPERTYPE_LIST -CHANGES in test/Impl22: CLASS_SIGNATURE +CHANGES in test/Impl22: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base2] diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out index 07cefb49155..2fa142e3f9b 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved/result.out @@ -4,4 +4,5 @@ CHANGES in test/Base1: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base2: CLASS_SIGNATURE PROTO DIFFERENCE in test/Impl22: SUPERTYPE_LIST -CHANGES in test/Impl22: CLASS_SIGNATURE +CHANGES in test/Impl22: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base2] diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out index c7661b6ed2c..e64c6353c17 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded/result.out @@ -5,4 +5,5 @@ CHANGES in test/Base1: CLASS_SIGNATURE, MEMBERS PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base2: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base2.Nested2: SUPERTYPE_LIST -CHANGES in test/Base2.Nested2: CLASS_SIGNATURE +CHANGES in test/Base2.Nested2: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base2] diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out index 3363b854df1..24ddda10d1c 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep/result.out @@ -9,4 +9,5 @@ CHANGES in test/Base2.Nested1: CLASS_SIGNATURE, MEMBERS PROTO DIFFERENCE in test/Base3.Nested1: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base3.Nested1: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base3.Nested1.Nested2: SUPERTYPE_LIST -CHANGES in test/Base3.Nested1.Nested2: CLASS_SIGNATURE +CHANGES in test/Base3.Nested1.Nested2: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base3.Nested1] diff --git a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out index 87fa076f273..c3d77972774 100644 --- a/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out +++ b/jps/jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved/result.out @@ -5,4 +5,5 @@ CHANGES in test/Base1: CLASS_SIGNATURE, MEMBERS PROTO DIFFERENCE in test/Base2: SEALED_SUBCLASS_FQ_NAME_LIST CHANGES in test/Base2: CLASS_SIGNATURE PROTO DIFFERENCE in test/Base2.Nested2: SUPERTYPE_LIST -CHANGES in test/Base2.Nested2: CLASS_SIGNATURE +CHANGES in test/Base2.Nested2: CLASS_SIGNATURE, PARENTS + [kotlin.Any, test.Base2] diff --git a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt index afaffa21b44..d44fbba4050 100644 --- a/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module1' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab @@ -24,6 +25,7 @@ Module 'module2' tests Module 'module3' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab @@ -32,6 +34,7 @@ Module 'module3' tests Module 'module4' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt index f49b588520e..1572f363a50 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/class/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt index b4e54efb164..6ece0df56da 100644 --- a/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt +++ b/jps/jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance/expected-kotlin-caches.txt @@ -7,6 +7,7 @@ kotlin-data-container Module 'module' production format-version.txt jvm-build-meta-info.txt + class-attributes.tab class-fq-name-to-source.tab internal-name-to-source.tab proto.tab diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt new file mode 100644 index 00000000000..324aaa75684 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt @@ -0,0 +1,3 @@ +package test + +interface B diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/B.kt.new @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log new file mode 100644 index 00000000000..2b7405353a6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/build.log @@ -0,0 +1,28 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/B.class +End of files +Compiling files: + src/B.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt new file mode 100644 index 00000000000..755dfbd73d4 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/С.kt @@ -0,0 +1,3 @@ +package test + +interface С diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new new file mode 100644 index 00000000000..da276aa99da --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/C.kt.new @@ -0,0 +1,3 @@ +package test + +interface C : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log new file mode 100644 index 00000000000..59554ef9cfa --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/build.log @@ -0,0 +1,27 @@ +================ Step #1 ================= + +Compiling files: + src/C.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt + src/C.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class + out/production/module/test/C.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt + src/C.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new new file mode 100644 index 00000000000..25bf4d005ba --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/B.kt.new @@ -0,0 +1,4 @@ +package test + +interface B + diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt new file mode 100644 index 00000000000..f2533e11978 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/BaseUsage.kt @@ -0,0 +1,5 @@ +package test + +class C { + lateinit var base: Base +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log new file mode 100644 index 00000000000..379d4b734e1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/build.log @@ -0,0 +1,39 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/B.class +End of files +Compiling files: + src/B.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt +End of files +Marked as dirty by Kotlin: + src/BaseUsage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/C.class +End of files +Compiling files: + src/BaseUsage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/B.kt.delete new file mode 100644 index 00000000000..e69de29bb2d diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt new file mode 100644 index 00000000000..f2533e11978 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/BaseUsage.kt @@ -0,0 +1,5 @@ +package test + +class C { + lateinit var base: Base +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log new file mode 100644 index 00000000000..cb874b1df7b --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/build.log @@ -0,0 +1,35 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/B.class +End of files +Compiling files: +End of files +Marked as dirty by Kotlin: + src/A.kt + src/Base.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/Base.class +End of files +Compiling files: + src/A.kt + src/Base.kt +End of files +Marked as dirty by Kotlin: + src/BaseUsage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/C.class +End of files +Compiling files: + src/BaseUsage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt new file mode 100644 index 00000000000..e41a06d2875 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/A.kt @@ -0,0 +1,3 @@ +package test + +interface A : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt new file mode 100644 index 00000000000..cdc33c843df --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/B.kt @@ -0,0 +1,3 @@ +package test + +interface B : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt new file mode 100644 index 00000000000..4e5675b150a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/Base.kt @@ -0,0 +1,3 @@ +package test + +sealed interface Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new new file mode 100644 index 00000000000..da276aa99da --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/C.kt.new @@ -0,0 +1,3 @@ +package test + +interface C : Base diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt new file mode 100644 index 00000000000..71237657cd9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/D.kt @@ -0,0 +1,5 @@ +package test + +class D { + lateinit var x: Base +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt new file mode 100644 index 00000000000..7a1c3583390 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/E.kt @@ -0,0 +1,4 @@ +package test + +class E { +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt new file mode 100644 index 00000000000..56ea44cbedd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/args.txt @@ -0,0 +1 @@ +-XXLanguage:+FreedomForSealedClasses -XXLanguage:+SealedInterfaces diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log new file mode 100644 index 00000000000..d1581952b1f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/build.log @@ -0,0 +1,38 @@ +================ Step #1 ================= + +Compiling files: + src/C.kt +End of files +Marked as dirty by Kotlin: + src/A.kt + src/B.kt + src/Base.kt + src/C.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/A.class + out/production/module/test/B.class + out/production/module/test/Base.class + out/production/module/test/C.class +End of files +Compiling files: + src/A.kt + src/B.kt + src/Base.kt + src/C.kt +End of files +Marked as dirty by Kotlin: + src/D.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/D.class +End of files +Compiling files: + src/D.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute new file mode 100644 index 00000000000..45f4097dd42 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute @@ -0,0 +1 @@ +IC of sealed interfaces are not supported in JS From b39d89fcd530cd6c06cbf8fe6becd4c5712ea857 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 2 Dec 2020 16:00:43 +0300 Subject: [PATCH 1537/1557] [TEST] Introduce test-infrastructure-utils module and extract common test utilities here Original commit: c8f3a4802e41ef20e2f2e5547a7420fbab162c58 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 3 ++- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 | 3 ++- .../org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 3e158535610..780a2148ae0 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -69,6 +69,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.Printer import org.jetbrains.org.objectweb.asm.ClassReader @@ -962,7 +963,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { } fun testJre9() { - val jdk9Path = KotlinTestUtils.getJdk9Home().absolutePath + val jdk9Path = KtTestUtil.getJdk9Home().absolutePath val jdk = myModel.global.addSdk(JDK_NAME, jdk9Path, "9", JpsJavaSdkType.INSTANCE) jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + jdk9Path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 index e78ecb115c4..10af39dca01 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 @@ -69,6 +69,7 @@ import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.Printer import org.jetbrains.org.objectweb.asm.ClassReader @@ -962,7 +963,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { } fun testJre9() { - val jdk9Path = KotlinTestUtils.getJdk9Home().absolutePath + val jdk9Path = KtTestUtil.getJdk9Home().absolutePath val jdk = myModel.global.addSdk(JDK_NAME, jdk9Path, "9", JpsJavaSdkType.INSTANCE) jdk.addRoot(StandardFileSystems.JRT_PROTOCOL_PREFIX + jdk9Path + URLUtil.JAR_SEPARATOR + "java.base", JpsOrderRootType.COMPILED) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt index 62ad269e3c1..244a538fdde 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jvm/compiler/ClasspathOrderTest.kt @@ -19,9 +19,9 @@ package org.jetbrains.kotlin.jvm.compiler import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType import org.jetbrains.kotlin.build.JvmSourceRoot import org.jetbrains.kotlin.modules.KotlinModuleXmlBuilder -import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.MockLibraryUtil import org.jetbrains.kotlin.test.TestCaseWithTmpdir +import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import java.io.File @@ -32,7 +32,7 @@ import java.io.File */ class ClasspathOrderTest : TestCaseWithTmpdir() { companion object { - private val sourceDir = File(KotlinTestUtils.getTestDataPathBase() + "/classpathOrder").absoluteFile + private val sourceDir = File(KtTestUtil.getTestDataPathBase() + "/classpathOrder").absoluteFile } fun testClasspathOrderForCLI() { From 5c74168fa480332846a084825b51b7e0dd86a280 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 15 Dec 2020 15:45:01 +0300 Subject: [PATCH 1538/1557] [TEST] Mute tests in IC JS Klib tests using exclude pattern instead of .mute file Original commit: f8ad096abb41e098b6da76c06f488cc16efecf68 --- .../sealedClassesAddImplements.jsklib.mute | 1 - .../sealedClassesAddInheritor.jsklib.mute | 1 - .../sealedClassesRemoveImplements.jsklib.mute | 1 - .../sealedClassesRemoveInheritor.jsklib.mute | 1 - .../sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute | 1 - 5 files changed, 5 deletions(-) delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddImplements/sealedClassesAddImplements.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesAddInheritor/sealedClassesAddInheritor.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveImplements/sealedClassesRemoveImplements.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesRemoveInheritor/sealedClassesRemoveInheritor.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute b/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute deleted file mode 100644 index 45f4097dd42..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/sealedClassesUseSwitch/sealedClassesUseSwitch.jsklib.mute +++ /dev/null @@ -1 +0,0 @@ -IC of sealed interfaces are not supported in JS From deee82073b97df6422f317194517c2285fb1a65b Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Mon, 14 Dec 2020 13:27:44 +0300 Subject: [PATCH 1539/1557] [TEST] Regenerate tests after previous commit Original commit: bc7e18fb8a729a9a73e72f31d76ff090b70c426e --- ...aContainerVersionChangedTestGenerated.java | 25 +- ...entalCacheVersionChangedTestGenerated.java | 25 +- .../build/IncrementalJsJpsTestGenerated.java | 51 +-- .../build/IncrementalJvmJpsTestGenerated.java | 345 +++++++++--------- .../IncrementalLazyCachesTestGenerated.java | 29 +- .../JsKlibLookupTrackerTestGenerated.java | 3 +- .../build/JsLookupTrackerTestGenerated.java | 3 +- .../build/JvmLookupTrackerTestGenerated.java | 3 +- ...mJpsTestWithGeneratedContentGenerated.java | 53 +-- .../JsProtoComparisonTestGenerated.java | 81 ++-- .../JvmProtoComparisonTestGenerated.java | 87 ++--- 11 files changed, 358 insertions(+), 347 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java index d6b3b3a2f72..79b5c1e45c2 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -25,7 +26,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInCacheVersionChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("clearedHasKotlin") @@ -92,7 +93,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInClearedHasKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -105,7 +106,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInExportedModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -118,7 +119,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInJavaOnlyModulesAreNotAffected() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -131,7 +132,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInModule1Modified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -144,7 +145,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInModule2Modified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -157,7 +158,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInModuleWithConstantModified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -170,7 +171,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInModuleWithInlineModified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -183,7 +184,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInTouchedFile() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -196,7 +197,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInTouchedOnlyJavaFile() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -209,7 +210,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInUntouchedFiles() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -222,7 +223,7 @@ public class DataContainerVersionChangedTestGenerated extends AbstractDataContai } public void testAllFilesPresentInWithError() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/withError"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/withError"), Pattern.compile("^([^\\.]+)$"), null, true); } } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index d61b539b7df..dba3c2db6f2 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -25,7 +26,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInCacheVersionChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("clearedHasKotlin") @@ -92,7 +93,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInClearedHasKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/clearedHasKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -105,7 +106,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInExportedModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/exportedModule"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -118,7 +119,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInJavaOnlyModulesAreNotAffected() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/javaOnlyModulesAreNotAffected"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -131,7 +132,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInModule1Modified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module1Modified"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -144,7 +145,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInModule2Modified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/module2Modified"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -157,7 +158,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInModuleWithConstantModified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithConstantModified"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -170,7 +171,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInModuleWithInlineModified() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/moduleWithInlineModified"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -183,7 +184,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInTouchedFile() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedFile"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -196,7 +197,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInTouchedOnlyJavaFile() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/touchedOnlyJavaFile"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -209,7 +210,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInUntouchedFiles() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/untouchedFiles"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -222,7 +223,7 @@ public class IncrementalCacheVersionChangedTestGenerated extends AbstractIncreme } public void testAllFilesPresentInWithError() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/withError"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/cacheVersionChanged/withError"), Pattern.compile("^([^\\.]+)$"), null, true); } } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java index 6f9c4fcddcd..e181fc85bed 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -25,7 +26,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInCommon() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classAdded") @@ -157,7 +158,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInClassAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -170,7 +171,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInClassRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -183,7 +184,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInConstantValueChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -196,7 +197,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -209,7 +210,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -222,7 +223,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInDefaultParameterAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -235,7 +236,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -248,7 +249,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInDefaultParameterRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -261,7 +262,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -274,7 +275,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -287,7 +288,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInDuplicatedClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -300,7 +301,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInExportedDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -313,7 +314,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInFunctionFromDifferentPackageChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -326,7 +327,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInInlineFunctionInlined() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -339,7 +340,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -352,7 +353,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -365,7 +366,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInSimple() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -378,7 +379,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInSimpleDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -391,7 +392,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -404,7 +405,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -417,7 +418,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -430,7 +431,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInTransitiveDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -443,7 +444,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInTransitiveInlining() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -456,7 +457,7 @@ public class IncrementalJsJpsTestGenerated extends AbstractIncrementalJsJpsTest } public void testAllFilesPresentInTwoDependants() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true); } } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index d0ce519c09c..99f1a17016e 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -27,7 +28,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCommon() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classAdded") @@ -159,7 +160,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -172,7 +173,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -185,7 +186,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInConstantValueChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -198,7 +199,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -211,7 +212,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -224,7 +225,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInDefaultParameterAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -237,7 +238,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -250,7 +251,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInDefaultParameterRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -263,7 +264,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -276,7 +277,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -289,7 +290,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInDuplicatedClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -302,7 +303,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInExportedDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -315,7 +316,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInFunctionFromDifferentPackageChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -328,7 +329,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInlineFunctionInlined() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -341,7 +342,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -354,7 +355,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -367,7 +368,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSimple() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -380,7 +381,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSimpleDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -393,7 +394,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -406,7 +407,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -419,7 +420,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -432,7 +433,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInTransitiveDependency() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -445,7 +446,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInTransitiveInlining() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -458,7 +459,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInTwoDependants() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -472,7 +473,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJvm() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("circular") @@ -509,7 +510,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCircular() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circular"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circular"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -522,7 +523,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCircularDependencyClasses() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -535,7 +536,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCircularDependencySamePackageUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -548,7 +549,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCircularDependencyTopLevelFunctions() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -561,7 +562,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCircularDependencyWithAccessToInternal() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -575,7 +576,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCustom() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("buildError") @@ -617,7 +618,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInBuildError() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -630,7 +631,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInBuildError2Levels() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -643,7 +644,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCommonSourcesCompilerArg() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -656,7 +657,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInComplementaryFiles() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -669,7 +670,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInModifyOptionalAnnotationUsage() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -682,7 +683,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInNotSameCompiler() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -731,7 +732,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPureKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, false); } @TestMetadata("annotations") @@ -1329,7 +1330,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInWithJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @@ -1341,7 +1342,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("javaToKotlin") @@ -1373,7 +1374,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJavaToKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1386,7 +1387,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJavaToKotlinAndBack() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1399,7 +1400,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJavaToKotlinAndRemove() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1412,7 +1413,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInKotlinToJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -1426,7 +1427,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("changeFieldType") @@ -1533,7 +1534,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangeFieldType() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1546,7 +1547,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangeNotUsedSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1559,7 +1560,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangePropertyOverrideType() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1572,7 +1573,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangeSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1585,7 +1586,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangeSignaturePackagePrivate() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1598,7 +1599,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangeSignaturePackagePrivateNonRoot() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1611,7 +1612,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangeSignatureStatic() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1624,7 +1625,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInConstantChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1637,7 +1638,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInConstantUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1650,7 +1651,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInEnumEntryAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1663,7 +1664,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInEnumEntryRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1676,7 +1677,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJavaAndKotlinChangedSimultaneously() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1689,7 +1690,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJavaFieldNullabilityChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1702,7 +1703,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJavaMethodParamNullabilityChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1715,7 +1716,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJavaMethodReturnTypeNullabilityChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1728,7 +1729,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodAddedInSuper() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1741,7 +1742,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodRenamed() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1754,7 +1755,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMixedInheritance() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1767,7 +1768,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInNotChangeSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1780,7 +1781,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSamConversions() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("methodAdded") @@ -1812,7 +1813,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1825,7 +1826,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodAddedSamAdapter() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1838,7 +1839,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodSignatureChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1851,7 +1852,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodSignatureChangedSamAdapter() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -1871,7 +1872,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInKotlinUsedInJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("changeNotUsedSignature") @@ -1948,7 +1949,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInAddOptionalParameter() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1961,7 +1962,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangeNotUsedSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1974,7 +1975,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInChangeSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -1987,7 +1988,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInConstantChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2000,7 +2001,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInConstantUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2013,7 +2014,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInFunRenamed() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2026,7 +2027,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJvmFieldChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2039,7 +2040,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJvmFieldUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2052,7 +2053,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodAddedInSuper() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2065,7 +2066,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInNotChangeSignature() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2078,7 +2079,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInOnlyTopLevelFunctionInFileRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2091,7 +2092,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPackageFileAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2104,7 +2105,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPrivateChanges() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2117,7 +2118,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPropertyRenamed() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -2136,7 +2137,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInOther() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("allKotlinFilesRemovedThenNewAdded") @@ -2293,7 +2294,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInAccessingFunctionsViaRenamedFileClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2306,7 +2307,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInAllKotlinFilesRemovedThenNewAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2319,7 +2320,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassRedeclaration() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/classRedeclaration"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/classRedeclaration"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2332,7 +2333,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassToPackageFacade() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/classToPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/classToPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2345,7 +2346,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInConflictingPlatformDeclarations() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2358,7 +2359,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInDefaultValueInConstructorAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2371,7 +2372,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInlineFunctionWithJvmNameInClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2384,7 +2385,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInlineTopLevelFunctionWithJvmName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2397,7 +2398,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInlineTopLevelValPropertyWithJvmName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2410,7 +2411,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInnerClassNotGeneratedWhenRebuilding() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2423,7 +2424,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInJvmNameChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/jvmNameChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/jvmNameChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2436,7 +2437,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMainRedeclaration() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/mainRedeclaration"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/mainRedeclaration"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2449,7 +2450,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassAddTopLevelFunWithDefault() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2462,7 +2463,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassFileAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2475,7 +2476,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassFileChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2488,7 +2489,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassFileMovedToAnotherMultifileClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2501,7 +2502,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassInlineFunction() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2514,7 +2515,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassInlineFunctionAccessingField() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2527,7 +2528,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassRecreated() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRecreated"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRecreated"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2540,7 +2541,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassRecreatedAfterRenaming() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2553,7 +2554,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifileClassRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2566,7 +2567,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifilePackagePartMethodAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2579,7 +2580,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMultifilePartsWithProperties() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2592,7 +2593,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInOptionalParameter() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/optionalParameter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/optionalParameter"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2605,7 +2606,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPackageFacadeToClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageFacadeToClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageFacadeToClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2618,7 +2619,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPackageMultifileClassOneFileWithPublicChanges() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2631,7 +2632,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPackageMultifileClassPrivateOnlyChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2644,7 +2645,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2657,7 +2658,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInTopLevelFunctionWithJvmName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2670,7 +2671,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInTopLevelPropertyWithJvmName() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -2685,7 +2686,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInlineFunCallSite() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classProperty") @@ -2767,7 +2768,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/classProperty"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/classProperty"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2780,7 +2781,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCompanionObjectProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2793,7 +2794,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCoroutine() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/coroutine"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/coroutine"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2806,7 +2807,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInFunction() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/function"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/function"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2819,7 +2820,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInGetter() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/getter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/getter"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2832,7 +2833,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInLambda() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/lambda"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/lambda"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2845,7 +2846,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInLocalFun() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/localFun"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/localFun"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2858,7 +2859,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethod() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/method"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/method"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2871,7 +2872,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInParameterDefaultValue() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2884,7 +2885,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPrimaryConstructorParameterDefaultValue() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2897,7 +2898,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSuperCall() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/superCall"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/superCall"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2910,7 +2911,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInThisCall() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/thisCall"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/thisCall"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2923,7 +2924,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInTopLevelObjectProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -2936,7 +2937,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInTopLevelProperty() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -2950,7 +2951,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassHierarchyAffected() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("annotationFlagRemoved") @@ -3162,7 +3163,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInAnnotationFlagRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3175,7 +3176,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInAnnotationListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3188,7 +3189,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInBridgeGenerated() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3201,7 +3202,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassBecameFinal() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3214,7 +3215,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassBecameInterface() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3227,7 +3228,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassBecamePrivate() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3240,7 +3241,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassMovedIntoOtherClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3253,7 +3254,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3266,7 +3267,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInClassRemovedAndRestored() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3279,7 +3280,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCompanionObjectInheritedMemberChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3292,7 +3293,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCompanionObjectMemberChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3305,7 +3306,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCompanionObjectNameChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3318,7 +3319,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInCompanionObjectToSimpleObject() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3331,7 +3332,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInConstructorVisibilityChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3344,7 +3345,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInEnumEntryAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3357,7 +3358,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInEnumEntryRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3370,7 +3371,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInEnumMemberChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3383,7 +3384,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInFlagsAndMemberInDifferentClassesChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3396,7 +3397,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInFlagsAndMemberInSameClassChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3409,7 +3410,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInImplcitUpcast() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3422,7 +3423,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInferredTypeArgumentChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3435,7 +3436,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInferredTypeChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3448,7 +3449,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInInterfaceAnyMethods() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3461,7 +3462,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInLambdaParameterAffected() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3474,7 +3475,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3487,7 +3488,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodAnnotationAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3500,7 +3501,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodNullabilityChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3513,7 +3514,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodParameterWithDefaultValueAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3526,7 +3527,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInMethodRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3539,7 +3540,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInOverrideExplicit() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3552,7 +3553,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInOverrideImplicit() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3565,7 +3566,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPropertyNullabilityChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3578,7 +3579,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSealedClassImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3591,7 +3592,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSealedClassIndirectImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3604,7 +3605,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSealedClassNestedImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3617,7 +3618,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSecondaryConstructorAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3630,7 +3631,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInStarProjectionUpperBoundChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3643,7 +3644,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInSupertypesListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3656,7 +3657,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInTypeParameterListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -3669,7 +3670,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInVarianceChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 45c412b7c16..3f67e15c7bb 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -27,7 +28,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInLazyKotlinCaches() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("class") @@ -79,7 +80,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/class"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/class"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -92,7 +93,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInClassInheritance() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/classInheritance"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -105,7 +106,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInConstant() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/constant"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/constant"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -118,7 +119,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInFunction() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/function"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/function"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -131,7 +132,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInInlineFunctionWithUsage() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithUsage"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -144,7 +145,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInInlineFunctionWithoutUsage() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/inlineFunctionWithoutUsage"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -157,7 +158,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInNoKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/noKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -170,7 +171,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInTopLevelPropertyAccess() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -184,7 +185,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInChangeIncrementalOption() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("incrementalOff") @@ -216,7 +217,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInIncrementalOff() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOff"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -229,7 +230,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInIncrementalOffOn() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOn"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -242,7 +243,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInIncrementalOffOnJavaChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -255,7 +256,7 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC } public void testAllFilesPresentInIncrementalOffOnJavaOnly() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/changeIncrementalOption/incrementalOffOnJavaOnly"), Pattern.compile("^([^\\.]+)$"), null, true); } } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java index 7ad7897706c..8b59e851b06 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -25,7 +26,7 @@ public class JsKlibLookupTrackerTestGenerated extends AbstractJsKlibLookupTracke } public void testAllFilesPresentInJsKlib() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/jsKlib"), Pattern.compile("^([^\\.]+)$"), null, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/jsKlib"), Pattern.compile("^([^\\.]+)$"), null, false); } @TestMetadata("classifierMembers") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java index 1a4462e6cb6..89e80da5ae6 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -25,7 +26,7 @@ public class JsLookupTrackerTestGenerated extends AbstractJsLookupTrackerTest { } public void testAllFilesPresentInJs() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/js"), Pattern.compile("^([^\\.]+)$"), null, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/js"), Pattern.compile("^([^\\.]+)$"), null, false); } @TestMetadata("classifierMembers") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java index 204bef71086..3403a74d25d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -25,7 +26,7 @@ public class JvmLookupTrackerTestGenerated extends AbstractJvmLookupTrackerTest } public void testAllFilesPresentInJvm() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/jvm"), Pattern.compile("^([^\\.]+)$"), null, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/lookupTracker/jvm"), Pattern.compile("^([^\\.]+)$"), null, false); } @TestMetadata("classifierMembers") diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java index 9c7d95d8d53..27653a6270b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.build; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -25,7 +26,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInMultiplatformMultiModule() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative") @@ -37,7 +38,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInIgnoreAndWarnAboutNative() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("editingCKotlin") @@ -54,7 +55,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingCKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ignoreAndWarnAboutNative/editingCKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -68,7 +69,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInSimple() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("editingCKotlin") @@ -100,7 +101,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingCKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingCKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -113,7 +114,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingPJsKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -126,7 +127,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingPJvmJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmJava"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -139,7 +140,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingPJvmKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simple/editingPJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -153,7 +154,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInSimpleJsJvmProjectWithTests() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("editingCMainExpectActual") @@ -175,7 +176,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingCMainExpectActual() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCMainExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -188,7 +189,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingCTestsExpectActual() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleJsJvmProjectWithTests/editingCTestsExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -202,7 +203,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInSimpleNewMpp() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("editingCKotlin") @@ -234,7 +235,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingCKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingCKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -247,7 +248,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingPJsKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -260,7 +261,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingPJvmJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmJava"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -273,7 +274,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingPJvmKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/simpleNewMpp/editingPJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -287,7 +288,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInUltimate() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("editingACommonExpectActual") @@ -344,7 +345,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingACommonExpectActual() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingACommonExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -357,7 +358,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingAJsClientKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJsClientKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -370,7 +371,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingAJvmClientJava() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientJava"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -383,7 +384,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingAJvmClientKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingAJvmClientKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -396,7 +397,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingBCommonExpectActual() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingBCommonExpectActual"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -409,7 +410,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingRJsKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -422,7 +423,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingRJvmKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -435,7 +436,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingRaJsKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJsKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -448,7 +449,7 @@ public class MultiplatformJpsTestWithGeneratedContentGenerated extends AbstractM } public void testAllFilesPresentInEditingRaJvmKotlin() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/withGeneratedContent/ultimate/editingRaJvmKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); } } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java index 35fbf182b18..e0ade944522 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.incremental; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -27,7 +28,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassSignatureChange() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classAnnotationListChanged") @@ -94,7 +95,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassAnnotationListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -107,7 +108,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassFlagsAndMembersChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -120,7 +121,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassFlagsChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -133,7 +134,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassTypeParameterListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -146,7 +147,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithSuperTypeListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -159,7 +160,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInNestedClassSignatureChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -172,7 +173,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInSealedClassImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -185,7 +186,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInSealedClassImplRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -198,7 +199,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInSealedClassNestedImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -211,7 +212,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInSealedClassNestedImplAddedDeep() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -224,7 +225,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInSealedClassNestedImplRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -238,7 +239,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassPrivateOnlyChange() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classWithPrivateFunChanged") @@ -275,7 +276,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithPrivateFunChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -288,7 +289,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithPrivatePrimaryConstructorChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -301,7 +302,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithPrivateSecondaryConstructorChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -314,7 +315,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithPrivateValChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -327,7 +328,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithPrivateVarChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -341,7 +342,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassMembersOnlyChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classWithCompanionObjectChanged") @@ -403,7 +404,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithCompanionObjectChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -416,7 +417,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithConstructorChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -429,7 +430,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithFunAndValChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -442,7 +443,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWithNestedClassesChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -455,7 +456,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInClassWitnEnumChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -468,7 +469,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInDefaultValues() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -481,7 +482,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInMembersAnnotationListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -494,7 +495,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInMembersFlagsChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -507,7 +508,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInNestedClassMembersChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -520,7 +521,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInSealedClassImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -534,7 +535,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInPackageMembers() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("defaultValues") @@ -571,7 +572,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInDefaultValues() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -584,7 +585,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInMembersAnnotationListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -597,7 +598,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInMembersFlagsChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -610,7 +611,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInPackageFacadePrivateOnlyChanges() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -623,7 +624,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInPackageFacadePublicChanges() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -637,7 +638,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("unchangedClass") @@ -659,7 +660,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInUnchangedClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -672,7 +673,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInUnchangedPackageFacade() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -686,7 +687,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInJsOnly() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jsOnly"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jsOnly"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("externals") @@ -703,7 +704,7 @@ public class JsProtoComparisonTestGenerated extends AbstractJsProtoComparisonTes } public void testAllFilesPresentInExternals() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jsOnly/externals"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jsOnly/externals"), Pattern.compile("^([^\\.]+)$"), null, true); } } } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java index a9272c01309..39e16c795f2 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java @@ -8,6 +8,7 @@ package org.jetbrains.kotlin.jps.incremental; import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; +import org.jetbrains.kotlin.test.util.KtTestUtil; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -27,7 +28,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassSignatureChange() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classAnnotationListChanged") @@ -94,7 +95,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassAnnotationListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -107,7 +108,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassFlagsAndMembersChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsAndMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -120,7 +121,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassFlagsChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -133,7 +134,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassTypeParameterListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classTypeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -146,7 +147,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithSuperTypeListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/classWithSuperTypeListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -159,7 +160,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInNestedClassSignatureChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/nestedClassSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -172,7 +173,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInSealedClassImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -185,7 +186,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInSealedClassImplRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -198,7 +199,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInSealedClassNestedImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -211,7 +212,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInSealedClassNestedImplAddedDeep() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplAddedDeep"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -224,7 +225,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInSealedClassNestedImplRemoved() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classSignatureChange/sealedClassNestedImplRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -238,7 +239,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassPrivateOnlyChange() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classWithPrivateFunChanged") @@ -275,7 +276,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithPrivateFunChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateFunChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -288,7 +289,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithPrivatePrimaryConstructorChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivatePrimaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -301,7 +302,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithPrivateSecondaryConstructorChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateSecondaryConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -314,7 +315,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithPrivateValChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateValChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -327,7 +328,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithPrivateVarChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classPrivateOnlyChange/classWithPrivateVarChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -341,7 +342,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassMembersOnlyChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classWithCompanionObjectChanged") @@ -403,7 +404,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithCompanionObjectChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithCompanionObjectChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -416,7 +417,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithConstructorChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithConstructorChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -429,7 +430,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithFunAndValChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithFunAndValChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -442,7 +443,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWithNestedClassesChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWithNestedClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -455,7 +456,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassWitnEnumChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/classWitnEnumChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -468,7 +469,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInDefaultValues() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -481,7 +482,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInMembersAnnotationListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -494,7 +495,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInMembersFlagsChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -507,7 +508,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInNestedClassMembersChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/nestedClassMembersChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -520,7 +521,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInSealedClassImplAdded() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/classMembersOnlyChanged/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -534,7 +535,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInPackageMembers() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("defaultValues") @@ -571,7 +572,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInDefaultValues() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/defaultValues"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -584,7 +585,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInMembersAnnotationListChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersAnnotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -597,7 +598,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInMembersFlagsChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -610,7 +611,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInPackageFacadePrivateOnlyChanges() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePrivateOnlyChanges"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -623,7 +624,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInPackageFacadePublicChanges() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/packageMembers/packageFacadePublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -637,7 +638,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInUnchanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("unchangedClass") @@ -659,7 +660,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInUnchangedClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -672,7 +673,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInUnchangedPackageFacade() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/unchanged/unchangedPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true); } } } @@ -686,7 +687,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInJvmOnly() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly"), Pattern.compile("^([^\\.]+)$"), null, true); } @TestMetadata("classToFileFacade") @@ -718,7 +719,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInClassToFileFacade() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/classToFileFacade"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/classToFileFacade"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -731,7 +732,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInMembersFlagsChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/membersFlagsChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -744,7 +745,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInPackageFacadeMultifileClassChanged() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/packageFacadeMultifileClassChanged"), Pattern.compile("^([^\\.]+)$"), null, true); } } @@ -757,7 +758,7 @@ public class JvmProtoComparisonTestGenerated extends AbstractJvmProtoComparisonT } public void testAllFilesPresentInPackageFacadeToClass() throws Exception { - KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/comparison/jvmOnly/packageFacadeToClass"), Pattern.compile("^([^\\.]+)$"), null, true); } } } From 8bce3f41fb4b4607cd3cb6806d63e5945fc161b2 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 22 Dec 2020 13:56:06 +0300 Subject: [PATCH 1540/1557] [Test] Extract MockLibraryUtil to :compiler:tests-compiler-utils Also provide MockLibraryUtilExt with bridges to MockLibraryUtil with JUnit4Assertions Original commit: cb7b1652e72810a17ff8bd60d69900e7dbf0bf56 --- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 6 +++--- .../jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 780a2148ae0..2d432cdf16f 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -68,7 +68,7 @@ import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.MockLibraryUtilExt import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.Printer @@ -614,7 +614,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { fun testCircularDependencyWithReferenceToOldVersionLib() { initProject(JVM_MOCK_RUNTIME) - val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") + val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) @@ -625,7 +625,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { fun testDependencyToOldKotlinLib() { initProject() - val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") + val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 index 10af39dca01..605d85bce34 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 @@ -68,7 +68,7 @@ import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.test.KotlinTestUtils -import org.jetbrains.kotlin.test.MockLibraryUtil +import org.jetbrains.kotlin.test.MockLibraryUtilExt import org.jetbrains.kotlin.test.util.KtTestUtil import org.jetbrains.kotlin.utils.PathUtil import org.jetbrains.kotlin.utils.Printer @@ -614,7 +614,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { fun testCircularDependencyWithReferenceToOldVersionLib() { initProject(JVM_MOCK_RUNTIME) - val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") + val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module1"), findModule("module2")), false, "module-lib", libraryJar) @@ -625,7 +625,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { fun testDependencyToOldKotlinLib() { initProject() - val libraryJar = MockLibraryUtil.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") + val libraryJar = MockLibraryUtilExt.compileJvmLibraryToJar(workDir.absolutePath + File.separator + "oldModuleLib/src", "module-lib") AbstractKotlinJpsBuildTestCase.addDependency(JpsJavaDependencyScope.COMPILE, Lists.newArrayList(findModule("module")), false, "module-lib", libraryJar) From d885679e61086da18c130e7a365e94001b616f8a Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Sun, 3 Jan 2021 14:44:38 +0100 Subject: [PATCH 1541/1557] Regenerate tests and fir-tree Original commit: ed9a0e514d897be853e3b66ce78500a00e60a32e --- .../jps/build/DataContainerVersionChangedTestGenerated.java | 2 +- .../jps/build/IncrementalCacheVersionChangedTestGenerated.java | 2 +- .../kotlin/jps/build/IncrementalJsJpsTestGenerated.java | 2 +- .../kotlin/jps/build/IncrementalJvmJpsTestGenerated.java | 2 +- .../kotlin/jps/build/IncrementalLazyCachesTestGenerated.java | 2 +- .../kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java | 2 +- .../kotlin/jps/build/JsLookupTrackerTestGenerated.java | 2 +- .../kotlin/jps/build/JvmLookupTrackerTestGenerated.java | 2 +- .../MultiplatformJpsTestWithGeneratedContentGenerated.java | 2 +- .../kotlin/jps/incremental/JsProtoComparisonTestGenerated.java | 2 +- .../kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java index 79b5c1e45c2..e6187d62e7d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/DataContainerVersionChangedTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java index dba3c2db6f2..fbd79fb342e 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalCacheVersionChangedTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java index e181fc85bed..60fe26dcd93 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJsJpsTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index 99f1a17016e..ffd63718730 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java index 3f67e15c7bb..2fbe2a1e904 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java index 8b59e851b06..0d2f4a2beb8 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsKlibLookupTrackerTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java index 89e80da5ae6..1234f1b33bc 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JsLookupTrackerTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java index 3403a74d25d..0c0cf2847d6 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/JvmLookupTrackerTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java index 27653a6270b..747ea41ecaf 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/MultiplatformJpsTestWithGeneratedContentGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java index e0ade944522..bc9ea513f77 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JsProtoComparisonTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java index 39e16c795f2..1573b5af26a 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/JvmProtoComparisonTestGenerated.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ From 19c559ff2f26ade635dd509b0f921df898247559 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 2 Dec 2020 13:03:19 +0300 Subject: [PATCH 1542/1557] [IDE] Drop coroutines KotlinFacetSettings.coroutineSupport Original commit: a8b65bc6736f580042ed632cc44bc2bef091ac26 --- .../kotlin/config/KotlinFacetSettings.kt | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 372eb485866..a7936542f98 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -275,21 +275,6 @@ class KotlinFacetSettings { return targetPlatform?.toIdePlatform() } - var coroutineSupport: LanguageFeature.State? - get() { - val languageVersion = languageLevel ?: return LanguageFeature.Coroutines.defaultState - if (languageVersion < LanguageFeature.Coroutines.sinceVersion!!) return LanguageFeature.State.DISABLED - return CoroutineSupport.byCompilerArgumentsOrNull(compilerArguments) - } - set(value) { - compilerArguments?.coroutinesState = when (value) { - null -> CommonCompilerArguments.DEFAULT - LanguageFeature.State.ENABLED -> CommonCompilerArguments.ENABLE - LanguageFeature.State.ENABLED_WITH_WARNING -> CommonCompilerArguments.WARN - LanguageFeature.State.ENABLED_WITH_ERROR, LanguageFeature.State.DISABLED -> CommonCompilerArguments.ERROR - } - } - var implementedModuleNames: List = emptyList() // used for first implementation of MPP, aka 'old' MPP var dependsOnModuleNames: List = emptyList() // used for New MPP and later implementations From 14d3667a8eb87435dc1924b1ccfffbdcda5fe1bb Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 2 Dec 2020 13:19:37 +0300 Subject: [PATCH 1543/1557] [FE] Drop `coroutinesState` from build configurations plugins Original commit: df3b12e13bc878541b7919bf5f5958d193ad4535 --- .../kotlin/config/KotlinFacetSettings.kt | 23 ------------------- 1 file changed, 23 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index a7936542f98..6360f251c18 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -48,29 +48,6 @@ sealed class TargetPlatformKind( ) } -object CoroutineSupport { - @JvmStatic - fun byCompilerArguments(arguments: CommonCompilerArguments?): LanguageFeature.State = - byCompilerArgumentsOrNull(arguments) ?: LanguageFeature.Coroutines.defaultState - - fun byCompilerArgumentsOrNull(arguments: CommonCompilerArguments?): LanguageFeature.State? = when (arguments?.coroutinesState) { - CommonCompilerArguments.ENABLE -> LanguageFeature.State.ENABLED - CommonCompilerArguments.WARN, CommonCompilerArguments.DEFAULT -> LanguageFeature.State.ENABLED_WITH_WARNING - CommonCompilerArguments.ERROR -> LanguageFeature.State.ENABLED_WITH_ERROR - else -> null - } - - fun byCompilerArgument(argument: String): LanguageFeature.State = - LanguageFeature.State.values().find { getCompilerArgument(it).equals(argument, ignoreCase = true) } - ?: LanguageFeature.Coroutines.defaultState - - fun getCompilerArgument(state: LanguageFeature.State): String = when (state) { - LanguageFeature.State.ENABLED -> "enable" - LanguageFeature.State.ENABLED_WITH_WARNING -> "warn" - LanguageFeature.State.ENABLED_WITH_ERROR, LanguageFeature.State.DISABLED -> "error" - } -} - sealed class VersionView : DescriptionAware { abstract val version: LanguageVersion From 377b78d9e68a62b0ba7e5d5c340f21b998c1948f Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Wed, 2 Dec 2020 13:22:40 +0300 Subject: [PATCH 1544/1557] [CLI] Drop `CommonCompilerArguments.coroutinesState` Original commit: e991c9d476c7cf59db7ecd585efeb77f8357ab24 --- .../kotlin/config/facetSerialization.kt | 41 +------------------ 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index f1d770d423c..40b90f2071a 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -195,19 +195,7 @@ private fun readElementsList(element: Element, rootElementName: String, elementN } private fun readV2Config(element: Element): KotlinFacetSettings { - return readV2AndLaterConfig(element).apply { - element.getChild("compilerArguments")?.children?.let { args -> - when { - args.any { arg -> arg.attributes[0].value == "coroutinesEnable" && arg.attributes[1].booleanValue } -> - compilerArguments!!.coroutinesState = CommonCompilerArguments.ENABLE - args.any { arg -> arg.attributes[0].value == "coroutinesWarn" && arg.attributes[1].booleanValue } -> - compilerArguments!!.coroutinesState = CommonCompilerArguments.WARN - args.any { arg -> arg.attributes[0].value == "coroutinesError" && arg.attributes[1].booleanValue } -> - compilerArguments!!.coroutinesState = CommonCompilerArguments.ERROR - else -> compilerArguments!!.coroutinesState = CommonCompilerArguments.DEFAULT - } - } - } + return readV2AndLaterConfig(element) } private fun readLatestConfig(element: Element): KotlinFacetSettings { @@ -408,35 +396,10 @@ fun Element.dropVersionsIfNecessary(settings: CommonCompilerArguments) { } } -// Special treatment of v2 may be dropped after transition to IDEA 172 -private fun KotlinFacetSettings.writeV2Config(element: Element) { - writeLatestConfig(element) - element.getChild("compilerArguments")?.let { - it.getOption("coroutinesState")?.detach() - val coroutineOption = when (compilerArguments?.coroutinesState) { - CommonCompilerArguments.ENABLE -> "coroutinesEnable" - CommonCompilerArguments.WARN -> "coroutinesWarn" - CommonCompilerArguments.ERROR -> "coroutinesError" - else -> null - } - if (coroutineOption != null) { - Element("option").apply { - setAttribute("name", coroutineOption) - setAttribute("value", "true") - it.addContent(this) - } - } - } -} - fun KotlinFacetSettings.serializeFacetSettings(element: Element) { val versionToWrite = if (version == 2) version else KotlinFacetSettings.CURRENT_VERSION element.setAttribute("version", versionToWrite.toString()) - if (versionToWrite == 2) { - writeV2Config(element) - } else { - writeLatestConfig(element) - } + writeLatestConfig(element) } private fun TargetPlatform.serializeComponentPlatforms(): String { From 4652312c5e4cb07e28731958a1cd84a52fb709e3 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 29 Dec 2020 13:47:21 +0300 Subject: [PATCH 1545/1557] [IDE] Propagate KotlinFacetSettings version and completely drop isReleaseCoroutines flag Also this commit removes number of tests related to support experimental coroutines Original commit: af94bcebeac2b1641d2dfd6448beeb7f7930edca --- .../org/jetbrains/kotlin/config/KotlinFacetSettings.kt | 2 +- .../org/jetbrains/kotlin/config/facetSerialization.kt | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt index 6360f251c18..3d0094627a2 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/KotlinFacetSettings.kt @@ -160,7 +160,7 @@ data class ExternalSystemNativeMainRunTask( class KotlinFacetSettings { companion object { // Increment this when making serialization-incompatible changes to configuration data - val CURRENT_VERSION = 3 + val CURRENT_VERSION = 4 val DEFAULT_VERSION = 0 } diff --git a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt index 40b90f2071a..7412c7a016f 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/config/facetSerialization.kt @@ -194,6 +194,10 @@ private fun readElementsList(element: Element, rootElementName: String, elementN return null } +private fun readV3Config(element: Element): KotlinFacetSettings { + return readV2AndLaterConfig(element) +} + private fun readV2Config(element: Element): KotlinFacetSettings { return readV2AndLaterConfig(element) } @@ -211,6 +215,7 @@ fun deserializeFacetSettings(element: Element): KotlinFacetSettings { return when (version) { 1 -> readV1Config(element) 2 -> readV2Config(element) + 3 -> readV3Config(element) KotlinFacetSettings.CURRENT_VERSION -> readLatestConfig(element) else -> return KotlinFacetSettings() // Reset facet configuration if versions don't match }.apply { this.version = version } @@ -397,7 +402,10 @@ fun Element.dropVersionsIfNecessary(settings: CommonCompilerArguments) { } fun KotlinFacetSettings.serializeFacetSettings(element: Element) { - val versionToWrite = if (version == 2) version else KotlinFacetSettings.CURRENT_VERSION + val versionToWrite = when (version) { + 2, 3 -> version + else -> KotlinFacetSettings.CURRENT_VERSION + } element.setAttribute("version", versionToWrite.toString()) writeLatestConfig(element) } From bf3414c4915b3662761494f20d65b14d4c627883 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Fri, 27 Nov 2020 12:12:04 +0300 Subject: [PATCH 1546/1557] [IC] Add in-module tests for incremental compilation Two tests to check recompilation when parameter with default value was added or removed without changing use-site. Original commit: 96ba3b873e99392544219c3b8832c2115dc23dab --- .../build/IncrementalJvmJpsTestGenerated.java | 10 +++++ .../parameterWithDefaultValueAdded/build.log | 45 +++++++++++++++++++ .../parameterWithDefaultValueAdded/fun.kt | 5 +++ .../fun.kt.new.1 | 5 +++ .../fun.kt.new.2 | 5 +++ .../parameterWithDefaultValueAdded/other.kt | 3 ++ .../useDefault.kt | 5 +++ .../build.log | 22 +++++++++ .../parameterWithDefaultValueRemoved/fun.kt | 6 +++ .../fun.kt.new.1 | 5 +++ .../parameterWithDefaultValueRemoved/other.kt | 3 ++ .../useDefault.kt | 5 +++ 12 files changed, 119 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index ffd63718730..1e17cafc916 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -1110,6 +1110,16 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps-plugin/testData/incremental/pureKotlin/packageRemoved/"); } + @TestMetadata("parameterWithDefaultValueAdded") + public void testParameterWithDefaultValueAdded() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/"); + } + + @TestMetadata("parameterWithDefaultValueRemoved") + public void testParameterWithDefaultValueRemoved() throws Exception { + runTest("jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/"); + } + @TestMetadata("privateConstantsChanged") public void testPrivateConstantsChanged() throws Exception { runTest("jps-plugin/testData/incremental/pureKotlin/privateConstantsChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log new file mode 100644 index 00000000000..d03762157b6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/build.log @@ -0,0 +1,45 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefaultKt.class +End of files +Compiling files: + src/useDefault.kt +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefaultKt.class +End of files +Compiling files: + src/useDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt new file mode 100644 index 00000000000..4a08b109ea2 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt @@ -0,0 +1,5 @@ +package test + +fun f(x: Any) { + println("f(x: Any)") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1 new file mode 100644 index 00000000000..cdf3d991ec3 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.1 @@ -0,0 +1,5 @@ +package test + +fun f(x: Any, y: String = "D") { + println("f(x: Any, $y)") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2 b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2 new file mode 100644 index 00000000000..8a88b628d47 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/fun.kt.new.2 @@ -0,0 +1,5 @@ +package test + +fun f(x: Any = "", y: String = "D") { + println("f(x: Any, $y)") +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt new file mode 100644 index 00000000000..73e68e1b5e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueAdded/useDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault1() { + f(10) +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log new file mode 100644 index 00000000000..1594b2d4bac --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/FunKt.class +End of files +Compiling files: + src/fun.kt +End of files +Marked as dirty by Kotlin: + src/useDefault.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/UseDefaultKt.class +End of files +Compiling files: + src/useDefault.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt new file mode 100644 index 00000000000..727dcd2fd25 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt @@ -0,0 +1,6 @@ +package test + +fun f(x: Any, y: String = "D") { + println("f(x: Any, $y)") +} + diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1 b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1 new file mode 100644 index 00000000000..797e0254b27 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/fun.kt.new.1 @@ -0,0 +1,5 @@ +package test + +fun f(x: Any) { + println("f(x: Any)") +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt new file mode 100644 index 00000000000..567945cc9b5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/other.kt @@ -0,0 +1,3 @@ +package other + +fun other() {} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt new file mode 100644 index 00000000000..73e68e1b5e9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/parameterWithDefaultValueRemoved/useDefault.kt @@ -0,0 +1,5 @@ +package test + +fun useDefault1() { + f(10) +} \ No newline at end of file From d6afccfef04d06b6f9a6c840c56e7f336a3e1205 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Wed, 2 Dec 2020 13:34:17 +0300 Subject: [PATCH 1547/1557] [KLIB IC] Fix klib IC test data Since neither inline function nor super classes affect klib there is no need for extra passes so compiler doesn't report any dirty files. Do not check that. Original commit: daf1da1c70a6e684a28ee17958c32ad389f3735e --- .../common/exportedDependency/klib-build.log | 52 ++++++++++++++ .../inlineFunctionInlined/klib-build.log | 23 +++++++ .../klib-build.log | 47 +++++++++++++ .../multiModule/common/simple/klib-build.log | 67 +++++++++++++++++++ .../common/transitiveInlining/klib-build.log | 6 ++ 5 files changed, 195 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log new file mode 100644 index 00000000000..a5954d01354 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/klib-build.log @@ -0,0 +1,52 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/AChild.class +End of files +Compiling files: + module2/src/AChild.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'A': it is private in file +'public' subclass exposes its 'private' supertype A + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/AChild.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log new file mode 100644 index 00000000000..06fe308234d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined/klib-build.log @@ -0,0 +1,23 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/InlineKt.class +End of files +Compiling files: + module1/src/inline.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/UsageKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log new file mode 100644 index 00000000000..05389d4d132 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts/klib-build.log @@ -0,0 +1,47 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/InlineFKt.class +End of files +Compiling files: + module1/src/inlineF.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/UsageFKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/inline/InlineGKt.class +End of files +Compiling files: + module1/src/inlineG.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/usage/UsageGKt.class +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log new file mode 100644 index 00000000000..199d0044d5e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/common/simple/klib-build.log @@ -0,0 +1,67 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/AChild.class +End of files +Compiling files: + module2/src/AChild.kt + module2/src/importA.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'A': it is private in file +'public' subclass exposes its 'private' supertype A +Cannot access 'A': it is private in file + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/AChild.kt + module2/src/importA.kt +End of files +Exit code: OK +------------------------------------------ +Building module3 +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log new file mode 100644 index 00000000000..a61128f2c4c --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/common/transitiveInlining/klib-build.log @@ -0,0 +1,6 @@ +================ Step #1 ================= + +Compiling files: + module1/src/a.kt +End of files +Exit code: OK From fccfdabfc4f082d23eba454d23ab35847c41c8bc Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Fri, 4 Dec 2020 12:59:32 +0300 Subject: [PATCH 1548/1557] [IC TEST] Fix IC multi module tests for gradle Original commit: b4ed7110dd6e5a77b010776a088da843bbdbb15f --- .../exportedDependency/gradle-build.log | 52 ++++++++++++++ .../common/simple/gradle-build.log | 67 +++++++++++++++++++ 2 files changed, 119 insertions(+) create mode 100644 jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/gradle-build.log create mode 100644 jps/jps-plugin/testData/incremental/multiModule/common/simple/gradle-build.log diff --git a/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/gradle-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/gradle-build.log new file mode 100644 index 00000000000..a5954d01354 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/common/exportedDependency/gradle-build.log @@ -0,0 +1,52 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/AChild.class +End of files +Compiling files: + module2/src/AChild.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'A': it is private in file +'public' subclass exposes its 'private' supertype A + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/AChild.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/multiModule/common/simple/gradle-build.log b/jps/jps-plugin/testData/incremental/multiModule/common/simple/gradle-build.log new file mode 100644 index 00000000000..199d0044d5e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/multiModule/common/simple/gradle-build.log @@ -0,0 +1,67 @@ +================ Step #1 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Cleaning output files: + out/production/module2/META-INF/module2.kotlin_module + out/production/module2/foo/AChild.class +End of files +Compiling files: + module2/src/AChild.kt + module2/src/importA.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Cannot access 'A': it is private in file +'public' subclass exposes its 'private' supertype A +Cannot access 'A': it is private in file + +================ Step #2 ================= + +Building module1 +Cleaning output files: + out/production/module1/META-INF/module1.kotlin_module + out/production/module1/foo/A.class +End of files +Compiling files: + module1/src/A.kt +End of files +Marked as dirty by Kotlin: + module2/src/AChild.kt + module2/src/importA.kt + module3/src/importAChild.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Exit code: NOTHING_DONE +------------------------------------------ +Building module2 +Compiling files: + module2/src/AChild.kt + module2/src/importA.kt +End of files +Exit code: OK +------------------------------------------ +Building module3 +Cleaning output files: + out/production/module3/META-INF/module3.kotlin_module +End of files +Compiling files: +End of files +Exit code: OK +------------------------------------------ From 442f38432119e2ed2298d97f988ebe6e7af8b308 Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Mon, 21 Dec 2020 18:22:13 +0300 Subject: [PATCH 1549/1557] [IC KLIB] Replace JS IR build log with KLIB build log for klib compialtion - fix test data Original commit: 350ff8033d5b1d340fbc39d44702b4b6f33889c6 --- .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../inlineLinesChanged/{js-ir-build.log => klib-build.log} | 0 .../inlinePropertyInClass/{js-ir-build.log => klib-build.log} | 0 .../inlinePropertyOnTopLevel/{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 .../{js-ir-build.log => klib-build.log} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/{js-ir-build.log => klib-build.log} (100%) rename jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/{js-ir-build.log => klib-build.log} (100%) diff --git a/jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-ir-build.log b/jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/js-ir-build.log rename to jps/jps-plugin/testData/incremental/js/friendsModuleDisabled/internalInlineFunctionIsChanged/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-ir-build.log b/jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/js-ir-build.log rename to jps/jps-plugin/testData/incremental/js/inlineFunctionLocalDeclarationChanges/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/classInlineFunctionChanged/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineExtensionAccessor/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/delegatedPropertyInlineMethodAccessor/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineFunctionsCircularDependency/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineLinesChanged/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyInClass/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/inlinePropertyOnTopLevel/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineSuspendFunctionChanged/klib-build.log diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/js-ir-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/klib-build.log similarity index 100% rename from jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/js-ir-build.log rename to jps/jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/klib-build.log From 382724d5e9dbf42a6f3df5f1b831f309f6498439 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Wed, 13 Jan 2021 18:08:30 +0100 Subject: [PATCH 1550/1557] Update and regenerate incremental compilation tests for 1.5 Set TargetBackend.JVM_IR for these tests by default; remove the generated IR-based test and add a new old-backend-based test. This fixes the issue where some (3) of these tests were not properly ignored because of incorrect target backend used in the test generator. Also update test data for some tests which use local functions, which are not generated to separate anonymous classes in JVM IR. Original commit: 1deb317e0d6c18266aaf1a8095a26a396e9416c2 --- .../build/IncrementalJvmJpsTestGenerated.java | 689 +++++++++--------- .../inlineFunCallSite/localFun/build.log | 1 - .../javaUsedInKotlin/methodRenamed/build.log | 1 - 3 files changed, 345 insertions(+), 346 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index 1e17cafc916..c8de15fe074 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -9,6 +9,7 @@ import com.intellij.testFramework.TestDataPath; import org.jetbrains.kotlin.test.JUnit3RunnerWithInners; import org.jetbrains.kotlin.test.KotlinTestUtils; import org.jetbrains.kotlin.test.util.KtTestUtil; +import org.jetbrains.kotlin.test.TargetBackend; import org.jetbrains.kotlin.test.TestMetadata; import org.junit.runner.RunWith; @@ -24,11 +25,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Common extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCommon() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("classAdded") @@ -156,11 +157,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -169,11 +170,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -182,11 +183,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ConstantValueChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInConstantValueChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/constantValueChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -195,11 +196,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CopyFileToAnotherModule extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCopyFileToAnotherModule() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/copyFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -208,11 +209,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class DefaultArgumentInConstructorRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInDefaultArgumentInConstructorRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultArgumentInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -221,11 +222,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class DefaultParameterAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInDefaultParameterAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -234,11 +235,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class DefaultParameterAddedForTopLevelFun extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInDefaultParameterAddedForTopLevelFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterAddedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -247,11 +248,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class DefaultParameterRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInDefaultParameterRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -260,11 +261,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class DefaultParameterRemovedForTopLevelFun extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInDefaultParameterRemovedForTopLevelFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultParameterRemovedForTopLevelFun"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -273,11 +274,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class DefaultValueInConstructorRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInDefaultValueInConstructorRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/defaultValueInConstructorRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -286,11 +287,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class DuplicatedClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInDuplicatedClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/duplicatedClass"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -299,11 +300,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ExportedDependency extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInExportedDependency() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/exportedDependency"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -312,11 +313,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class FunctionFromDifferentPackageChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInFunctionFromDifferentPackageChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/functionFromDifferentPackageChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -325,11 +326,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunctionInlined extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInlineFunctionInlined() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionInlined"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -338,11 +339,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunctionTwoPackageParts extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInlineFunctionTwoPackageParts() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/inlineFunctionTwoPackageParts"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -351,11 +352,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MoveFileToAnotherModule extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMoveFileToAnotherModule() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/moveFileToAnotherModule"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -364,11 +365,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Simple extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSimple() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simple"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -377,11 +378,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SimpleDependency extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSimpleDependency() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependency"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -390,11 +391,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SimpleDependencyErrorOnAccessToInternal1 extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal1() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal1"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -403,11 +404,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SimpleDependencyErrorOnAccessToInternal2 extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSimpleDependencyErrorOnAccessToInternal2() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyErrorOnAccessToInternal2"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -416,11 +417,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SimpleDependencyUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSimpleDependencyUnchanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/simpleDependencyUnchanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -429,11 +430,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class TransitiveDependency extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInTransitiveDependency() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveDependency"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -442,11 +443,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class TransitiveInlining extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInTransitiveInlining() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/transitiveInlining"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -455,11 +456,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class TwoDependants extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInTwoDependants() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/common/twoDependants"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } @@ -469,11 +470,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Jvm extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJvm() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("circular") @@ -506,11 +507,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Circular extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCircular() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circular"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circular"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -519,11 +520,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CircularDependencyClasses extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCircularDependencyClasses() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyClasses"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -532,11 +533,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CircularDependencySamePackageUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCircularDependencySamePackageUnchanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencySamePackageUnchanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -545,11 +546,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CircularDependencyTopLevelFunctions extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCircularDependencyTopLevelFunctions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyTopLevelFunctions"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -558,11 +559,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CircularDependencyWithAccessToInternal extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCircularDependencyWithAccessToInternal() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/jvm/circularDependencyWithAccessToInternal"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } @@ -572,11 +573,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Custom extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCustom() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("buildError") @@ -614,11 +615,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class BuildError extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInBuildError() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -627,11 +628,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class BuildError2Levels extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInBuildError2Levels() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/buildError2Levels"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -640,11 +641,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CommonSourcesCompilerArg extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCommonSourcesCompilerArg() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/commonSourcesCompilerArg"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -653,11 +654,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ComplementaryFiles extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInComplementaryFiles() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/complementaryFiles"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -666,11 +667,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ModifyOptionalAnnotationUsage extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInModifyOptionalAnnotationUsage() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/modifyOptionalAnnotationUsage"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -679,11 +680,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class NotSameCompiler extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInNotSameCompiler() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/multiModule/multiplatform/custom/notSameCompiler"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } @@ -693,7 +694,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PureKotlin extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @TestMetadata("accessingFunctionsViaPackagePart") @@ -732,7 +733,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInPureKotlin() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, false); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/pureKotlin"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, false); } @TestMetadata("annotations") @@ -1336,11 +1337,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class WithJava extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInWithJava() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin") @@ -1348,11 +1349,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ConvertBetweenJavaAndKotlin extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInConvertBetweenJavaAndKotlin() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("javaToKotlin") @@ -1380,11 +1381,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaToKotlin extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJavaToKotlin() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlin"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1393,11 +1394,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaToKotlinAndBack extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJavaToKotlinAndBack() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndBack"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1406,11 +1407,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaToKotlinAndRemove extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJavaToKotlinAndRemove() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/javaToKotlinAndRemove"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1419,11 +1420,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class KotlinToJava extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInKotlinToJava() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/convertBetweenJavaAndKotlin/kotlinToJava"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } @@ -1433,11 +1434,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaUsedInKotlin extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJavaUsedInKotlin() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("changeFieldType") @@ -1540,11 +1541,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangeFieldType extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangeFieldType() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeFieldType"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1553,11 +1554,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangeNotUsedSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangeNotUsedSignature() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeNotUsedSignature"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1566,11 +1567,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangePropertyOverrideType extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangePropertyOverrideType() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changePropertyOverrideType"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1579,11 +1580,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangeSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangeSignature() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignature"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1592,11 +1593,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangeSignaturePackagePrivate extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangeSignaturePackagePrivate() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivate"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1605,11 +1606,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangeSignaturePackagePrivateNonRoot extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangeSignaturePackagePrivateNonRoot() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignaturePackagePrivateNonRoot"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1618,11 +1619,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangeSignatureStatic extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangeSignatureStatic() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/changeSignatureStatic"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1631,11 +1632,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ConstantChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInConstantChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1644,11 +1645,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ConstantUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInConstantUnchanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/constantUnchanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1657,11 +1658,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class EnumEntryAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInEnumEntryAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1670,11 +1671,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class EnumEntryRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInEnumEntryRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/enumEntryRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1683,11 +1684,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaAndKotlinChangedSimultaneously extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJavaAndKotlinChangedSimultaneously() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaAndKotlinChangedSimultaneously"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1696,11 +1697,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaFieldNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJavaFieldNullabilityChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaFieldNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1709,11 +1710,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaMethodParamNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJavaMethodParamNullabilityChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodParamNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1722,11 +1723,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JavaMethodReturnTypeNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJavaMethodReturnTypeNullabilityChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/javaMethodReturnTypeNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1735,11 +1736,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodAddedInSuper extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodAddedInSuper() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodAddedInSuper"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1748,11 +1749,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodRenamed extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodRenamed() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1761,11 +1762,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MixedInheritance extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMixedInheritance() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/mixedInheritance"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1774,11 +1775,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class NotChangeSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInNotChangeSignature() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/notChangeSignature"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1787,11 +1788,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SamConversions extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSamConversions() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("methodAdded") @@ -1819,11 +1820,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1832,11 +1833,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodAddedSamAdapter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodAddedSamAdapter() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAddedSamAdapter"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1845,11 +1846,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodSignatureChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodSignatureChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1858,11 +1859,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodSignatureChangedSamAdapter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodSignatureChangedSamAdapter() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodSignatureChangedSamAdapter"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } @@ -1873,7 +1874,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class KotlinUsedInJava extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @TestMetadata("addOptionalParameter") @@ -1882,7 +1883,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInKotlinUsedInJava() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("changeNotUsedSignature") @@ -1955,11 +1956,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class AddOptionalParameter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInAddOptionalParameter() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1968,11 +1969,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangeNotUsedSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangeNotUsedSignature() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1981,11 +1982,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ChangeSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInChangeSignature() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -1994,11 +1995,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ConstantChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInConstantChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2007,11 +2008,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ConstantUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInConstantUnchanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2020,11 +2021,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class FunRenamed extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInFunRenamed() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2033,11 +2034,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JvmFieldChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJvmFieldChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2046,11 +2047,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JvmFieldUnchanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJvmFieldUnchanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2059,11 +2060,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodAddedInSuper extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodAddedInSuper() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2072,11 +2073,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class NotChangeSignature extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInNotChangeSignature() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2085,11 +2086,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class OnlyTopLevelFunctionInFileRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInOnlyTopLevelFunctionInFileRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2098,11 +2099,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PackageFileAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPackageFileAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2111,11 +2112,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PrivateChanges extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPrivateChanges() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2124,11 +2125,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PropertyRenamed extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPropertyRenamed() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } @@ -2138,7 +2139,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Other extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } @TestMetadata("accessingFunctionsViaRenamedFileClass") @@ -2147,7 +2148,7 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes } public void testAllFilesPresentInOther() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("allKotlinFilesRemovedThenNewAdded") @@ -2300,11 +2301,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class AccessingFunctionsViaRenamedFileClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInAccessingFunctionsViaRenamedFileClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/accessingFunctionsViaRenamedFileClass"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2313,11 +2314,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class AllKotlinFilesRemovedThenNewAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInAllKotlinFilesRemovedThenNewAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/allKotlinFilesRemovedThenNewAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2326,11 +2327,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassRedeclaration extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassRedeclaration() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/classRedeclaration"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/classRedeclaration"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2339,11 +2340,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassToPackageFacade extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassToPackageFacade() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/classToPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/classToPackageFacade"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2352,11 +2353,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ConflictingPlatformDeclarations extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInConflictingPlatformDeclarations() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/conflictingPlatformDeclarations"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2365,11 +2366,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class DefaultValueInConstructorAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInDefaultValueInConstructorAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/defaultValueInConstructorAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2378,11 +2379,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunctionWithJvmNameInClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInlineFunctionWithJvmNameInClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineFunctionWithJvmNameInClass"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2391,11 +2392,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InlineTopLevelFunctionWithJvmName extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInlineTopLevelFunctionWithJvmName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineTopLevelFunctionWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2404,11 +2405,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InlineTopLevelValPropertyWithJvmName extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInlineTopLevelValPropertyWithJvmName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/inlineTopLevelValPropertyWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2417,11 +2418,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InnerClassNotGeneratedWhenRebuilding extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInnerClassNotGeneratedWhenRebuilding() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/innerClassNotGeneratedWhenRebuilding"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2430,11 +2431,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class JvmNameChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInJvmNameChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/jvmNameChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/jvmNameChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2443,11 +2444,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MainRedeclaration extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMainRedeclaration() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/mainRedeclaration"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/mainRedeclaration"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2456,11 +2457,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassAddTopLevelFunWithDefault extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassAddTopLevelFunWithDefault() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2469,11 +2470,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassFileAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassFileAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2482,11 +2483,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassFileChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassFileChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2495,11 +2496,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassFileMovedToAnotherMultifileClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassFileMovedToAnotherMultifileClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassFileMovedToAnotherMultifileClass"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2508,11 +2509,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassInlineFunction extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassInlineFunction() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunction"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2521,11 +2522,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassInlineFunctionAccessingField extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassInlineFunctionAccessingField() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassInlineFunctionAccessingField"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2534,11 +2535,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassRecreated extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassRecreated() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRecreated"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRecreated"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2547,11 +2548,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassRecreatedAfterRenaming extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassRecreatedAfterRenaming() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRecreatedAfterRenaming"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2560,11 +2561,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifileClassRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifileClassRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifileClassRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2573,11 +2574,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifilePackagePartMethodAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifilePackagePartMethodAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2586,11 +2587,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MultifilePartsWithProperties extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMultifilePartsWithProperties() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2599,11 +2600,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class OptionalParameter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInOptionalParameter() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/optionalParameter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/optionalParameter"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2612,11 +2613,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PackageFacadeToClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPackageFacadeToClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageFacadeToClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageFacadeToClass"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2625,11 +2626,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PackageMultifileClassOneFileWithPublicChanges extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPackageMultifileClassOneFileWithPublicChanges() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageMultifileClassOneFileWithPublicChanges"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2638,11 +2639,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PackageMultifileClassPrivateOnlyChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPackageMultifileClassPrivateOnlyChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/packageMultifileClassPrivateOnlyChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2651,11 +2652,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PublicPropertyWithPrivateSetterMultiFileFacade extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPublicPropertyWithPrivateSetterMultiFileFacade() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/publicPropertyWithPrivateSetterMultiFileFacade"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2664,11 +2665,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class TopLevelFunctionWithJvmName extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInTopLevelFunctionWithJvmName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/topLevelFunctionWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2677,11 +2678,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class TopLevelPropertyWithJvmName extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInTopLevelPropertyWithJvmName() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/withJava/other/topLevelPropertyWithJvmName"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } @@ -2692,11 +2693,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InlineFunCallSite extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInlineFunCallSite() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("classProperty") @@ -2774,11 +2775,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassProperty extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/classProperty"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/classProperty"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2787,11 +2788,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CompanionObjectProperty extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCompanionObjectProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2800,11 +2801,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Coroutine extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCoroutine() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/coroutine"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/coroutine"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2813,11 +2814,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Function extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInFunction() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/function"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/function"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2826,11 +2827,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Getter extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInGetter() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/getter"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/getter"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2839,11 +2840,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Lambda extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInLambda() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/lambda"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/lambda"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2852,11 +2853,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class LocalFun extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInLocalFun() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/localFun"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/localFun"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2865,11 +2866,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class Method extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethod() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/method"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/method"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2878,11 +2879,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ParameterDefaultValue extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInParameterDefaultValue() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2891,11 +2892,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PrimaryConstructorParameterDefaultValue extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPrimaryConstructorParameterDefaultValue() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2904,11 +2905,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SuperCall extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSuperCall() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/superCall"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/superCall"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2917,11 +2918,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ThisCall extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInThisCall() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/thisCall"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/thisCall"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2930,11 +2931,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class TopLevelObjectProperty extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInTopLevelObjectProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -2943,11 +2944,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class TopLevelProperty extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInTopLevelProperty() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } @@ -2957,11 +2958,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassHierarchyAffected extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassHierarchyAffected() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } @TestMetadata("annotationFlagRemoved") @@ -3169,11 +3170,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class AnnotationFlagRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInAnnotationFlagRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/annotationFlagRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3182,11 +3183,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class AnnotationListChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInAnnotationListChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/annotationListChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3195,11 +3196,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class BridgeGenerated extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInBridgeGenerated() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/bridgeGenerated"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3208,11 +3209,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassBecameFinal extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassBecameFinal() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecameFinal"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3221,11 +3222,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassBecameInterface extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassBecameInterface() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecameInterface"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3234,11 +3235,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassBecamePrivate extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassBecamePrivate() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classBecamePrivate"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3247,11 +3248,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassMovedIntoOtherClass extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassMovedIntoOtherClass() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classMovedIntoOtherClass"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3260,11 +3261,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3273,11 +3274,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ClassRemovedAndRestored extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInClassRemovedAndRestored() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/classRemovedAndRestored"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3286,11 +3287,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CompanionObjectInheritedMemberChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCompanionObjectInheritedMemberChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectInheritedMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3299,11 +3300,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CompanionObjectMemberChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCompanionObjectMemberChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3312,11 +3313,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CompanionObjectNameChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCompanionObjectNameChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectNameChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3325,11 +3326,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class CompanionObjectToSimpleObject extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInCompanionObjectToSimpleObject() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/companionObjectToSimpleObject"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3338,11 +3339,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ConstructorVisibilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInConstructorVisibilityChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/constructorVisibilityChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3351,11 +3352,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class EnumEntryAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInEnumEntryAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3364,11 +3365,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class EnumEntryRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInEnumEntryRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumEntryRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3377,11 +3378,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class EnumMemberChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInEnumMemberChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/enumMemberChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3390,11 +3391,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class FlagsAndMemberInDifferentClassesChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInFlagsAndMemberInDifferentClassesChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInDifferentClassesChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3403,11 +3404,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class FlagsAndMemberInSameClassChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInFlagsAndMemberInSameClassChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/flagsAndMemberInSameClassChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3416,11 +3417,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class ImplcitUpcast extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInImplcitUpcast() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/implcitUpcast"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3429,11 +3430,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InferredTypeArgumentChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInferredTypeArgumentChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeArgumentChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3442,11 +3443,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InferredTypeChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInferredTypeChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/inferredTypeChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3455,11 +3456,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class InterfaceAnyMethods extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInInterfaceAnyMethods() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/interfaceAnyMethods"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3468,11 +3469,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class LambdaParameterAffected extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInLambdaParameterAffected() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/lambdaParameterAffected"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3481,11 +3482,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3494,11 +3495,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodAnnotationAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodAnnotationAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodAnnotationAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3507,11 +3508,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodNullabilityChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3520,11 +3521,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodParameterWithDefaultValueAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodParameterWithDefaultValueAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodParameterWithDefaultValueAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3533,11 +3534,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class MethodRemoved extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInMethodRemoved() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/methodRemoved"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3546,11 +3547,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class OverrideExplicit extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInOverrideExplicit() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/overrideExplicit"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3559,11 +3560,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class OverrideImplicit extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInOverrideImplicit() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/overrideImplicit"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3572,11 +3573,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class PropertyNullabilityChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInPropertyNullabilityChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/propertyNullabilityChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3585,11 +3586,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SealedClassImplAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSealedClassImplAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassImplAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3598,11 +3599,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SealedClassIndirectImplAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSealedClassIndirectImplAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassIndirectImplAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3611,11 +3612,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SealedClassNestedImplAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSealedClassNestedImplAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/sealedClassNestedImplAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3624,11 +3625,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SecondaryConstructorAdded extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSecondaryConstructorAdded() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/secondaryConstructorAdded"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3637,11 +3638,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class StarProjectionUpperBoundChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInStarProjectionUpperBoundChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/starProjectionUpperBoundChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3650,11 +3651,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class SupertypesListChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInSupertypesListChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/supertypesListChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3663,11 +3664,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class TypeParameterListChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInTypeParameterListChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/typeParameterListChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } @@ -3676,11 +3677,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes @RunWith(JUnit3RunnerWithInners.class) public static class VarianceChanged extends AbstractIncrementalJvmJpsTest { private void runTest(String testDataFilePath) throws Exception { - KotlinTestUtils.runTest(this::doTest, this, testDataFilePath); + KotlinTestUtils.runTest(this::doTest, TargetBackend.JVM_IR, testDataFilePath); } public void testAllFilesPresentInVarianceChanged() throws Exception { - KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged"), Pattern.compile("^([^\\.]+)$"), null, true); + KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("jps-plugin/testData/incremental/classHierarchyAffected/varianceChanged"), Pattern.compile("^([^\\.]+)$"), null, TargetBackend.JVM_IR, true); } } } diff --git a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log index 5c109d067c3..98c5e9ece93 100644 --- a/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log +++ b/jps/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log @@ -13,7 +13,6 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/usage/UsageKt$usage$1.class out/production/module/usage/UsageKt.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log index ef25b3a5cdb..822681ec959 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/methodRenamed/build.log @@ -10,7 +10,6 @@ Compiling files: End of files Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/WillBeResolvedToOtherKt$willBeResolvedToOther$1.class out/production/module/WillBeResolvedToOtherKt.class out/production/module/WillBeUnresolvedKt.class End of files From dcf740bc2691234387c553371b87d259584ded5d Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Fri, 15 Jan 2021 12:04:05 +0300 Subject: [PATCH 1551/1557] [Test] Fix various tests according to switching to kotlin 1.5 Original commit: 4f8b12c96fd6521224aac31fd8ddf8b5ddf5e772 --- .../test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt | 2 +- .../org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt index 2d432cdf16f..28b46b667f4 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt @@ -458,7 +458,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { assertEquals(1, myProject.modules.size) val module = myProject.modules.first() val args = module.kotlinCompilerArguments - args.apiVersion = "1.2" + args.apiVersion = "1.4" myProject.kotlinCommonCompilerArguments = args buildAllModules().assertSuccessful() diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 index 605d85bce34..82625bda9cf 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt.201 @@ -458,7 +458,7 @@ open class KotlinJpsBuildTest : KotlinJpsBuildTestBase() { assertEquals(1, myProject.modules.size) val module = myProject.modules.first() val args = module.kotlinCompilerArguments - args.apiVersion = "1.2" + args.apiVersion = "1.4" myProject.kotlinCommonCompilerArguments = args buildAllModules().assertSuccessful() From 8a0eda2ca9e88298a14a94ede86970ec787270b4 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 21 Jan 2021 17:12:46 +0100 Subject: [PATCH 1552/1557] Switch default JVM target to 1.8 #KT-29405 Fixed (cherry picked from commit d022bb0248a3f199ea0bc671b93dc30c5052c292) Original commit: bd4d9491ba28eb87e0c2f347823d419eec100ca9 --- .../org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt index 125b8313cab..378d3da152d 100644 --- a/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt +++ b/jps/jps-common/src/org/jetbrains/kotlin/platform/impl/JvmIdePlatformKind.kt @@ -38,7 +38,7 @@ object JvmIdePlatformKind : IdePlatformKind() { message = "IdePlatform is deprecated and will be removed soon, please, migrate to org.jetbrains.kotlin.platform.TargetPlatform", level = DeprecationLevel.ERROR ) - override fun getDefaultPlatform(): Platform = Platform(JvmTarget.JVM_1_6) + override fun getDefaultPlatform(): Platform = Platform(JvmTarget.DEFAULT) override fun createArguments(): CommonCompilerArguments { return K2JVMCompilerArguments() From 8b38a752d8b22c97cb39525abb47917b05dc0dd9 Mon Sep 17 00:00:00 2001 From: "Aleksei.Cherepanov" Date: Mon, 1 Feb 2021 13:08:43 +0300 Subject: [PATCH 1553/1557] JPS: Fix JvmMultifileClass processing for IR backend #KT-44644 Fixed (cherry picked from commit aa683d3b2acd1c8ef733d400088dbd1ab696ec8c) Original commit: ef3c73554fc64d9837019ed9cf9e512bbd2b20f3 --- .../build/IncrementalJvmJpsTestGenerated.java | 5 ++ .../kotlin/jps/build/KotlinBuilder.kt | 46 +++++++++++++++++-- .../build.log | 7 +-- .../other/multifileClassFileAdded/build.log | 17 ++++++- .../other/multifileClassFileChanged/build.log | 6 ++- .../other/multifileDependantUsage/build.log | 25 ++++++++++ .../other/multifileDependantUsage/partA.kt | 4 ++ .../other/multifileDependantUsage/partB.kt | 10 ++++ .../multifileDependantUsage/partB.kt.new.1 | 4 ++ .../multifileDependantUsage/usagePartB.kt | 1 + .../multifilePackagePartMethodAdded/build.log | 14 +++--- .../multifilePartsWithProperties/build.log | 8 +--- 12 files changed, 123 insertions(+), 24 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partA.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1 create mode 100644 jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java index c8de15fe074..fcaad30416a 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJvmJpsTestGenerated.java @@ -2261,6 +2261,11 @@ public class IncrementalJvmJpsTestGenerated extends AbstractIncrementalJvmJpsTes runTest("jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/"); } + @TestMetadata("multifileDependantUsage") + public void testMultifileDependantUsage() throws Exception { + runTest("jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/"); + } + @TestMetadata("optionalParameter") public void testOptionalParameter() throws Exception { runTest("jps-plugin/testData/incremental/withJava/other/optionalParameter/"); diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt index 04afe480d2c..7266485c1ca 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt @@ -29,6 +29,7 @@ import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.* import org.jetbrains.jps.incremental.java.JavaBuilder import org.jetbrains.jps.model.JpsProject import org.jetbrains.kotlin.build.GeneratedFile +import org.jetbrains.kotlin.build.GeneratedJvmClass import org.jetbrains.kotlin.cli.common.ExitCode import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity @@ -48,6 +49,7 @@ import org.jetbrains.kotlin.jps.incremental.JpsLookupStorageManager import org.jetbrains.kotlin.jps.model.kotlinKind import org.jetbrains.kotlin.jps.targets.KotlinJvmModuleBuildTarget import org.jetbrains.kotlin.jps.targets.KotlinModuleBuildTarget +import org.jetbrains.kotlin.load.kotlin.header.KotlinClassHeader import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.preloading.ClassCondition import org.jetbrains.kotlin.utils.KotlinPaths @@ -439,6 +441,9 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { } val generatedFiles = getGeneratedFiles(context, chunk, environment.outputItemsCollector) + + markDirtyComplementaryMultifileClasses(generatedFiles, kotlinContext, incrementalCaches, fsOperations) + val kotlinTargets = kotlinContext.targetsBinding for ((target, outputItems) in generatedFiles) { val kotlinTarget = kotlinTargets[target] ?: error("Could not find Kotlin target for JPS target $target") @@ -526,14 +531,23 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { for (target in kotlinChunk.targets) { val cache = incrementalCaches[target] val jpsTarget = target.jpsModuleBuildTarget + val targetDirtyFiles = dirtyFilesHolder.byTarget[jpsTarget] - if (cache != null && targetDirtyFiles != null) { - val complementaryFiles = cache.getComplementaryFilesRecursive( - targetDirtyFiles.dirty.keys + targetDirtyFiles.removed - ) + val dirtyFiles = targetDirtyFiles.dirty.keys + targetDirtyFiles.removed + val complementaryFiles = cache.getComplementaryFilesRecursive(dirtyFiles) - fsOperations.markFilesForCurrentRound(jpsTarget, complementaryFiles) + // Get all parts of @JvmMultifileClass file for simultaneous rebuild + var dirtyMultifileClassFiles: Collection = emptyList() + if (cache is IncrementalJvmCache) { + dirtyMultifileClassFiles = cache.classesBySources(dirtyFiles) + .filter { cache.isMultifileFacade(it) } + .flatMap { cache.getAllPartsOfMultifileFacade(it).orEmpty() } + .flatMap { cache.sourcesByInternalName(it) } + .distinct() + .filter { !dirtyFiles.contains(it) } + } + fsOperations.markFilesForCurrentRound(jpsTarget, complementaryFiles + dirtyMultifileClassFiles) cache.markDirty(targetDirtyFiles.dirty.keys + targetDirtyFiles.removed) } @@ -666,6 +680,28 @@ class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) { lookupStorage.addAll(lookupTracker.lookups, lookupTracker.pathInterner.values) } } + + private fun markDirtyComplementaryMultifileClasses( + generatedFiles: Map>, + kotlinContext: KotlinCompileContext, + incrementalCaches: Map, JpsIncrementalCache>, + fsOperations: FSOperationsHelper + ) { + for ((target, files) in generatedFiles) { + val kotlinModuleBuilderTarget = kotlinContext.targetsBinding[target] ?: continue + val cache = incrementalCaches[kotlinModuleBuilderTarget] as? IncrementalJvmCache ?: continue + val generated = files.filterIsInstance() + val multifileClasses = generated.filter { it.outputClass.classHeader.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS } + val expectedAllParts = multifileClasses.flatMap { cache.getAllPartsOfMultifileFacade(it.outputClass.className).orEmpty() } + if (multifileClasses.isEmpty()) continue + val actualParts = generated.filter { it.outputClass.classHeader.kind == KotlinClassHeader.Kind.MULTIFILE_CLASS_PART } + .map { it.outputClass.className.toString() } + if (!actualParts.containsAll(expectedAllParts)) { + fsOperations.markFiles(expectedAllParts.flatMap { cache.sourcesByInternalName(it) } + + multifileClasses.flatMap { it.sourceFiles }) + } + } + } } private class JpsICReporter : ICReporterBase() { diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log index b13957b6b52..0a37a7011af 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassAddTopLevelFunWithDefault/build.log @@ -5,7 +5,11 @@ Cleaning output files: out/production/module/test/Test.class out/production/module/test/Test__BKt.class End of files +Cleaning output files: + out/production/module/test/Test__AKt.class +End of files Compiling files: + src/a.kt src/b.kt End of files Marked as dirty by Kotlin: @@ -14,12 +18,9 @@ Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ Cleaning output files: out/production/module/META-INF/module.kotlin_module - out/production/module/test/Test.class - out/production/module/test/Test__AKt.class out/production/module/usage/UsageKt.class End of files Compiling files: - src/a.kt src/usage.kt End of files Exit code: OK diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log index 2fb46435909..063de2e6436 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileAdded/build.log @@ -3,5 +3,20 @@ Compiling files: src/b.kt End of files -Exit code: OK +Marked as dirty by Kotlin: + src/a.kt + src/b.kt +Exit code: ADDITIONAL_PASS_REQUIRED ------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/Test.class + out/production/module/test/Test__AKt.class + out/production/module/test/Test__BKt.class +End of files +Compiling files: + src/a.kt + src/b.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log index 0aeeb8ca95f..b9ec7f67acd 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileClassFileChanged/build.log @@ -5,8 +5,12 @@ Cleaning output files: out/production/module/test/Test.class out/production/module/test/Test__BKt.class End of files +Cleaning output files: + out/production/module/test/Test__AKt.class +End of files Compiling files: + src/a.kt src/b.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log new file mode 100644 index 00000000000..ea02e9ce400 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/build.log @@ -0,0 +1,25 @@ +================ Step #1 ================= + +Marked as dirty by Kotlin: + src/partB.kt + src/usagePartB.kt +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/OuterClass$InnerClass.class + out/production/module/OuterClass.class + out/production/module/UsagePartBKt.class + out/production/module/Utils.class + out/production/module/Utils__PartBKt.class +End of files +Cleaning output files: + out/production/module/Utils__PartAKt.class +End of files +Compiling files: + src/partA.kt + src/partB.kt + src/usagePartB.kt +End of files +Exit code: ABORT +------------------------------------------ +COMPILATION FAILED +Unresolved reference: OuterClass \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partA.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partA.kt new file mode 100644 index 00000000000..457823b86a7 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partA.kt @@ -0,0 +1,4 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass + +val aVal: Int get() = 0 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt new file mode 100644 index 00000000000..bab0026e072 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt @@ -0,0 +1,10 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass + +val bVal: Int get() = 0 + +class OuterClass{ + inner class InnerClass { + val getZero: Int get() = 0 + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1 b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1 new file mode 100644 index 00000000000..27b19de3c69 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/partB.kt.new.1 @@ -0,0 +1,4 @@ +@file:JvmName("Utils") +@file:JvmMultifileClass + +val bVal: Int get() = 0 diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt new file mode 100644 index 00000000000..306a92e2773 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifileDependantUsage/usagePartB.kt @@ -0,0 +1 @@ +fun zero() = OuterClass().InnerClass().getZero \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log index 86910844d44..d2f88033cbb 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifilePackagePartMethodAdded/build.log @@ -5,11 +5,16 @@ Cleaning output files: out/production/module/Utils.class out/production/module/Utils__PartBKt.class End of files +Cleaning output files: + out/production/module/Utils__PartAKt.class + out/production/module/Utils__PartCKt.class +End of files Compiling files: + src/partA.kt src/partB.kt + src/partC.kt End of files Marked as dirty by Kotlin: - src/partA.kt src/useFooF.kt src/useFooG.kt Exit code: ADDITIONAL_PASS_REQUIRED @@ -18,15 +23,10 @@ Cleaning output files: out/production/module/META-INF/module.kotlin_module out/production/module/UseFooFKt.class out/production/module/UseFooGKt.class - out/production/module/Utils.class - out/production/module/Utils__PartAKt.class - out/production/module/Utils__PartCKt.class End of files Compiling files: - src/partA.kt - src/partC.kt src/useFooF.kt src/useFooG.kt End of files Exit code: OK ------------------------------------------- +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log index 260d0b077bf..2894c2c0a84 100644 --- a/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/other/multifilePartsWithProperties/build.log @@ -5,18 +5,12 @@ Cleaning output files: out/production/module/Utils.class out/production/module/Utils__PartBKt.class End of files -Compiling files: - src/partB.kt -End of files -Exit code: OK ------------------------------------------- Cleaning output files: - out/production/module/META-INF/module.kotlin_module - out/production/module/Utils.class out/production/module/Utils__PartAKt.class End of files Compiling files: src/partA.kt + src/partB.kt End of files Exit code: OK ------------------------------------------ \ No newline at end of file From 5c6e8fa05d2cbdd84b1ca9cf20ff5239408f6650 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 15 Feb 2021 17:04:34 +0100 Subject: [PATCH 1554/1557] Remove JvmBytecodeBinaryVersion from the compiler code Move it to build-common where it's still used in incremental compilation caches, and simplify a bit. In the future, it'll make sense to remove it completely and to avoid writing it to caches. In this commit, I don't do that to prevent the IC cache version to be updated, causing rebuilds for all JPS projects. #KT-41758 (cherry picked from commit f63ffc51ae6ce0a3ae5b278f86f49e2e5efbfc33) Original commit: 15b3f54e666c91aa19255d4887d8916a711b79c4 --- .../org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt | 4 ++-- .../jetbrains/kotlin/jps/incremental/CacheVersionManager.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt index 997617cc0ec..0e309c86f6d 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.build.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import org.junit.Assert.assertEquals import org.junit.Test @@ -54,4 +54,4 @@ class CacheVersionTest { ).toString() ) } -} \ No newline at end of file +} diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt index a36116dbe3e..8318ce3f53d 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.build.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import java.io.File import java.io.IOException @@ -79,4 +79,4 @@ data class CacheVersion(val intValue: Int) { ) override fun toString(): String = "CacheVersion(caches: $own, bytecode: $bytecode, metadata: $metadata)" -} \ No newline at end of file +} From 1e4ac7714a2adb8b70ffa162e35d6527ff4090e8 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Fri, 12 Feb 2021 14:06:50 +0300 Subject: [PATCH 1555/1557] [Gradle] Read system properties at configuration time using Gradle providers The change is a step to fully support Gradle configuration cache. Relates to #KT-43605 Relates to #KT-44611 (cherry picked from commit 3537c699b572a96c7aa614f8d00de716a9edc87a) Original commit: de62c4cde79d606fb3b3a9f63f12f2c387066890 --- .../kotlin/compilerRunner/JpsKotlinCompilerRunner.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt index e2d6d835f94..0668e492e67 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/compilerRunner/JpsKotlinCompilerRunner.kt @@ -19,8 +19,8 @@ package org.jetbrains.kotlin.compilerRunner import com.intellij.util.xmlb.XmlSerializerUtil import org.jetbrains.annotations.TestOnly import org.jetbrains.jps.api.GlobalOptions +import org.jetbrains.kotlin.cli.common.CompilerSystemProperties import org.jetbrains.kotlin.cli.common.ExitCode -import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.* import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil import org.jetbrains.kotlin.config.CompilerSettings @@ -295,7 +295,7 @@ class JpsKotlinCompilerRunner { // unfortunately it cannot be currently set by default globally, because it breaks many tests // since there is no reliable way so far to detect running under tests, switching it on only for parallel builds if (System.getProperty(GlobalOptions.COMPILE_PARALLEL_OPTION, "false").toBoolean()) - System.setProperty(KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY, "true") + CompilerSystemProperties.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY.value = "true" val rc = environment.withProgressReporter { progress -> progress.compilationStarted() From d7d64b4cef2cef4c8d991724d678014f46d21245 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Sun, 14 Feb 2021 09:53:16 +0300 Subject: [PATCH 1556/1557] Update tests after compiler properties rework #KT-43605 Fixed (cherry picked from commit 70d434e992e83e5cd02791889e793d3802165d5c) Original commit: bb558c528239070d82f439c8c797ff38dc655a8d --- .../kotlin/jps/build/AbstractIncrementalJpsTest.kt | 1 - .../kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 | 1 - .../jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt | 4 ++-- .../test/org/jetbrains/kotlin/jps/build/testingUtils.kt | 7 +++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt index 9d1c9816369..62ab22a1cc1 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt @@ -42,7 +42,6 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil -import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 index 94af68daeef..557bd7ff795 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/AbstractIncrementalJpsTest.kt.201 @@ -42,7 +42,6 @@ import org.jetbrains.jps.model.JpsModuleRootModificationUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService import org.jetbrains.jps.model.library.sdk.JpsSdk import org.jetbrains.jps.util.JpsPathUtil -import org.jetbrains.kotlin.cli.common.KOTLIN_COMPILER_ENVIRONMENT_KEEPALIVE_PROPERTY import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2MetadataCompilerArguments diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt index 7e98717ba8b..a228fcceb6c 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/SimpleKotlinJpsBuildTest.kt @@ -18,8 +18,8 @@ package org.jetbrains.kotlin.jps.build import com.intellij.util.PathUtil import org.jetbrains.jps.model.java.JpsJavaExtensionService +import org.jetbrains.kotlin.cli.common.CompilerSystemProperties import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner -import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY import org.jetbrains.kotlin.daemon.common.OSKind import org.jetbrains.kotlin.test.KotlinTestUtils import java.io.File @@ -69,7 +69,7 @@ class SimpleKotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() { // TODO: add JS tests fun testDaemon() { withDaemon { - withSystemProperty(COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY, "true") { + withSystemProperty(CompilerSystemProperties.COMPILE_DAEMON_VERBOSE_REPORT_PROPERTY.property, "true") { withSystemProperty(JpsKotlinCompilerRunner.FAIL_ON_FALLBACK_PROPERTY, "true") { testLoadingKotlinFromDifferentModules() } diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt index 6b2feb62b5d..990f417d6b1 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/testingUtils.kt @@ -17,9 +17,8 @@ package org.jetbrains.kotlin.jps.build import com.intellij.openapi.util.io.FileUtil +import org.jetbrains.kotlin.cli.common.CompilerSystemProperties import org.jetbrains.kotlin.compilerRunner.JpsKotlinCompilerRunner -import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS -import org.jetbrains.kotlin.daemon.common.COMPILE_DAEMON_ENABLED_PROPERTY inline fun withSystemProperty(property: String, newValue: String?, fn: ()->Unit) { val backup = System.getProperty(property) @@ -47,8 +46,8 @@ inline fun setOrClearSysProperty(property: String, newValue: String?) { fun withDaemon(fn: () -> Unit) { val daemonHome = FileUtil.createTempDirectory("daemon-home", "testJpsDaemonIC") - withSystemProperty(COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS, daemonHome.absolutePath) { - withSystemProperty(COMPILE_DAEMON_ENABLED_PROPERTY, "true") { + withSystemProperty(CompilerSystemProperties.COMPILE_DAEMON_CUSTOM_RUN_FILES_PATH_FOR_TESTS.property, daemonHome.absolutePath) { + withSystemProperty(CompilerSystemProperties.COMPILE_DAEMON_ENABLED_PROPERTY.property, "true") { try { fn() } finally { From 46196dc1a3a9edfd3144572cae68653ecc8fdcdf Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Fri, 5 Mar 2021 18:37:00 +0100 Subject: [PATCH 1557/1557] Restore writing bytecode version to metadata for LV < 1.5 #KT-45323 Fixed (cherry picked from commit 9970851684ab772275bd44a12507da772d395f4e) Original commit: d8b85debe6afe3af52a234717934aad5289d2b71 --- .../org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt | 2 +- .../org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt index 0e309c86f6d..30a361cae7b 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/incremental/CacheVersionTest.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.jps.incremental -import org.jetbrains.kotlin.build.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.load.kotlin.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import org.junit.Assert.assertEquals import org.junit.Test diff --git a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt index 8318ce3f53d..df3cddd57e4 100644 --- a/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt +++ b/jps/jps-plugin/src/org/jetbrains/kotlin/jps/incremental/CacheVersionManager.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.jps.incremental import org.jetbrains.annotations.TestOnly -import org.jetbrains.kotlin.build.JvmBytecodeBinaryVersion +import org.jetbrains.kotlin.load.kotlin.JvmBytecodeBinaryVersion import org.jetbrains.kotlin.metadata.jvm.deserialization.JvmMetadataVersion import java.io.File import java.io.IOException